generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp9: strip mb graph code

Browse Source 
when CONFIG_REALTIME_ONLY is enabled.

BUG=webm:1446

Change-Id: I4b1b8e9a456830ba1b1bd3a8882e038d37ee7903
This commit is contained in:
Scott LaVarnway 2017-08-11 12:24:33 -07:00
parent c42517568d
commit e702b68b6c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/encoder/vp9_encoder.c
View File

@ -914,6 +914,7 @@ static void restore_coding_context(VP9_COMP *cpi) {
*cm->fc = cc->fc; *cm->fc = cc->fc;
} }
#if !CONFIG_REALTIME_ONLY
static void configure_static_seg_features(VP9_COMP *cpi) { static void configure_static_seg_features(VP9_COMP *cpi) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
const RATE_CONTROL *const rc = &cpi->rc; const RATE_CONTROL *const rc = &cpi->rc;
@ -1037,6 +1038,7 @@ static void configure_static_seg_features(VP9_COMP *cpi) {
} }
} }
} }
#endif // !CONFIG_REALTIME_ONLY
static void update_reference_segmentation_map(VP9_COMP *cpi) { static void update_reference_segmentation_map(VP9_COMP *cpi) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
@ -3214,7 +3216,6 @@ static void set_size_independent_vars(VP9_COMP *cpi) {
static void set_size_dependent_vars(VP9_COMP *cpi, int *q, int *bottom_index, static void set_size_dependent_vars(VP9_COMP *cpi, int *q, int *bottom_index,
int *top_index) { int *top_index) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
const VP9EncoderConfig *const oxcf = &cpi->oxcf;
// Setup variables that depend on the dimensions of the frame. // Setup variables that depend on the dimensions of the frame.
vp9_set_speed_features_framesize_dependent(cpi); vp9_set_speed_features_framesize_dependent(cpi);
@ -3226,17 +3227,19 @@ static void set_size_dependent_vars(VP9_COMP *cpi, int *q, int *bottom_index,
vp9_set_high_precision_mv(cpi, (*q) < HIGH_PRECISION_MV_QTHRESH); vp9_set_high_precision_mv(cpi, (*q) < HIGH_PRECISION_MV_QTHRESH);
} }
#if !CONFIG_REALTIME_ONLY
// Configure experimental use of segmentation for enhanced coding of // Configure experimental use of segmentation for enhanced coding of
// static regions if indicated. // static regions if indicated.
// Only allowed in the second pass of a two pass encode, as it requires // Only allowed in the second pass of a two pass encode, as it requires
// lagged coding, and if the relevant speed feature flag is set. // lagged coding, and if the relevant speed feature flag is set.
if (oxcf->pass == 2 && cpi->sf.static_segmentation) if (cpi->oxcf.pass == 2 && cpi->sf.static_segmentation)
configure_static_seg_features(cpi); configure_static_seg_features(cpi);
#endif // !CONFIG_REALTIME_ONLY
#if CONFIG_VP9_POSTPROC && !(CONFIG_VP9_TEMPORAL_DENOISING) #if CONFIG_VP9_POSTPROC && !(CONFIG_VP9_TEMPORAL_DENOISING)
if (oxcf->noise_sensitivity > 0) { if (cpi->oxcf.noise_sensitivity > 0) {
int l = 0; int l = 0;
switch (oxcf->noise_sensitivity) { switch (cpi->oxcf.noise_sensitivity) {
case 1: l = 20; break; case 1: l = 20; break;
case 2: l = 40; break; case 2: l = 40; break;
case 3: l = 60; break; case 3: l = 60; break;

1
vp9/vp9cx.mk
View File

@ -140,5 +140,6 @@ VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct_msa.h
# Strip unnecessary files with CONFIG_REALTIME_ONLY # Strip unnecessary files with CONFIG_REALTIME_ONLY
VP9_CX_SRCS_REMOVE-$(CONFIG_REALTIME_ONLY) += encoder/vp9_firstpass.c VP9_CX_SRCS_REMOVE-$(CONFIG_REALTIME_ONLY) += encoder/vp9_firstpass.c
VP9_CX_SRCS_REMOVE-$(CONFIG_REALTIME_ONLY) += encoder/vp9_mbgraph.c
VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes))