REM be found in the AUTHORS file in the root of the source tree.
echo on
-cl /I "./" /I "%1" /nologo /c "%1/vp8/common/asm_com_offsets.c"
-cl /I "./" /I "%1" /nologo /c "%1/vp8/decoder/asm_dec_offsets.c"
-cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/asm_enc_offsets.c"
+cl /I "./" /I "%1" /nologo /c "%1/vp9/common/asm_com_offsets.c"
+cl /I "./" /I "%1" /nologo /c "%1/vp9/decoder/asm_dec_offsets.c"
+cl /I "./" /I "%1" /nologo /c "%1/vp9/encoder/asm_enc_offsets.c"
obj_int_extract.exe rvds "asm_com_offsets.obj" > "asm_com_offsets.asm"
obj_int_extract.exe rvds "asm_dec_offsets.obj" > "asm_dec_offsets.asm"
obj_int_extract.exe rvds "asm_enc_offsets.obj" > "asm_enc_offsets.asm"
${toggle_debug_libs} in/exclude debug version of libraries
${toggle_md5} support for output of checksum data
${toggle_static_msvcrt} use static MSVCRT (VS builds only)
- ${toggle_vp8} VP8 codec support
+ ${toggle_vp9} VP9 codec support
${toggle_internal_stats} output of encoder internal stats for debug, if supported (encoders)
${toggle_mem_tracker} track memory usage
${toggle_postproc} postprocessing
enable os_support
[ -d ${source_path}/../include ] && enable alt_tree_layout
-for d in vp8; do
+for d in vp9; do
[ -d ${source_path}/${d} ] && disable alt_tree_layout;
done
if ! enabled alt_tree_layout; then
# development environment
-[ -d ${source_path}/vp8 ] && CODECS="${CODECS} vp8_encoder vp8_decoder"
+[ -d ${source_path}/vp9 ] && CODECS="${CODECS} vp9_encoder vp9_decoder"
else
# customer environment
-[ -f ${source_path}/../include/vpx/vp8cx.h ] && CODECS="${CODECS} vp8_encoder"
-[ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp8_decoder"
+[ -f ${source_path}/../include/vpx/vp8cx.h ] && CODECS="${CODECS} vp9_encoder"
+[ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp9_decoder"
[ -f ${source_path}/../lib/*/*mt.lib ] && soft_enable static_msvcrt
fi
usage_dx.dox \
# Other doxy files sourced in Markdown
-TXT_DOX-$(CONFIG_VP8) += vp8_api1_migration.dox
+TXT_DOX-$(CONFIG_VP9) += vp8_api1_migration.dox
vp8_api1_migration.dox.DESC = VP8 API 1.x Migration
TXT_DOX = $(call enabled,TXT_DOX)
#include "vpx_config.h"
#include "vpx/vpx_decoder.h"
#include "vpx/vpx_integer.h"
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
#include "vpx/vp8dx.h"
#endif
const char *name;
const vpx_codec_iface_t *iface;
} ifaces[] = {
-#if CONFIG_VP8_DECODER
- {"vp8", &vpx_codec_vp8_dx_algo},
+#if CONFIG_VP9_DECODER
+ {"vp9", &vpx_codec_vp8_dx_algo},
#endif
};
error_resilient.GUID = DF5837B9-4145-4F92-A031-44E4F832E00C
error_resilient.DESCRIPTION = Error Resiliency Feature
-GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_scalable_patterns.c
+GEN_EXAMPLES-$(CONFIG_VP9_ENCODER) += vp8_scalable_patterns.c
vp8_scalable_patterns.GUID = 0D6A210B-F482-4D6F-8570-4A9C01ACC88C
vp8_scalable_patterns.DESCRIPTION = VP8 Scalable Bitstream Patterns
-GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_set_maps.c
+GEN_EXAMPLES-$(CONFIG_VP9_ENCODER) += vp8_set_maps.c
vp8_set_maps.GUID = ECB2D24D-98B8-4015-A465-A4AF3DCC145F
vp8_set_maps.DESCRIPTION = VP8 set active and ROI maps
-GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8cx_set_ref.c
+GEN_EXAMPLES-$(CONFIG_VP9_ENCODER) += vp8cx_set_ref.c
vp8cx_set_ref.GUID = C5E31F7F-96F6-48BD-BD3E-10EBF6E8057A
vp8cx_set_ref.DESCRIPTION = VP8 set encoder reference frame
# We should not link to math library (libm) on RVCT
# when building for bare-metal targets
ifeq ($(CONFIG_OS_SUPPORT), yes)
-CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m
+CODEC_EXTRA_LIBS-$(CONFIG_VP9) += m
else
ifeq ($(CONFIG_GCC), yes)
- CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m
+ CODEC_EXTRA_LIBS-$(CONFIG_VP9) += m
endif
endif
#
INC_PATH := $(SRC_PATH_BARE)/../include
else
LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.)
- INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8
- INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8
+ INC_PATH-$(CONFIG_VP9_DECODER) += $(SRC_PATH_BARE)/vp9
+ INC_PATH-$(CONFIG_VP9_ENCODER) += $(SRC_PATH_BARE)/vp9
LIB_PATH := $(call enabled,LIB_PATH)
INC_PATH := $(call enabled,INC_PATH)
endif
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DEC_INCLUDES
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx/vpx_decoder.h"
-#include "vpx/vp8dx.h"
+#include "vpx/vp9dx.h"
#define interface (vpx_codec_vp8_dx())
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DEC_INCLUDES
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ENC_INCLUDES
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx/vpx_encoder.h"
-#include "vpx/vp8cx.h"
+#include "vpx/vp9cx.h"
#define interface (vpx_codec_vp8_cx())
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ENC_INCLUDES
postprocessors. VP8 is one example. The following sample code toggles
postprocessing on and off every 15 frames.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PRE_DECODE
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
if(frame_cnt%30 == 1) {
vp8_postproc_cfg_t pp = {0, 0, 0};
CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS))
-ifeq ($(CONFIG_VP8_ENCODER),yes)
- VP8_PREFIX=vp8/
- include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk
- CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS))
- CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS))
- CODEC_SRCS-yes += $(VP8_PREFIX)vp8cx.mk vpx/vp8.h vpx/vp8cx.h vpx/vp8e.h
- CODEC_SRCS-$(ARCH_ARM) += $(VP8_PREFIX)vp8cx_arm.mk
+ifeq ($(CONFIG_VP9_ENCODER),yes)
+ VP9_PREFIX=vp9/
+ include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk
+ CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS))
+ CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS))
+ CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h vpx/vp8e.h
+ CODEC_SRCS-$(ARCH_ARM) += $(VP9_PREFIX)vp98cx_arm.mk
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8e.h include/vpx/vp8cx.h
- INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
+ INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
- CODEC_DOC_SECTIONS += vp8 vp8_encoder
+ CODEC_DOC_SECTIONS += vp9 vp9_encoder
endif
-ifeq ($(CONFIG_VP8_DECODER),yes)
- VP8_PREFIX=vp8/
- include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx.mk
- CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_DX_SRCS))
- CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_DX_EXPORTS))
- CODEC_SRCS-yes += $(VP8_PREFIX)vp8dx.mk vpx/vp8.h vpx/vp8dx.h
+ifeq ($(CONFIG_VP9_DECODER),yes)
+ VP9_PREFIX=vp9/
+ include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk
+ CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS))
+ CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS))
+ CODEC_SRCS-yes += $(VP9_PREFIX)vp9dx.mk vpx/vp8.h vpx/vp8dx.h
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h
- INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
+ INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h
- CODEC_DOC_SECTIONS += vp8 vp8_decoder
+ CODEC_DOC_SECTIONS += vp9 vp9_decoder
endif
OFFSET_PATTERN:='^[a-zA-Z0-9_]* EQU'
ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC))
- $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S
+ $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP9_PREFIX)common/asm_com_offsets.c.S
@echo " [CREATE] $@"
$(qexec)LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@
- $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S: $(VP8_PREFIX)common/asm_com_offsets.c
- CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S
+ $(BUILD_PFX)$(VP9_PREFIX)common/asm_com_offsets.c.S: $(VP9_PREFIX)common/asm_com_offsets.c
+ CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP9_PREFIX)common/asm_com_offsets.c.S
- $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S
+ $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP9_PREFIX)encoder/asm_enc_offsets.c.S
@echo " [CREATE] $@"
$(qexec)LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@
- $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S: $(VP8_PREFIX)encoder/asm_enc_offsets.c
- CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S
+ $(BUILD_PFX)$(VP9_PREFIX)encoder/asm_enc_offsets.c.S: $(VP9_PREFIX)encoder/asm_enc_offsets.c
+ CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP9_PREFIX)encoder/asm_enc_offsets.c.S
- $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S
+ $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP9_PREFIX)decoder/asm_dec_offsets.c.S
@echo " [CREATE] $@"
$(qexec)LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@
- $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S: $(VP8_PREFIX)decoder/asm_dec_offsets.c
- CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S
+ $(BUILD_PFX)$(VP9_PREFIX)decoder/asm_dec_offsets.c.S: $(VP9_PREFIX)decoder/asm_dec_offsets.c
+ CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP9_PREFIX)decoder/asm_dec_offsets.c.S
else
ifeq ($(filter rvct,$(TGT_CC)), $(TGT_CC))
asm_com_offsets.asm: obj_int_extract
- asm_com_offsets.asm: $(VP8_PREFIX)common/asm_com_offsets.c.o
+ asm_com_offsets.asm: $(VP9_PREFIX)common/asm_com_offsets.c.o
@echo " [CREATE] $@"
$(qexec)./obj_int_extract rvds $< $(ADS2GAS) > $@
- OBJS-yes += $(VP8_PREFIX)common/asm_com_offsets.c.o
+ OBJS-yes += $(VP9_PREFIX)common/asm_com_offsets.c.o
CLEAN-OBJS += asm_com_offsets.asm
$(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)asm_com_offsets.asm
asm_enc_offsets.asm: obj_int_extract
- asm_enc_offsets.asm: $(VP8_PREFIX)encoder/asm_enc_offsets.c.o
+ asm_enc_offsets.asm: $(VP9_PREFIX)encoder/asm_enc_offsets.c.o
@echo " [CREATE] $@"
$(qexec)./obj_int_extract rvds $< $(ADS2GAS) > $@
- OBJS-yes += $(VP8_PREFIX)encoder/asm_enc_offsets.c.o
+ OBJS-yes += $(VP9_PREFIX)encoder/asm_enc_offsets.c.o
CLEAN-OBJS += asm_enc_offsets.asm
$(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)asm_enc_offsets.asm
asm_dec_offsets.asm: obj_int_extract
- asm_dec_offsets.asm: $(VP8_PREFIX)decoder/asm_dec_offsets.c.o
+ asm_dec_offsets.asm: $(VP9_PREFIX)decoder/asm_dec_offsets.c.o
@echo " [CREATE] $@"
$(qexec)./obj_int_extract rvds $< $(ADS2GAS) > $@
- OBJS-yes += $(VP8_PREFIX)decoder/asm_dec_offsets.c.o
+ OBJS-yes += $(VP9_PREFIX)decoder/asm_dec_offsets.c.o
CLEAN-OBJS += asm_dec_offsets.asm
$(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)asm_dec_offsets.asm
endif
#include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
-#include "vp8/encoder/boolhuff.h"
-#include "vp8/decoder/dboolhuff.h"
+#include "vp9/encoder/boolhuff.h"
+#include "vp9/decoder/dboolhuff.h"
}
#include "acm_random.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
-#include "vp8/common/entropy.h"
-#include "vp8/common/idct.h"
-#include "vp8/encoder/dct.h"
+#include "vp9/common/entropy.h"
+#include "vp9/common/idct.h"
+#include "vp9/encoder/dct.h"
}
#include "acm_random.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
-#include "vp8/common/idct.h"
-#include "vp8/encoder/dct.h"
+#include "vp9/common/idct.h"
+#include "vp9/encoder/dct.h"
}
#include "acm_random.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
-#include "vp8/encoder/dct.h"
-#include "vp8/common/idct.h"
+#include "vp9/encoder/dct.h"
+#include "vp9/common/idct.h"
}
#include "acm_random.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
-#include "vp8/encoder/dct.h"
-#include "vp8/common/idct.h"
+#include "vp9/encoder/dct.h"
+#include "vp9/common/idct.h"
}
#include "acm_random.h"
+++ /dev/null
-##
-## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-##
-## Use of this source code is governed by a BSD-style license
-## that can be found in the LICENSE file in the root of the source
-## tree. An additional intellectual property rights grant can be found
-## in the file PATENTS. All contributing project authors may
-## be found in the AUTHORS file in the root of the source tree.
-##
-
-VP8_COMMON_SRCS-yes += vp8_common.mk
-VP8_COMMON_SRCS-yes += common/type_aliases.h
-VP8_COMMON_SRCS-yes += common/pragmas.h
-VP8_COMMON_SRCS-yes += common/ppflags.h
-VP8_COMMON_SRCS-yes += common/onyx.h
-VP8_COMMON_SRCS-yes += common/onyxd.h
-VP8_COMMON_SRCS-yes += common/alloccommon.c
-VP8_COMMON_SRCS-yes += common/asm_com_offsets.c
-VP8_COMMON_SRCS-yes += common/blockd.c
-VP8_COMMON_SRCS-yes += common/coefupdateprobs.h
-VP8_COMMON_SRCS-yes += common/debugmodes.c
-VP8_COMMON_SRCS-yes += common/entropy.c
-VP8_COMMON_SRCS-yes += common/entropymode.c
-VP8_COMMON_SRCS-yes += common/entropymv.c
-VP8_COMMON_SRCS-yes += common/extend.c
-VP8_COMMON_SRCS-yes += common/filter.c
-VP8_COMMON_SRCS-yes += common/filter.h
-VP8_COMMON_SRCS-yes += common/findnearmv.c
-VP8_COMMON_SRCS-yes += common/generic/systemdependent.c
-VP8_COMMON_SRCS-yes += common/idctllm.c
-VP8_COMMON_SRCS-yes += common/alloccommon.h
-VP8_COMMON_SRCS-yes += common/blockd.h
-VP8_COMMON_SRCS-yes += common/common.h
-VP8_COMMON_SRCS-yes += common/common_types.h
-VP8_COMMON_SRCS-yes += common/entropy.h
-VP8_COMMON_SRCS-yes += common/entropymode.h
-VP8_COMMON_SRCS-yes += common/entropymv.h
-VP8_COMMON_SRCS-yes += common/extend.h
-VP8_COMMON_SRCS-yes += common/findnearmv.h
-VP8_COMMON_SRCS-yes += common/header.h
-VP8_COMMON_SRCS-yes += common/idct.h
-VP8_COMMON_SRCS-yes += common/invtrans.h
-VP8_COMMON_SRCS-yes += common/loopfilter.h
-VP8_COMMON_SRCS-yes += common/modecont.h
-VP8_COMMON_SRCS-yes += common/mv.h
-VP8_COMMON_SRCS-yes += common/onyxc_int.h
-VP8_COMMON_SRCS-yes += common/pred_common.h
-VP8_COMMON_SRCS-yes += common/pred_common.c
-VP8_COMMON_SRCS-yes += common/quant_common.h
-VP8_COMMON_SRCS-yes += common/reconinter.h
-VP8_COMMON_SRCS-yes += common/reconintra.h
-VP8_COMMON_SRCS-yes += common/reconintra4x4.h
-VP8_COMMON_SRCS-yes += common/rtcd.c
-VP8_COMMON_SRCS-yes += common/rtcd_defs.sh
-VP8_COMMON_SRCS-yes += common/sadmxn.h
-VP8_COMMON_SRCS-yes += common/seg_common.h
-VP8_COMMON_SRCS-yes += common/seg_common.c
-VP8_COMMON_SRCS-yes += common/setupintrarecon.h
-VP8_COMMON_SRCS-yes += common/subpixel.h
-VP8_COMMON_SRCS-yes += common/swapyv12buffer.h
-VP8_COMMON_SRCS-yes += common/systemdependent.h
-VP8_COMMON_SRCS-yes += common/treecoder.h
-VP8_COMMON_SRCS-yes += common/invtrans.c
-VP8_COMMON_SRCS-yes += common/loopfilter.c
-VP8_COMMON_SRCS-yes += common/loopfilter_filters.c
-VP8_COMMON_SRCS-yes += common/mbpitch.c
-VP8_COMMON_SRCS-yes += common/modecont.c
-VP8_COMMON_SRCS-yes += common/modecontext.c
-VP8_COMMON_SRCS-yes += common/mvref_common.c
-VP8_COMMON_SRCS-yes += common/mvref_common.h
-VP8_COMMON_SRCS-yes += common/quant_common.c
-VP8_COMMON_SRCS-yes += common/recon.c
-VP8_COMMON_SRCS-yes += common/reconinter.c
-VP8_COMMON_SRCS-yes += common/reconintra.c
-VP8_COMMON_SRCS-yes += common/reconintra4x4.c
-VP8_COMMON_SRCS-yes += common/setupintrarecon.c
-VP8_COMMON_SRCS-yes += common/swapyv12buffer.c
-VP8_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c
-VP8_COMMON_SRCS-yes += common/treecoder.c
-VP8_COMMON_SRCS-$(CONFIG_IMPLICIT_SEGMENTATION) += common/implicit_segmentation.c
-
-VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/idct_x86.h
-VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/subpixel_x86.h
-VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.h
-VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/postproc_x86.h
-VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/x86_systemdependent.c
-VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp8_asm_stubs.c
-VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.c
-VP8_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.h
-VP8_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.c
-VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx.asm
-VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/iwalsh_mmx.asm
-VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm
-VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/subpixel_mmx.asm
-VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/loopfilter_mmx.asm
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idctllm_sse2.asm
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_sse2.asm
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_wrapper_sse2.c
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/subpixel_sse2.asm
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm
-VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_8t_ssse3.asm
-VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm
-ifeq ($(CONFIG_POSTPROC),yes)
-VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
-endif
-
-# common (c)
-ifeq ($(CONFIG_CSM),yes)
-VP8_COMMON_SRCS-yes += common/maskingmv.c
-VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/mask_sse3.asm
-endif
-
-VP8_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/filter_sse4.c
-ifeq ($(HAVE_SSE4_1),yes)
-vp8/common/x86/filter_sse4.c.o: CFLAGS += -msse4
-endif
-
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/filter_sse2.c
-VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/sadmxn_x86.c
-ifeq ($(HAVE_SSE2),yes)
-vp8/common/x86/filter_sse2.c.o: CFLAGS += -msse2
-vp8/common/x86/loopfilter_x86.c.o: CFLAGS += -msse2
-vp8/common/x86/sadmxn_x86.c.o: CFLAGS += -msse2
-endif
-
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/arm_systemdependent.c
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.c
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.h
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/idct_arm.h
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.h
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/recon_arm.h
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/reconintra_arm.c
-VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/subpixel_arm.h
-
-# common (armv6)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x4_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x8_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem16x16_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/dc_only_idct_add_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/iwalsh_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/filter_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/idct_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/loopfilter_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/recon_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/simpleloopfilter_v6$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/sixtappredict8x4_v6$(ASM)
-
-# common (neon)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict4x4_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x4_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x8_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict16x16_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x4_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x8_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem16x16_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/dc_only_idct_add_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/iwalsh_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfilter_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimplehorizontaledge_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/mbloopfilter_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon2b_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon4b_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/reconb_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_1_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict4x4_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x4_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x8_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict16x16_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon16x16mb_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/buildintrapredictorsmby_neon$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/save_neon_reg$(ASM)
-VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon_neon.c
+++ /dev/null
-##
-## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-##
-## Use of this source code is governed by a BSD-style license
-## that can be found in the LICENSE file in the root of the source
-## tree. An additional intellectual property rights grant can be found
-## in the file PATENTS. All contributing project authors may
-## be found in the AUTHORS file in the root of the source tree.
-##
-
-
-include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk
-
-VP8_CX_EXPORTS += exports_enc
-
-VP8_CX_SRCS-yes += $(VP8_COMMON_SRCS-yes)
-VP8_CX_SRCS-no += $(VP8_COMMON_SRCS-no)
-VP8_CX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes)
-VP8_CX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no)
-
-ifeq ($(ARCH_ARM),yes)
- include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk
-endif
-
-VP8_CX_SRCS-yes += vp8_cx_iface.c
-
-# encoder
-#INCLUDES += algo/vpx_common/vpx_mem/include
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += algo/vpx_ref/cpu_id/include
-#INCLUDES += common
-#INCLUDES += encoder
-
-VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c
-VP8_CX_SRCS-yes += encoder/bitstream.c
-VP8_CX_SRCS-yes += encoder/boolhuff.c
-VP8_CX_SRCS-yes += encoder/dct.c
-VP8_CX_SRCS-yes += encoder/encodeframe.c
-VP8_CX_SRCS-yes += encoder/encodeintra.c
-VP8_CX_SRCS-yes += encoder/encodemb.c
-VP8_CX_SRCS-yes += encoder/encodemv.c
-VP8_CX_SRCS-yes += encoder/firstpass.c
-VP8_CX_SRCS-yes += encoder/generic/csystemdependent.c
-VP8_CX_SRCS-yes += encoder/block.h
-VP8_CX_SRCS-yes += encoder/boolhuff.h
-VP8_CX_SRCS-yes += encoder/bitstream.h
-VP8_CX_SRCS-yes += encoder/encodeintra.h
-VP8_CX_SRCS-yes += encoder/encodemb.h
-VP8_CX_SRCS-yes += encoder/encodemv.h
-VP8_CX_SRCS-yes += encoder/firstpass.h
-VP8_CX_SRCS-yes += encoder/lookahead.c
-VP8_CX_SRCS-yes += encoder/lookahead.h
-VP8_CX_SRCS-yes += encoder/mcomp.h
-VP8_CX_SRCS-yes += encoder/modecosts.h
-VP8_CX_SRCS-yes += encoder/onyx_int.h
-VP8_CX_SRCS-yes += encoder/psnr.h
-VP8_CX_SRCS-yes += encoder/quantize.h
-VP8_CX_SRCS-yes += encoder/ratectrl.h
-VP8_CX_SRCS-yes += encoder/rdopt.h
-VP8_CX_SRCS-yes += encoder/tokenize.h
-VP8_CX_SRCS-yes += encoder/treewriter.h
-VP8_CX_SRCS-yes += encoder/variance.h
-VP8_CX_SRCS-yes += encoder/mcomp.c
-VP8_CX_SRCS-yes += encoder/modecosts.c
-VP8_CX_SRCS-yes += encoder/onyx_if.c
-VP8_CX_SRCS-yes += encoder/picklpf.c
-VP8_CX_SRCS-yes += encoder/psnr.c
-VP8_CX_SRCS-yes += encoder/quantize.c
-VP8_CX_SRCS-yes += encoder/ratectrl.c
-VP8_CX_SRCS-yes += encoder/rdopt.c
-VP8_CX_SRCS-yes += encoder/sad_c.c
-VP8_CX_SRCS-yes += encoder/satd_c.c
-VP8_CX_SRCS-yes += encoder/segmentation.c
-VP8_CX_SRCS-yes += encoder/segmentation.h
-VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c
-VP8_CX_SRCS-yes += encoder/tokenize.c
-VP8_CX_SRCS-yes += encoder/treewriter.c
-VP8_CX_SRCS-yes += encoder/variance_c.c
-ifeq ($(CONFIG_POSTPROC),yes)
-VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h
-VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c
-endif
-VP8_CX_SRCS-yes += encoder/temporal_filter.c
-VP8_CX_SRCS-yes += encoder/temporal_filter.h
-VP8_CX_SRCS-yes += encoder/mbgraph.c
-VP8_CX_SRCS-yes += encoder/mbgraph.h
-
-
-VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/mcomp_x86.h
-VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_x86.h
-VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/temporal_filter_x86.h
-VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/x86_csystemdependent.c
-VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_mmx.c
-VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_impl_mmx.asm
-VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/sad_mmx.asm
-VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm
-VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_sse2.c
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_impl_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/sad_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE3) += encoder/x86/sad_sse3.asm
-VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/sad_ssse3.asm
-VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_ssse3.c
-VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_impl_ssse3.asm
-VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.asm
-VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/sad_sse4.asm
-VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm
-VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm
-VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm
-VP8_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt.asm
-
-
-VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes))
+++ /dev/null
-##
-## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-##
-## Use of this source code is governed by a BSD-style license
-## that can be found in the LICENSE file in the root of the source
-## tree. An additional intellectual property rights grant can be found
-## in the file PATENTS. All contributing project authors may
-## be found in the AUTHORS file in the root of the source tree.
-##
-
-
-#VP8_CX_SRCS list is modified according to different platforms.
-
-#File list for arm
-# encoder
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c
-
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.h
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/encodemb_arm.h
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c
-VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.h
-
-#File list for armv5te
-# encoder
-VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/boolhuff_arm.c
-VP8_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/boolhuff.c
-VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/boolhuff_armv5te$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_armv5$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM)
-
-#File list for armv6
-# encoder
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_subtract_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance8x8_armv6$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/walsh_v6$(ASM)
-
-#File list for neon
-# encoder
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/fastquantizeb_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/picklpf_arm.c
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad8_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad16_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/shortfdct_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/subtract_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/variance_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_mse16x16_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_memcpy_neon$(ASM)
-VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM)
+++ /dev/null
-##
-## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
-##
-## Use of this source code is governed by a BSD-style license
-## that can be found in the LICENSE file in the root of the source
-## tree. An additional intellectual property rights grant can be found
-## in the file PATENTS. All contributing project authors may
-## be found in the AUTHORS file in the root of the source tree.
-##
-
-
-include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk
-
-VP8_DX_EXPORTS += exports_dec
-
-VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes)
-VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no)
-VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes)
-VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no)
-
-ifeq ($(ARCH_ARM),yes)
- include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx_arm.mk
-endif
-
-VP8_DX_SRCS-yes += vp8_dx_iface.c
-
-# common
-#define ARM
-#define DISABLE_THREAD
-
-#INCLUDES += algo/vpx_common/vpx_mem/include
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += decoder
-
-
-
-# decoder
-#define ARM
-#define DISABLE_THREAD
-
-#INCLUDES += algo/vpx_common/vpx_mem/include
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += common
-#INCLUDES += decoder
-
-VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c
-VP8_DX_SRCS-yes += decoder/dboolhuff.c
-VP8_DX_SRCS-yes += decoder/decodemv.c
-VP8_DX_SRCS-yes += decoder/decodframe.c
-VP8_DX_SRCS-yes += decoder/dequantize.c
-VP8_DX_SRCS-yes += decoder/detokenize.c
-VP8_DX_SRCS-yes += decoder/dboolhuff.h
-VP8_DX_SRCS-yes += decoder/decodemv.h
-VP8_DX_SRCS-yes += decoder/dequantize.h
-VP8_DX_SRCS-yes += decoder/detokenize.h
-VP8_DX_SRCS-yes += decoder/onyxd_int.h
-VP8_DX_SRCS-yes += decoder/treereader.h
-VP8_DX_SRCS-yes += decoder/onyxd_if.c
-VP8_DX_SRCS-yes += decoder/idct_blk.c
-
-VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes))
-
-VP8_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/x86_dsystemdependent.c
-VP8_DX_SRCS-$(HAVE_MMX) += decoder/x86/dequantize_mmx.asm
-VP8_DX_SRCS-$(HAVE_MMX) += decoder/x86/idct_blk_mmx.c
-VP8_DX_SRCS-$(HAVE_SSE2) += decoder/x86/idct_blk_sse2.c
#include "vpx_ports/config.h"
#include "vpx_ports/arm.h"
-#include "vp8/common/pragmas.h"
-#include "vp8/common/subpixel.h"
-#include "vp8/common/loopfilter.h"
-#include "vp8/common/recon.h"
-#include "vp8/common/idct.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/pragmas.h"
+#include "vp9/common/subpixel.h"
+#include "vp9/common/loopfilter.h"
+#include "vp9/common/recon.h"
+#include "vp9/common/idct.h"
+#include "vp9/common/onyxc_int.h"
void vp9_arch_arm_common_init(VP9_COMMON *ctx) {
#if CONFIG_RUNTIME_CPU_DETECT
#include <math.h>
-#include "vp8/common/filter.h"
-#include "vp8/common/subpixel.h"
+#include "vp9/common/filter.h"
+#include "vp9/common/subpixel.h"
#include "bilinearfilter_arm.h"
void vp9_filter_block2d_bil_armv6
#include "vpx_ports/config.h"
#include <math.h>
-#include "vp8/common/filter.h"
-#include "vp8/common/subpixel.h"
+#include "vp9/common/filter.h"
+#include "vp9/common/subpixel.h"
#include "vpx_ports/mem.h"
extern void vp9_filter_block2d_first_pass_armv6
#include "vpx_config.h"
-#include "vp8/common/loopfilter.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/loopfilter.h"
+#include "vp9/common/onyxc_int.h"
#if HAVE_ARMV6
extern prototype_loopfilter(vp9_loop_filter_horizontal_edge_armv6);
#include "vpx_ports/config.h"
-#include "vp8/common/recon.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/recon.h"
+#include "vp9/common/blockd.h"
extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr);
#include "vpx_ports/config.h"
-#include "vp8/common/blockd.h"
-#include "vp8/common/reconintra.h"
+#include "vp9/common/blockd.h"
+#include "vp9/common/reconintra.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/recon.h"
+#include "vp9/common/recon.h"
#if HAVE_ARMV7
extern void vp9_build_intra_predictors_mby_neon_func(
}
#ifdef MODE_STATS
-#include "vp8/common/modecont.h"
+#include "vp9/common/modecont.h"
void print_mode_contexts(VP9_COMMON *pc) {
int j, i;
printf("\n====================\n");
#include "findnearmv.h"
-#include "vp8/common/sadmxn.h"
+#include "vp9/common/sadmxn.h"
#include <limits.h>
const unsigned char vp9_mbsplit_offset[4][16] = {
#include "vpx_ports/config.h"
#include "vpx_rtcd.h"
-#include "vp8/common/subpixel.h"
-#include "vp8/common/loopfilter.h"
-#include "vp8/common/idct.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/subpixel.h"
+#include "vp9/common/loopfilter.h"
+#include "vp9/common/idct.h"
+#include "vp9/common/onyxc_int.h"
extern void vp9_arch_x86_common_init(VP9_COMMON *ctx);
extern void vp9_arch_arm_common_init(VP9_COMMON *ctx);
rtcd->subpix.bilinear4x4 = vp9_bilinear_predict4x4_c;
rtcd->subpix.bilinear_avg4x4 = vp9_bilinear_predict_avg4x4_c;
-#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_INTERNAL_STATS)
+#if CONFIG_POSTPROC || (CONFIG_VP9_ENCODER && CONFIG_INTERNAL_STATS)
rtcd->postproc.down = vp9_mbpost_proc_down_c;
rtcd->postproc.across = vp9_mbpost_proc_across_ip_c;
rtcd->postproc.downacross = vp9_post_proc_down_and_across_c;
#ifndef __INC_IDCT_H
#define __INC_IDCT_H
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#define prototype_second_order(sym) \
void sym(short *input, short *output)
#include <assert.h>
#include <math.h>
#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/idct.h"
+#include "vp9/common/systemdependent.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
static const int cospi8sqrt2minus1 = 20091;
static const int sinpi8sqrt2 = 35468;
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
#define MAX_REGIONS 24000
#ifndef NULL
#include "onyxc_int.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/seg_common.h"
+#include "vp9/common/seg_common.h"
static void lf_init_lut(loop_filter_info_n *lfi) {
int filt_lvl;
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vp8/common/pred_common.h"
-#include "vp8/common/seg_common.h"
+#include "vp9/common/pred_common.h"
+#include "vp9/common/seg_common.h"
// TBD prediction functions for various bitstream signals
#include "type_aliases.h"
#include "onyxc_int.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#ifndef __INC_PRED_COMMON_H__
#define __INC_PRED_COMMON_H__ 1
#
# Encoder functions below this point.
#
-if [ "$CONFIG_VP8_ENCODER" = "yes" ]; then
+if [ "$CONFIG_VP9_ENCODER" = "yes" ]; then
# variance
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vp8/common/seg_common.h"
+#include "vp9/common/seg_common.h"
static const int segfeaturedata_signed[SEG_LVL_MAX] = { 1, 1, 0, 0, 0, 0 };
static const int seg_feature_data_bits[SEG_LVL_MAX] = { QINDEX_BITS, 6, 4, 4, 6, 2 };
#include "type_aliases.h"
#include "onyxc_int.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#ifndef __INC_SEG_COMMON_H__
#define __INC_SEG_COMMON_H__ 1
#include <assert.h> // for alignment checks
#include <emmintrin.h> // SSE2
-#include "vp8/common/filter.h"
+#include "vp9/common/filter.h"
#include "vpx_ports/mem.h" // for DECLARE_ALIGNED
#include "vpx_rtcd.h"
#include <assert.h> // for alignment checks
#include <smmintrin.h> // SSE4.1
-#include "vp8/common/filter.h"
+#include "vp9/common/filter.h"
#include "vpx_ports/mem.h" // for DECLARE_ALIGNED
#include "vpx_rtcd.h"
#include <emmintrin.h> // SSE2
#include "vpx_config.h"
-#include "vp8/common/loopfilter.h"
+#include "vp9/common/loopfilter.h"
prototype_loopfilter(vp9_loop_filter_vertical_edge_mmx);
prototype_loopfilter(vp9_loop_filter_horizontal_edge_mmx);
#include "vpx_ports/config.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#define build_intra_predictors_mbuv_prototype(sym) \
void sym(unsigned char *dst, int dst_stride, \
#include "vpx_ports/config.h"
#include "vpx_ports/mem.h"
-#include "vp8/common/subpixel.h"
+#include "vp9/common/subpixel.h"
extern const short vp9_six_tap_mmx[16][6 * 8];
#include "vpx_config.h"
#include "vpx_ports/x86.h"
-#include "vp8/common/subpixel.h"
-#include "vp8/common/loopfilter.h"
-#include "vp8/common/idct.h"
-#include "vp8/common/pragmas.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/subpixel.h"
+#include "vp9/common/loopfilter.h"
+#include "vp9/common/idct.h"
+#include "vp9/common/pragmas.h"
+#include "vp9/common/onyxc_int.h"
void vp9_arch_x86_common_init(VP9_COMMON *ctx) {
#if CONFIG_RUNTIME_CPU_DETECT
*/
#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
+#include "vp9/common/idct.h"
+#include "vp9/decoder/dequantize.h"
void vp8_dequant_dc_idct_add_y_block_v6
(short *q, short *dq, unsigned char *pre,
#include "vpx_ports/config.h"
-#include "vp8/decoder/dequantize.h"
-#include "vp8/common/idct.h"
+#include "vp9/decoder/dequantize.h"
+#include "vp9/common/idct.h"
#include "vpx_mem/vpx_mem.h"
#if HAVE_ARMV7
*/
#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
+#include "vp9/common/idct.h"
+#include "vp9/decoder/dequantize.h"
/* place these declarations here because we don't want to maintain them
* outside of this scope
#include "treereader.h"
-#include "vp8/common/entropymv.h"
-#include "vp8/common/entropymode.h"
+#include "vp9/common/entropymv.h"
+#include "vp9/common/entropymode.h"
#include "onyxd_int.h"
-#include "vp8/common/findnearmv.h"
+#include "vp9/common/findnearmv.h"
-#include "vp8/common/seg_common.h"
-#include "vp8/common/pred_common.h"
-#include "vp8/common/entropy.h"
-#include "vp8/decoder/decodemv.h"
+#include "vp9/common/seg_common.h"
+#include "vp9/common/pred_common.h"
+#include "vp9/common/entropy.h"
+#include "vp9/decoder/decodemv.h"
#if CONFIG_DEBUG
#include <assert.h>
#endif
#include "onyxd_int.h"
-#include "vp8/common/header.h"
-#include "vp8/common/reconintra.h"
-#include "vp8/common/reconintra4x4.h"
-#include "vp8/common/reconinter.h"
+#include "vp9/common/header.h"
+#include "vp9/common/reconintra.h"
+#include "vp9/common/reconintra4x4.h"
+#include "vp9/common/reconinter.h"
#include "detokenize.h"
-#include "vp8/common/invtrans.h"
-#include "vp8/common/alloccommon.h"
-#include "vp8/common/entropymode.h"
-#include "vp8/common/quant_common.h"
+#include "vp9/common/invtrans.h"
+#include "vp9/common/alloccommon.h"
+#include "vp9/common/entropymode.h"
+#include "vp9/common/quant_common.h"
#include "vpx_scale/vpxscale.h"
#include "vpx_scale/yv12extend.h"
-#include "vp8/common/setupintrarecon.h"
+#include "vp9/common/setupintrarecon.h"
#include "decodemv.h"
-#include "vp8/common/extend.h"
-#include "vp8/common/modecont.h"
+#include "vp9/common/extend.h"
+#include "vp9/common/modecont.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/idct.h"
+#include "vp9/common/idct.h"
#include "dboolhuff.h"
-#include "vp8/common/seg_common.h"
-#include "vp8/common/entropy.h"
+#include "vp9/common/seg_common.h"
+#include "vp9/common/entropy.h"
#include "vpx_rtcd.h"
#include <assert.h>
#include "vpx_ports/config.h"
#include "dequantize.h"
-#include "vp8/common/idct.h"
+#include "vp9/common/idct.h"
#include "vpx_mem/vpx_mem.h"
#include "onyxd_int.h"
#ifndef DEQUANTIZE_H
#define DEQUANTIZE_H
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#if CONFIG_LOSSLESS
extern void vp9_dequant_idct_add_lossless_c(short *input, short *dq,
*/
-#include "vp8/common/type_aliases.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/type_aliases.h"
+#include "vp9/common/blockd.h"
#include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
#include "detokenize.h"
-#include "vp8/common/seg_common.h"
+#include "vp9/common/seg_common.h"
#define BOOL_DATA UINT8
*/
#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
+#include "vp9/common/idct.h"
#include "dequantize.h"
void vp9_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred,
*/
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
#if CONFIG_POSTPROC
-#include "vp8/common/postproc.h"
+#include "vp9/common/postproc.h"
#endif
-#include "vp8/common/onyxd.h"
+#include "vp9/common/onyxd.h"
#include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/alloccommon.h"
+#include "vp9/common/alloccommon.h"
#include "vpx_scale/yv12extend.h"
-#include "vp8/common/loopfilter.h"
-#include "vp8/common/swapyv12buffer.h"
+#include "vp9/common/loopfilter.h"
+#include "vp9/common/swapyv12buffer.h"
#include <stdio.h>
#include <assert.h>
-#include "vp8/common/quant_common.h"
+#include "vp9/common/quant_common.h"
#include "vpx_scale/vpxscale.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/systemdependent.h"
#include "vpx_ports/vpx_timer.h"
#include "detokenize.h"
#if ARCH_ARM
#ifndef __INC_ONYXD_INT_H
#define __INC_ONYXD_INT_H
#include "vpx_ports/config.h"
-#include "vp8/common/onyxd.h"
+#include "vp9/common/onyxd.h"
#include "treereader.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
#include "dequantize.h"
// #define DEC_DEBUG
#ifndef tree_reader_h
#define tree_reader_h 1
-#include "vp8/common/treecoder.h"
+#include "vp9/common/treecoder.h"
#include "dboolhuff.h"
*/
#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
+#include "vp9/common/idct.h"
+#include "vp9/decoder/dequantize.h"
void vp9_dequant_dc_idct_add_y_block_mmx(short *q, short *dq,
unsigned char *pre,
*/
#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/decoder/dequantize.h"
+#include "vp9/common/idct.h"
+#include "vp9/decoder/dequantize.h"
void vp9_idct_dequant_dc_0_2x_sse2(short *q, short *dq,
unsigned char *pre, unsigned char *dst,
#include "vpx_ports/config.h"
#include "vpx_ports/x86.h"
-#include "vp8/decoder/onyxd_int.h"
+#include "vp9/decoder/onyxd_int.h"
#if HAVE_MMX
void vp9_dequantize_b_impl_mmx(short *sq, short *dq, short *q);
#include "vpx_ports/config.h"
#include "vpx_ports/arm.h"
-#include "vp8/encoder/variance.h"
-#include "vp8/encoder/onyx_int.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/encoder/onyx_int.h"
extern void (*vp9_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
extern void vp9_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
*/
-#include "vp8/encoder/boolhuff.h"
-#include "vp8/common/blockd.h"
+#include "vp9/encoder/boolhuff.h"
+#include "vp9/common/blockd.h"
const unsigned int vp9_prob_cost[256] = {
2047, 2047, 1791, 1641, 1535, 1452, 1385, 1328, 1279, 1235, 1196, 1161, 1129, 1099, 1072, 1046,
ENDP
-; default inverse zigzag table is defined in vp8/common/entropy.c
+; default inverse zigzag table is defined in vp9/common/entropy.c
_inv_zig_zag_
DCD inv_zig_zag
*/
-#include "vp8/common/onyxc_int.h"
-#include "vp8/encoder/onyx_int.h"
-#include "vp8/encoder/quantize.h"
+#include "vp9/common/onyxc_int.h"
+#include "vp9/encoder/onyx_int.h"
+#include "vp9/encoder/quantize.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_scale/yv12extend.h"
#include "vpx_scale/vpxscale.h"
-#include "vp8/common/alloccommon.h"
+#include "vp9/common/alloccommon.h"
extern void vp8_memcpy_neon(unsigned char *dst_ptr, unsigned char *src_ptr, int sz);
#include <math.h>
#include "vpx_mem/vpx_mem.h"
-#include "vp8/encoder/quantize.h"
-#include "vp8/common/entropy.h"
+#include "vp9/encoder/quantize.h"
+#include "vp9/common/entropy.h"
#if HAVE_ARMV7
*/
#include "vpx_config.h"
-#include "vp8/encoder/variance.h"
-#include "vp8/common/filter.h"
-#include "vp8/common/arm/bilinearfilter_arm.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/common/filter.h"
+#include "vp9/common/arm/bilinearfilter_arm.h"
#define HALFNDX 8
#include "vpx_ports/asm_offsets.h"
#include "vpx_config.h"
#include "block.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#include "onyx_int.h"
#include "treewriter.h"
#include "tokenize.h"
*/
-#include "vp8/common/header.h"
+#include "vp9/common/header.h"
#include "encodemv.h"
-#include "vp8/common/entropymode.h"
-#include "vp8/common/findnearmv.h"
+#include "vp9/common/entropymode.h"
+#include "vp9/common/findnearmv.h"
#include "mcomp.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/systemdependent.h"
#include <assert.h>
#include <stdio.h>
#include <limits.h>
-#include "vp8/common/pragmas.h"
+#include "vp9/common/pragmas.h"
#include "vpx/vpx_encoder.h"
#include "vpx_mem/vpx_mem.h"
#include "bitstream.h"
#include "segmentation.h"
-#include "vp8/common/seg_common.h"
-#include "vp8/common/pred_common.h"
-#include "vp8/common/entropy.h"
-#include "vp8/encoder/encodemv.h"
-#include "vp8/common/entropymv.h"
+#include "vp9/common/seg_common.h"
+#include "vp9/common/pred_common.h"
+#include "vp9/common/entropy.h"
+#include "vp9/encoder/encodemv.h"
+#include "vp9/common/entropymv.h"
#if CONFIG_NEWBESTREFMV
-#include "vp8/common/mvref_common.h"
+#include "vp9/common/mvref_common.h"
#endif
#if defined(SECTIONBITS_OUTPUT)
#ifndef __INC_BLOCK_H
#define __INC_BLOCK_H
-#include "vp8/common/onyx.h"
-#include "vp8/common/entropymv.h"
-#include "vp8/common/entropy.h"
+#include "vp9/common/onyx.h"
+#include "vp9/common/entropymv.h"
+#include "vp9/common/entropy.h"
#include "vpx_ports/mem.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
// motion search site
typedef struct {
#include <assert.h>
#include <math.h>
#include "vpx_ports/config.h"
-#include "vp8/common/idct.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/idct.h"
+#include "vp9/common/systemdependent.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
// TODO: these transforms can be converted into integer forms to reduce
// the complexity
#include "vpx_ports/config.h"
#include "encodemb.h"
#include "encodemv.h"
-#include "vp8/common/common.h"
+#include "vp9/common/common.h"
#include "onyx_int.h"
-#include "vp8/common/extend.h"
-#include "vp8/common/entropymode.h"
-#include "vp8/common/quant_common.h"
+#include "vp9/common/extend.h"
+#include "vp9/common/entropymode.h"
+#include "vp9/common/quant_common.h"
#include "segmentation.h"
-#include "vp8/common/setupintrarecon.h"
-#include "vp8/common/reconintra4x4.h"
+#include "vp9/common/setupintrarecon.h"
+#include "vp9/common/reconintra4x4.h"
#include "encodeintra.h"
-#include "vp8/common/reconinter.h"
-#include "vp8/common/invtrans.h"
+#include "vp9/common/reconinter.h"
+#include "vp9/common/invtrans.h"
#include "rdopt.h"
-#include "vp8/common/findnearmv.h"
-#include "vp8/common/reconintra.h"
-#include "vp8/common/seg_common.h"
+#include "vp9/common/findnearmv.h"
+#include "vp9/common/reconintra.h"
+#include "vp9/common/seg_common.h"
#include "vpx_rtcd.h"
#include <stdio.h>
#include <math.h>
#include <limits.h>
-#include "vp8/common/subpixel.h"
+#include "vp9/common/subpixel.h"
#include "vpx_ports/vpx_timer.h"
-#include "vp8/common/pred_common.h"
+#include "vp9/common/pred_common.h"
#define DBG_PRNT_SEGMAP 0
#if CONFIG_NEWBESTREFMV
-#include "vp8/common/mvref_common.h"
+#include "vp9/common/mvref_common.h"
#endif
#include "vpx_ports/config.h"
#include "vpx_rtcd.h"
-#include "vp8/common/idct.h"
+#include "vp9/common/idct.h"
#include "quantize.h"
-#include "vp8/common/reconintra.h"
-#include "vp8/common/reconintra4x4.h"
+#include "vp9/common/reconintra.h"
+#include "vp9/common/reconintra4x4.h"
#include "encodemb.h"
-#include "vp8/common/invtrans.h"
+#include "vp9/common/invtrans.h"
#include "encodeintra.h"
#if CONFIG_RUNTIME_CPU_DETECT
#include "vpx_ports/config.h"
#include "encodemb.h"
-#include "vp8/common/reconinter.h"
+#include "vp9/common/reconinter.h"
#include "quantize.h"
#include "tokenize.h"
-#include "vp8/common/invtrans.h"
-#include "vp8/common/reconintra.h"
+#include "vp9/common/invtrans.h"
+#include "vp9/common/reconintra.h"
#include "vpx_mem/vpx_mem.h"
#include "rdopt.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/systemdependent.h"
#include "vpx_rtcd.h"
#if CONFIG_RUNTIME_CPU_DETECT
*/
-#include "vp8/common/common.h"
+#include "vp9/common/common.h"
#include "encodemv.h"
-#include "vp8/common/entropymode.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/entropymode.h"
+#include "vp9/common/systemdependent.h"
#include <math.h>
#include "onyx_int.h"
#include "variance.h"
#include "encodeintra.h"
-#include "vp8/common/setupintrarecon.h"
+#include "vp9/common/setupintrarecon.h"
#include "mcomp.h"
#include "firstpass.h"
#include "vpx_scale/vpxscale.h"
#include "encodemb.h"
-#include "vp8/common/extend.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/extend.h"
+#include "vp9/common/systemdependent.h"
#include "vpx_scale/yv12extend.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/swapyv12buffer.h"
+#include "vp9/common/swapyv12buffer.h"
#include <stdio.h>
#include "rdopt.h"
#include "ratectrl.h"
-#include "vp8/common/quant_common.h"
-#include "vp8/common/entropymv.h"
+#include "vp9/common/quant_common.h"
+#include "vp9/common/entropymv.h"
#include "encodemv.h"
#define OUTPUT_FPF 0
#include "vpx_ports/config.h"
-#include "vp8/encoder/variance.h"
-#include "vp8/encoder/onyx_int.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/encoder/onyx_int.h"
void vp9_arch_x86_encoder_init(VP9_COMP *cpi);
#include <stdlib.h>
#include "vpx_config.h"
#include "lookahead.h"
-#include "vp8/common/extend.h"
+#include "vp9/common/extend.h"
#define MAX_LAG_BUFFERS 25
*/
#include <limits.h>
-#include <vp8/encoder/encodeintra.h>
-#include <vp8/encoder/rdopt.h>
-#include <vp8/common/setupintrarecon.h>
-#include <vp8/common/blockd.h>
-#include <vp8/common/reconinter.h>
-#include <vp8/common/systemdependent.h>
+#include <vp9/encoder/encodeintra.h>
+#include <vp9/encoder/rdopt.h>
+#include <vp9/common/setupintrarecon.h>
+#include <vp9/common/blockd.h>
+#include <vp9/common/reconinter.h>
+#include <vp9/common/systemdependent.h>
#include <vpx_mem/vpx_mem.h>
-#include <vp8/encoder/segmentation.h>
+#include <vp9/encoder/segmentation.h>
static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi,
int_mv *ref_mv,
*/
-#include "vp8/encoder/onyx_int.h"
+#include "vp9/encoder/onyx_int.h"
#include "mcomp.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/config.h"
#include <stdio.h>
#include <limits.h>
#include <math.h>
-#include "vp8/common/findnearmv.h"
+#include "vp9/common/findnearmv.h"
#ifdef ENTROPY_STATS
static int mv_ref_ct [31] [4] [2];
*/
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#include "onyx_int.h"
#include "treewriter.h"
-#include "vp8/common/entropymode.h"
+#include "vp9/common/entropymode.h"
void vp9_init_mode_costs(VP9_COMP *c) {
#include "vpx_config.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
#include "onyx_int.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/systemdependent.h"
#include "quantize.h"
-#include "vp8/common/alloccommon.h"
+#include "vp9/common/alloccommon.h"
#include "mcomp.h"
#include "firstpass.h"
#include "psnr.h"
#include "vpx_scale/vpxscale.h"
-#include "vp8/common/extend.h"
+#include "vp9/common/extend.h"
#include "ratectrl.h"
-#include "vp8/common/quant_common.h"
+#include "vp9/common/quant_common.h"
#include "segmentation.h"
#include "vpx_scale/yv12extend.h"
#if CONFIG_POSTPROC
-#include "vp8/common/postproc.h"
+#include "vp9/common/postproc.h"
#endif
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/swapyv12buffer.h"
+#include "vp9/common/swapyv12buffer.h"
#include "vpx_ports/vpx_timer.h"
#include "temporal_filter.h"
-#include "vp8/common/seg_common.h"
+#include "vp9/common/seg_common.h"
#include "mbgraph.h"
-#include "vp8/common/pred_common.h"
-#include "vp8/encoder/rdopt.h"
+#include "vp9/common/pred_common.h"
+#include "vp9/encoder/rdopt.h"
#include "bitstream.h"
#include "ratectrl.h"
#if CONFIG_NEWBESTREFMV
-#include "vp8/common/mvref_common.h"
+#include "vp9/common/mvref_common.h"
#endif
#if ARCH_ARM
#include <stdio.h>
#include "vpx_ports/config.h"
-#include "vp8/common/onyx.h"
+#include "vp9/common/onyx.h"
#include "treewriter.h"
#include "tokenize.h"
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
#include "variance.h"
#include "encodemb.h"
#include "quantize.h"
-#include "vp8/common/entropy.h"
-#include "vp8/common/entropymode.h"
+#include "vp9/common/entropy.h"
+#include "vp9/common/entropymode.h"
#include "vpx_ports/mem.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "mcomp.h"
#include "temporal_filter.h"
-#include "vp8/common/findnearmv.h"
+#include "vp9/common/findnearmv.h"
#include "lookahead.h"
// #define SPEEDSTATS 1
*/
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
#include "onyx_int.h"
#include "quantize.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_scale/yv12extend.h"
#include "vpx_scale/vpxscale.h"
-#include "vp8/common/alloccommon.h"
-#include "vp8/common/loopfilter.h"
+#include "vp9/common/alloccommon.h"
+#include "vp9/common/loopfilter.h"
#if ARCH_ARM
#include "vpx_ports/arm.h"
#endif
*/
-#include "vp8/encoder/variance.h"
-#include "vp8/encoder/onyx_int.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/encoder/onyx_int.h"
SADFunction *vp9_sad16x16;
SADFunction *vp9_sad16x8;
#include "vpx_scale/yv12config.h"
#include "math.h"
-#include "vp8/common/systemdependent.h" /* for vp9_clear_system_state() */
+#include "vp9/common/systemdependent.h" /* for vp9_clear_system_state() */
#define MAX_PSNR 100
#include "onyx_int.h"
#include "quantize.h"
-#include "vp8/common/quant_common.h"
+#include "vp9/common/quant_common.h"
-#include "vp8/common/seg_common.h"
+#include "vp9/common/seg_common.h"
#ifdef ENC_DEBUG
extern int enc_debug;
#include <assert.h>
#include "math.h"
-#include "vp8/common/alloccommon.h"
-#include "vp8/common/common.h"
+#include "vp9/common/alloccommon.h"
+#include "vp9/common/common.h"
#include "ratectrl.h"
-#include "vp8/common/entropymode.h"
+#include "vp9/common/entropymode.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/systemdependent.h"
#include "encodemv.h"
-#include "vp8/common/quant_common.h"
+#include "vp9/common/quant_common.h"
#define MIN_BPB_FACTOR 0.005
#define MAX_BPB_FACTOR 50
#include <math.h>
#include <limits.h>
#include <assert.h>
-#include "vp8/common/pragmas.h"
+#include "vp9/common/pragmas.h"
#include "tokenize.h"
#include "treewriter.h"
#include "onyx_int.h"
#include "modecosts.h"
#include "encodeintra.h"
-#include "vp8/common/entropymode.h"
-#include "vp8/common/reconinter.h"
-#include "vp8/common/reconintra.h"
-#include "vp8/common/reconintra4x4.h"
-#include "vp8/common/findnearmv.h"
-#include "vp8/common/quant_common.h"
+#include "vp9/common/entropymode.h"
+#include "vp9/common/reconinter.h"
+#include "vp9/common/reconintra.h"
+#include "vp9/common/reconintra4x4.h"
+#include "vp9/common/findnearmv.h"
+#include "vp9/common/quant_common.h"
#include "encodemb.h"
#include "quantize.h"
-#include "vp8/common/idct.h"
+#include "vp9/common/idct.h"
#include "variance.h"
#include "mcomp.h"
#include "rdopt.h"
#include "ratectrl.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/systemdependent.h"
-#include "vp8/encoder/encodemv.h"
+#include "vp9/common/systemdependent.h"
+#include "vp9/encoder/encodemv.h"
-#include "vp8/common/seg_common.h"
-#include "vp8/common/pred_common.h"
-#include "vp8/common/entropy.h"
+#include "vp9/common/seg_common.h"
+#include "vp9/common/pred_common.h"
+#include "vp9/common/entropy.h"
#include "vpx_rtcd.h"
#if CONFIG_NEWBESTREFMV
-#include "vp8/common/mvref_common.h"
+#include "vp9/common/mvref_common.h"
#endif
#if CONFIG_RUNTIME_CPU_DETECT
#include <stdlib.h>
-#include "vp8/common/sadmxn.h"
+#include "vp9/common/sadmxn.h"
#include "vpx_ports/config.h"
#include "vpx/vpx_integer.h"
#include "limits.h"
#include "vpx_mem/vpx_mem.h"
#include "segmentation.h"
-#include "vp8/common/pred_common.h"
+#include "vp9/common/pred_common.h"
void vp9_update_gf_useage_maps(VP9_COMP *cpi, VP9_COMMON *cm, MACROBLOCK *x) {
int mb_row, mb_col;
#include "string.h"
-#include "vp8/common/blockd.h"
+#include "vp9/common/blockd.h"
#include "onyx_int.h"
#ifndef __INC_SEGMENTATION_H__
*/
-#include "vp8/common/onyxc_int.h"
+#include "vp9/common/onyxc_int.h"
#include "onyx_int.h"
-#include "vp8/common/systemdependent.h"
+#include "vp9/common/systemdependent.h"
#include "quantize.h"
-#include "vp8/common/alloccommon.h"
+#include "vp9/common/alloccommon.h"
#include "mcomp.h"
#include "firstpass.h"
#include "psnr.h"
#include "vpx_scale/vpxscale.h"
-#include "vp8/common/extend.h"
+#include "vp9/common/extend.h"
#include "ratectrl.h"
-#include "vp8/common/quant_common.h"
+#include "vp9/common/quant_common.h"
#include "segmentation.h"
#include "vpx_scale/yv12extend.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/swapyv12buffer.h"
+#include "vp9/common/swapyv12buffer.h"
#include "vpx_ports/vpx_timer.h"
#include <math.h>
#include "tokenize.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp8/common/pred_common.h"
-#include "vp8/common/seg_common.h"
-#include "vp8/common/entropy.h"
+#include "vp9/common/pred_common.h"
+#include "vp9/common/seg_common.h"
+#include "vp9/common/entropy.h"
/* Global event counters used for accumulating statistics across several
compressions, then generating context.c = initial stats. */
#ifndef tokenize_h
#define tokenize_h
-#include "vp8/common/entropy.h"
+#include "vp9/common/entropy.h"
#include "block.h"
void vp9_tokenize_initialize();
/* Trees map alphabets into huffman-like codes suitable for an arithmetic
bit coder. Timothy S Murphy 11 October 2004 */
-#include "vp8/common/treecoder.h"
+#include "vp9/common/treecoder.h"
#include "boolhuff.h" /* for now */
#include "variance.h"
-#include "vp8/common/filter.h"
+#include "vp9/common/filter.h"
unsigned int vp9_get_mb_ss_c(const short *src_ptr) {
mov rdx, [rsp + zrun_zbin_boost] ; reset to b->zrun_zbin_boost
.rq_zigzag_loop_%1:
%endmacro
-; in vp9_default_zig_zag1d order: see vp8/common/entropy.c
+; in vp9_default_zig_zag1d order: see vp9/common/entropy.c
ZIGZAG_LOOP 0
ZIGZAG_LOOP 1
ZIGZAG_LOOP 4
mov rdx, rax ; reset to b->zrun_zbin_boost
.rq_zigzag_loop_%1:
%endmacro
-; in vp9_default_zig_zag1d order: see vp8/common/entropy.c
+; in vp9_default_zig_zag1d order: see vp9/common/entropy.c
ZIGZAG_LOOP 0, 0, xmm2, xmm6, xmm4
ZIGZAG_LOOP 1, 1, xmm2, xmm6, xmm4
ZIGZAG_LOOP 4, 4, xmm2, xmm6, xmm4
SECTION_RODATA
align 16
-; vp8/common/entropy.c: vp9_default_zig_zag1d
+; vp9/common/entropy.c: vp9_default_zig_zag1d
zig_zag1d:
db 0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
*/
#include "vpx_config.h"
-#include "vp8/encoder/variance.h"
-#include "vp8/common/pragmas.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/common/pragmas.h"
#include "vpx_ports/mem.h"
extern void filter_block1d_h6_mmx
*/
#include "vpx_config.h"
-#include "vp8/encoder/variance.h"
-#include "vp8/common/pragmas.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/common/pragmas.h"
#include "vpx_ports/mem.h"
#define HALFNDX 8
*/
#include "vpx_config.h"
-#include "vp8/encoder/variance.h"
-#include "vp8/common/pragmas.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/common/pragmas.h"
#include "vpx_ports/mem.h"
#define HALFNDX 8
#include "vpx_ports/config.h"
#include "vpx_ports/x86.h"
-#include "vp8/encoder/variance.h"
-#include "vp8/encoder/onyx_int.h"
+#include "vp9/encoder/variance.h"
+#include "vp9/encoder/onyx_int.h"
#if HAVE_MMX
--- /dev/null
+##
+## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+##
+## Use of this source code is governed by a BSD-style license
+## that can be found in the LICENSE file in the root of the source
+## tree. An additional intellectual property rights grant can be found
+## in the file PATENTS. All contributing project authors may
+## be found in the AUTHORS file in the root of the source tree.
+##
+
+VP9_COMMON_SRCS-yes += vp9_common.mk
+VP9_COMMON_SRCS-yes += common/type_aliases.h
+VP9_COMMON_SRCS-yes += common/pragmas.h
+VP9_COMMON_SRCS-yes += common/ppflags.h
+VP9_COMMON_SRCS-yes += common/onyx.h
+VP9_COMMON_SRCS-yes += common/onyxd.h
+VP9_COMMON_SRCS-yes += common/alloccommon.c
+VP9_COMMON_SRCS-yes += common/asm_com_offsets.c
+VP9_COMMON_SRCS-yes += common/blockd.c
+VP9_COMMON_SRCS-yes += common/coefupdateprobs.h
+VP9_COMMON_SRCS-yes += common/debugmodes.c
+VP9_COMMON_SRCS-yes += common/entropy.c
+VP9_COMMON_SRCS-yes += common/entropymode.c
+VP9_COMMON_SRCS-yes += common/entropymv.c
+VP9_COMMON_SRCS-yes += common/extend.c
+VP9_COMMON_SRCS-yes += common/filter.c
+VP9_COMMON_SRCS-yes += common/filter.h
+VP9_COMMON_SRCS-yes += common/findnearmv.c
+VP9_COMMON_SRCS-yes += common/generic/systemdependent.c
+VP9_COMMON_SRCS-yes += common/idctllm.c
+VP9_COMMON_SRCS-yes += common/alloccommon.h
+VP9_COMMON_SRCS-yes += common/blockd.h
+VP9_COMMON_SRCS-yes += common/common.h
+VP9_COMMON_SRCS-yes += common/common_types.h
+VP9_COMMON_SRCS-yes += common/entropy.h
+VP9_COMMON_SRCS-yes += common/entropymode.h
+VP9_COMMON_SRCS-yes += common/entropymv.h
+VP9_COMMON_SRCS-yes += common/extend.h
+VP9_COMMON_SRCS-yes += common/findnearmv.h
+VP9_COMMON_SRCS-yes += common/header.h
+VP9_COMMON_SRCS-yes += common/idct.h
+VP9_COMMON_SRCS-yes += common/invtrans.h
+VP9_COMMON_SRCS-yes += common/loopfilter.h
+VP9_COMMON_SRCS-yes += common/modecont.h
+VP9_COMMON_SRCS-yes += common/mv.h
+VP9_COMMON_SRCS-yes += common/onyxc_int.h
+VP9_COMMON_SRCS-yes += common/pred_common.h
+VP9_COMMON_SRCS-yes += common/pred_common.c
+VP9_COMMON_SRCS-yes += common/quant_common.h
+VP9_COMMON_SRCS-yes += common/reconinter.h
+VP9_COMMON_SRCS-yes += common/reconintra.h
+VP9_COMMON_SRCS-yes += common/reconintra4x4.h
+VP9_COMMON_SRCS-yes += common/rtcd.c
+VP9_COMMON_SRCS-yes += common/rtcd_defs.sh
+VP9_COMMON_SRCS-yes += common/sadmxn.h
+VP9_COMMON_SRCS-yes += common/seg_common.h
+VP9_COMMON_SRCS-yes += common/seg_common.c
+VP9_COMMON_SRCS-yes += common/setupintrarecon.h
+VP9_COMMON_SRCS-yes += common/subpixel.h
+VP9_COMMON_SRCS-yes += common/swapyv12buffer.h
+VP9_COMMON_SRCS-yes += common/systemdependent.h
+VP9_COMMON_SRCS-yes += common/treecoder.h
+VP9_COMMON_SRCS-yes += common/invtrans.c
+VP9_COMMON_SRCS-yes += common/loopfilter.c
+VP9_COMMON_SRCS-yes += common/loopfilter_filters.c
+VP9_COMMON_SRCS-yes += common/mbpitch.c
+VP9_COMMON_SRCS-yes += common/modecont.c
+VP9_COMMON_SRCS-yes += common/modecontext.c
+VP9_COMMON_SRCS-yes += common/mvref_common.c
+VP9_COMMON_SRCS-yes += common/mvref_common.h
+VP9_COMMON_SRCS-yes += common/quant_common.c
+VP9_COMMON_SRCS-yes += common/recon.c
+VP9_COMMON_SRCS-yes += common/reconinter.c
+VP9_COMMON_SRCS-yes += common/reconintra.c
+VP9_COMMON_SRCS-yes += common/reconintra4x4.c
+VP9_COMMON_SRCS-yes += common/setupintrarecon.c
+VP9_COMMON_SRCS-yes += common/swapyv12buffer.c
+VP9_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c
+VP9_COMMON_SRCS-yes += common/treecoder.c
+VP9_COMMON_SRCS-$(CONFIG_IMPLICIT_SEGMENTATION) += common/implicit_segmentation.c
+
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/idct_x86.h
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/subpixel_x86.h
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.h
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/postproc_x86.h
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/x86_systemdependent.c
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp8_asm_stubs.c
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.c
+VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.h
+VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.c
+VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx.asm
+VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/iwalsh_mmx.asm
+VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm
+VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/subpixel_mmx.asm
+VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/loopfilter_mmx.asm
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idctllm_sse2.asm
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_sse2.asm
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_wrapper_sse2.c
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/subpixel_sse2.asm
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm
+VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_8t_ssse3.asm
+VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm
+ifeq ($(CONFIG_POSTPROC),yes)
+VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
+endif
+
+# common (c)
+ifeq ($(CONFIG_CSM),yes)
+VP9_COMMON_SRCS-yes += common/maskingmv.c
+VP9_COMMON_SRCS-$(HAVE_SSE3) += common/x86/mask_sse3.asm
+endif
+
+VP9_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/filter_sse4.c
+ifeq ($(HAVE_SSE4_1),yes)
+vp9/common/x86/filter_sse4.c.o: CFLAGS += -msse4
+endif
+
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/filter_sse2.c
+VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/sadmxn_x86.c
+ifeq ($(HAVE_SSE2),yes)
+vp9/common/x86/filter_sse2.c.o: CFLAGS += -msse2
+vp9/common/x86/loopfilter_x86.c.o: CFLAGS += -msse2
+vp9/common/x86/sadmxn_x86.c.o: CFLAGS += -msse2
+endif
+
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/arm_systemdependent.c
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.c
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.h
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/idct_arm.h
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.h
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/recon_arm.h
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/reconintra_arm.c
+VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/subpixel_arm.h
+
+# common (armv6)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x4_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x8_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem16x16_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/dc_only_idct_add_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/iwalsh_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/filter_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/idct_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/loopfilter_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/recon_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/simpleloopfilter_v6$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/sixtappredict8x4_v6$(ASM)
+
+# common (neon)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict4x4_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x4_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x8_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict16x16_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x4_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x8_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem16x16_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/dc_only_idct_add_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/iwalsh_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfilter_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimplehorizontaledge_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/mbloopfilter_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon2b_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon4b_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/reconb_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_1_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict4x4_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x4_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x8_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict16x16_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon16x16mb_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/buildintrapredictorsmby_neon$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/save_neon_reg$(ASM)
+VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon_neon.c
#include "vpx/vpx_codec.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx_version.h"
-#include "vp8/encoder/onyx_int.h"
+#include "vp9/encoder/onyx_int.h"
#include "vpx/vp8e.h"
-#include "vp8/encoder/firstpass.h"
-#include "vp8/common/onyx.h"
+#include "vp9/encoder/firstpass.h"
+#include "vp9/common/onyx.h"
#include <stdlib.h>
#include <string.h>
--- /dev/null
+##
+## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+##
+## Use of this source code is governed by a BSD-style license
+## that can be found in the LICENSE file in the root of the source
+## tree. An additional intellectual property rights grant can be found
+## in the file PATENTS. All contributing project authors may
+## be found in the AUTHORS file in the root of the source tree.
+##
+
+
+include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk
+
+VP9_CX_EXPORTS += exports_enc
+
+VP9_CX_SRCS-yes += $(VP9_COMMON_SRCS-yes)
+VP9_CX_SRCS-no += $(VP9_COMMON_SRCS-no)
+VP9_CX_SRCS_REMOVE-yes += $(VP9_COMMON_SRCS_REMOVE-yes)
+VP9_CX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no)
+
+ifeq ($(ARCH_ARM),yes)
+ include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx_arm.mk
+endif
+
+VP9_CX_SRCS-yes += vp9_cx_iface.c
+
+# encoder
+#INCLUDES += algo/vpx_common/vpx_mem/include
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += algo/vpx_ref/cpu_id/include
+#INCLUDES += common
+#INCLUDES += encoder
+
+VP9_CX_SRCS-yes += encoder/asm_enc_offsets.c
+VP9_CX_SRCS-yes += encoder/bitstream.c
+VP9_CX_SRCS-yes += encoder/boolhuff.c
+VP9_CX_SRCS-yes += encoder/dct.c
+VP9_CX_SRCS-yes += encoder/encodeframe.c
+VP9_CX_SRCS-yes += encoder/encodeintra.c
+VP9_CX_SRCS-yes += encoder/encodemb.c
+VP9_CX_SRCS-yes += encoder/encodemv.c
+VP9_CX_SRCS-yes += encoder/firstpass.c
+VP9_CX_SRCS-yes += encoder/generic/csystemdependent.c
+VP9_CX_SRCS-yes += encoder/block.h
+VP9_CX_SRCS-yes += encoder/boolhuff.h
+VP9_CX_SRCS-yes += encoder/bitstream.h
+VP9_CX_SRCS-yes += encoder/encodeintra.h
+VP9_CX_SRCS-yes += encoder/encodemb.h
+VP9_CX_SRCS-yes += encoder/encodemv.h
+VP9_CX_SRCS-yes += encoder/firstpass.h
+VP9_CX_SRCS-yes += encoder/lookahead.c
+VP9_CX_SRCS-yes += encoder/lookahead.h
+VP9_CX_SRCS-yes += encoder/mcomp.h
+VP9_CX_SRCS-yes += encoder/modecosts.h
+VP9_CX_SRCS-yes += encoder/onyx_int.h
+VP9_CX_SRCS-yes += encoder/psnr.h
+VP9_CX_SRCS-yes += encoder/quantize.h
+VP9_CX_SRCS-yes += encoder/ratectrl.h
+VP9_CX_SRCS-yes += encoder/rdopt.h
+VP9_CX_SRCS-yes += encoder/tokenize.h
+VP9_CX_SRCS-yes += encoder/treewriter.h
+VP9_CX_SRCS-yes += encoder/variance.h
+VP9_CX_SRCS-yes += encoder/mcomp.c
+VP9_CX_SRCS-yes += encoder/modecosts.c
+VP9_CX_SRCS-yes += encoder/onyx_if.c
+VP9_CX_SRCS-yes += encoder/picklpf.c
+VP9_CX_SRCS-yes += encoder/psnr.c
+VP9_CX_SRCS-yes += encoder/quantize.c
+VP9_CX_SRCS-yes += encoder/ratectrl.c
+VP9_CX_SRCS-yes += encoder/rdopt.c
+VP9_CX_SRCS-yes += encoder/sad_c.c
+VP9_CX_SRCS-yes += encoder/satd_c.c
+VP9_CX_SRCS-yes += encoder/segmentation.c
+VP9_CX_SRCS-yes += encoder/segmentation.h
+VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c
+VP9_CX_SRCS-yes += encoder/tokenize.c
+VP9_CX_SRCS-yes += encoder/treewriter.c
+VP9_CX_SRCS-yes += encoder/variance_c.c
+ifeq ($(CONFIG_POSTPROC),yes)
+VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h
+VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c
+endif
+VP9_CX_SRCS-yes += encoder/temporal_filter.c
+VP9_CX_SRCS-yes += encoder/temporal_filter.h
+VP9_CX_SRCS-yes += encoder/mbgraph.c
+VP9_CX_SRCS-yes += encoder/mbgraph.h
+
+
+VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/mcomp_x86.h
+VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_x86.h
+VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/temporal_filter_x86.h
+VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/x86_csystemdependent.c
+VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_mmx.c
+VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_impl_mmx.asm
+VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/sad_mmx.asm
+VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm
+VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_sse2.c
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_impl_sse2.asm
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/sad_sse2.asm
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
+VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/sad_sse3.asm
+VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/sad_ssse3.asm
+VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_ssse3.c
+VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_impl_ssse3.asm
+VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.asm
+VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/sad_sse4.asm
+VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm
+VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm
+VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm
+VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt.asm
+
+
+VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes))
--- /dev/null
+##
+## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+##
+## Use of this source code is governed by a BSD-style license
+## that can be found in the LICENSE file in the root of the source
+## tree. An additional intellectual property rights grant can be found
+## in the file PATENTS. All contributing project authors may
+## be found in the AUTHORS file in the root of the source tree.
+##
+
+
+#VP9_CX_SRCS list is modified according to different platforms.
+
+#File list for arm
+# encoder
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c
+
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.h
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/encodemb_arm.h
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c
+VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.h
+
+#File list for armv5te
+# encoder
+VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/boolhuff_arm.c
+VP9_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/boolhuff.c
+VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/boolhuff_armv5te$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_armv5$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM)
+
+#File list for armv6
+# encoder
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_subtract_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance8x8_armv6$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/walsh_v6$(ASM)
+
+#File list for neon
+# encoder
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/fastquantizeb_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/picklpf_arm.c
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad8_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad16_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/shortfdct_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/subtract_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/variance_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_mse16x16_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_memcpy_neon$(ASM)
+VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM)
--- /dev/null
+##
+## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+##
+## Use of this source code is governed by a BSD-style license
+## that can be found in the LICENSE file in the root of the source
+## tree. An additional intellectual property rights grant can be found
+## in the file PATENTS. All contributing project authors may
+## be found in the AUTHORS file in the root of the source tree.
+##
+
+
+include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk
+
+VP9_DX_EXPORTS += exports_dec
+
+VP9_DX_SRCS-yes += $(VP9_COMMON_SRCS-yes)
+VP9_DX_SRCS-no += $(VP9_COMMON_SRCS-no)
+VP9_DX_SRCS_REMOVE-yes += $(VP9_COMMON_SRCS_REMOVE-yes)
+VP9_DX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no)
+
+ifeq ($(ARCH_ARM),yes)
+ include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx_arm.mk
+endif
+
+VP9_DX_SRCS-yes += vp9_dx_iface.c
+
+# common
+#define ARM
+#define DISABLE_THREAD
+
+#INCLUDES += algo/vpx_common/vpx_mem/include
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += decoder
+
+
+
+# decoder
+#define ARM
+#define DISABLE_THREAD
+
+#INCLUDES += algo/vpx_common/vpx_mem/include
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += common
+#INCLUDES += decoder
+
+VP9_DX_SRCS-yes += decoder/asm_dec_offsets.c
+VP9_DX_SRCS-yes += decoder/dboolhuff.c
+VP9_DX_SRCS-yes += decoder/decodemv.c
+VP9_DX_SRCS-yes += decoder/decodframe.c
+VP9_DX_SRCS-yes += decoder/dequantize.c
+VP9_DX_SRCS-yes += decoder/detokenize.c
+VP9_DX_SRCS-yes += decoder/dboolhuff.h
+VP9_DX_SRCS-yes += decoder/decodemv.h
+VP9_DX_SRCS-yes += decoder/dequantize.h
+VP9_DX_SRCS-yes += decoder/detokenize.h
+VP9_DX_SRCS-yes += decoder/onyxd_int.h
+VP9_DX_SRCS-yes += decoder/treereader.h
+VP9_DX_SRCS-yes += decoder/onyxd_if.c
+VP9_DX_SRCS-yes += decoder/idct_blk.c
+
+VP9_DX_SRCS-yes := $(filter-out $(VP9_DX_SRCS_REMOVE-yes),$(VP9_DX_SRCS-yes))
+
+VP9_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/x86_dsystemdependent.c
+VP9_DX_SRCS-$(HAVE_MMX) += decoder/x86/dequantize_mmx.asm
+VP9_DX_SRCS-$(HAVE_MMX) += decoder/x86/idct_blk_mmx.c
+VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/idct_blk_sse2.c
/*!\file
* \brief Provides controls common to both the VP8 encoder and decoder.
*/
-#ifndef VP8_H
-#define VP8_H
+#ifndef VP9_H
+#define VP9_H
#include "vpx_codec_impl_top.h"
/*!\brief Control functions
* \brief Provides definitions for using the VP8 encoder algorithm within the
* vpx Codec Interface.
*/
-#ifndef VP8CX_H
-#define VP8CX_H
+#ifndef VP9CX_H
+#define VP9CX_H
#include "vpx_config.h"
#include "vpx_codec_impl_top.h"
* \brief Provides definitions for using the VP8 algorithm within the vpx Decoder
* interface.
*/
-#ifndef VP8DX_H
-#define VP8DX_H
+#ifndef VP9DX_H
+#define VP9DX_H
#include "vpx_codec_impl_top.h"
/*!\name Algorithm interface for VP8
/* This file contains backwards compatibility stubs for applications using
* the VP8 version 1.0 API.
*/
-#ifndef VP8E_H
-#define VP8E_H
+#ifndef VP9E_H
+#define VP9E_H
#include "vpx_codec_impl_top.h"
#if defined(VPX_CODEC_DISABLE_COMPAT) && VPX_CODEC_DISABLE_COMPAT
#include "vpx_config.h"
#include "vpx/vpx_decoder.h"
#include "vpx_ports/vpx_timer.h"
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
#include "vpx/vp8dx.h"
#endif
#if CONFIG_MD5
unsigned int fourcc;
unsigned int fourcc_mask;
} ifaces[] = {
-#if CONFIG_VP8_DECODER
- {"vp8", vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF},
+#if CONFIG_VP9_DECODER
+ {"vp9", vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF},
#endif
};
NULL
};
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
static const arg_def_t addnoise_level = ARG_DEF(NULL, "noise-level", 1,
"Enable VP8 postproc add noise");
static const arg_def_t deblock = ARG_DEF(NULL, "deblock", 0,
fprintf(stderr, "Usage: %s <options> filename\n\n"
"Options:\n", exec_name);
arg_show_usage(stderr, all_args);
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
fprintf(stderr, "\nVP8 Postprocessing Options:\n");
arg_show_usage(stderr, vp8_pp_args);
#endif
unsigned int fps_num;
void *out = NULL;
vpx_codec_dec_cfg_t cfg = {0};
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
vp8_postproc_cfg_t vp8_pp_cfg = {0};
int vp8_dbg_color_ref_frame = 0;
int vp8_dbg_color_mb_modes = 0;
else if (arg_match(&arg, &verbosearg, argi))
quiet = 0;
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
else if (arg_match(&arg, &addnoise_level, argi)) {
postproc = 1;
vp8_pp_cfg.post_proc_flag |= VP8_ADDNOISE;
if (!quiet)
fprintf(stderr, "%s\n", decoder.name);
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
if (vp8_pp_cfg.post_proc_flag
&& vpx_codec_control(&decoder, VP8_SET_POSTPROC, &vp8_pp_cfg)) {
unsigned int fourcc;
unsigned int fourcc_mask;
} ifaces[] = {
-#if CONFIG_VP8_DECODER
- {"vp8", &vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF},
+#if CONFIG_VP9_DECODER
+ {"vp9", &vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF},
#endif
};
unsigned int fourcc;
unsigned int fourcc_mask;
} codecs[] = {
-#if CONFIG_VP8_ENCODER
- {"vp8", vpx_codec_vp8x_cx, VP8_FOURCC, 0x00FFFFFF},
+#if CONFIG_VP9_ENCODER
+ {"vp9", vpx_codec_vp8x_cx, VP8_FOURCC, 0x00FFFFFF},
#endif
};
};
-#if CONFIG_VP8_ENCODER
+#if CONFIG_VP9_ENCODER
static const arg_def_t noise_sens = ARG_DEF(NULL, "noise-sensitivity", 1,
"Noise sensitivity (frames to blur)");
static const arg_def_t sharpness = ARG_DEF(NULL, "sharpness", 1,
"Motion detection threshold");
#endif
-#if CONFIG_VP8_ENCODER
+#if CONFIG_VP9_ENCODER
static const arg_def_t cpu_used = ARG_DEF(NULL, "cpu-used", 1,
"CPU Used (-16..16)");
#endif
-#if CONFIG_VP8_ENCODER
+#if CONFIG_VP9_ENCODER
static const arg_def_t token_parts = ARG_DEF(NULL, "token-parts", 1,
"Number of token partitions to use, log2");
static const arg_def_t auto_altref = ARG_DEF(NULL, "auto-alt-ref", 1,
arg_show_usage(stdout, rc_twopass_args);
fprintf(stderr, "\nKeyframe Placement Options:\n");
arg_show_usage(stdout, kf_args);
-#if CONFIG_VP8_ENCODER
+#if CONFIG_VP9_ENCODER
fprintf(stderr, "\nVP8 Specific Options:\n");
arg_show_usage(stdout, vp8_args);
#endif
#endif
/* Handle codec specific options */
-#if CONFIG_VP8_ENCODER
+#if CONFIG_VP9_ENCODER
if (codec->fourcc == VP8_FOURCC) {
ctrl_args = vp8_args;
projects / libvpx / commitdiff