make spatial svc an experiment
disabled by default, enable with: --enable-experimental --enable-spatial-svc this disables vp9_spatial_svc_encoder and svc_test, further work is needed to remove internal lib references Change-Id: I6a487ecbf07eb98843a99d96e17f08f960b63088
This commit is contained in:
Родитель
06496d5508
Коммит
f12ebfc939
|
@ -265,8 +265,9 @@ HAVE_LIST="
|
|||
unistd_h
|
||||
"
|
||||
EXPERIMENT_LIST="
|
||||
multiple_arf
|
||||
alpha
|
||||
multiple_arf
|
||||
spatial_svc
|
||||
"
|
||||
CONFIG_LIST="
|
||||
external_build
|
||||
|
|
20
examples.mk
20
examples.mk
|
@ -67,15 +67,17 @@ ifeq ($(CONFIG_WEBM_IO),yes)
|
|||
endif
|
||||
vpxenc.GUID = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1
|
||||
vpxenc.DESCRIPTION = Full featured encoder
|
||||
EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_svc_encoder.c
|
||||
vp9_spatial_svc_encoder.SRCS += args.c args.h
|
||||
vp9_spatial_svc_encoder.SRCS += ivfenc.c ivfenc.h
|
||||
vp9_spatial_svc_encoder.SRCS += tools_common.c tools_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_writer.h video_writer.c
|
||||
vp9_spatial_svc_encoder.SRCS += vpxstats.c vpxstats.h
|
||||
vp9_spatial_svc_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D
|
||||
vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder
|
||||
ifeq ($(CONFIG_SPATIAL_SVC),yes)
|
||||
EXAMPLES-$(CONFIG_VP9_ENCODER) += vp9_spatial_svc_encoder.c
|
||||
vp9_spatial_svc_encoder.SRCS += args.c args.h
|
||||
vp9_spatial_svc_encoder.SRCS += ivfenc.c ivfenc.h
|
||||
vp9_spatial_svc_encoder.SRCS += tools_common.c tools_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_common.h
|
||||
vp9_spatial_svc_encoder.SRCS += video_writer.h video_writer.c
|
||||
vp9_spatial_svc_encoder.SRCS += vpxstats.c vpxstats.h
|
||||
vp9_spatial_svc_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D
|
||||
vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_SHARED),yes)
|
||||
EXAMPLES-$(CONFIG_VP9_ENCODER) += resize_util.c
|
||||
|
|
2
libs.mk
2
libs.mk
|
@ -115,7 +115,7 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
|
|||
CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS))
|
||||
CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h
|
||||
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
|
||||
INSTALL-LIBS-yes += include/vpx/svc_context.h
|
||||
INSTALL-LIBS-$(CONFIG_SPATIAL_SVC) += include/vpx/svc_context.h
|
||||
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
|
||||
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
|
||||
CODEC_DOC_SECTIONS += vp9 vp9_encoder
|
||||
|
|
|
@ -113,10 +113,13 @@ LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct16x16_test.cc
|
|||
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += dct32x32_test.cc
|
||||
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += fdct4x4_test.cc
|
||||
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += fdct8x8_test.cc
|
||||
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += svc_test.cc
|
||||
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += variance_test.cc
|
||||
LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += vp9_subtract_test.cc
|
||||
|
||||
ifeq ($(CONFIG_VP9_ENCODER),yes)
|
||||
LIBVPX_TEST_SRCS-$(CONFIG_SPATIAL_SVC) += svc_test.cc
|
||||
endif
|
||||
|
||||
endif # VP9
|
||||
|
||||
LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += sad_test.cc
|
||||
|
|
|
@ -15,8 +15,10 @@ API_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h
|
|||
API_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h
|
||||
API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h
|
||||
API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h
|
||||
API_SRCS-$(CONFIG_VP9_ENCODER) += src/svc_encodeframe.c
|
||||
API_SRCS-$(CONFIG_VP9_ENCODER) += svc_context.h
|
||||
ifeq ($(CONFIG_VP9_ENCODER),yes)
|
||||
API_SRCS-$(CONFIG_SPATIAL_SVC) += src/svc_encodeframe.c
|
||||
API_SRCS-$(CONFIG_SPATIAL_SVC) += svc_context.h
|
||||
endif
|
||||
|
||||
API_SRCS-$(CONFIG_VP8_DECODER) += vp8.h
|
||||
API_SRCS-$(CONFIG_VP8_DECODER) += vp8dx.h
|
||||
|
|
Загрузка…
Ссылка в новой задаче