diff options
| author | Guillaume Martres <gmartres@google.com> | 2013-11-14 19:23:57 +0100 |
|---|---|---|
| committer | Guillaume Martres <gmartres@google.com> | 2013-11-15 19:42:20 +0100 |
| commit | 17084657e6da5b02ab1e492b237e52f2bd38ade3 (patch) | |
| tree | bd28fc2e74c97c48d03f9164cbaf58771f236cdc /vp9/encoder/vp9_onyx_if.c | |
| parent | d1899557eb727d8d1430e87e88ad5cdd358f0549 (diff) | |
| download | libvpx-17084657e6da5b02ab1e492b237e52f2bd38ade3.tar libvpx-17084657e6da5b02ab1e492b237e52f2bd38ade3.tar.gz libvpx-17084657e6da5b02ab1e492b237e52f2bd38ade3.tar.bz2 libvpx-17084657e6da5b02ab1e492b237e52f2bd38ade3.zip | |
vpxenc: add --aq-mode flag to control adaptive quantization
Change-Id: I57e1ad4bed3487df12893ced77c49093f8755706
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 8a9834310..a38337880 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -764,8 +764,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) { sf->static_segmentation = 0; #endif - sf->variance_adaptive_quantization = 0; - switch (mode) { case 0: // This is the best quality mode. break; @@ -3195,7 +3193,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, } } - if (cpi->sf.variance_adaptive_quantization) { + if (cpi->oxcf.aq_mode == VARIANCE_AQ) { vp9_vaq_frame_setup(cpi); } @@ -3980,7 +3978,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, vp9_setup_interp_filters(&cpi->mb.e_mbd, DEFAULT_INTERP_FILTER, cm); - if (cpi->sf.variance_adaptive_quantization) { + if (cpi->oxcf.aq_mode == VARIANCE_AQ) { vp9_vaq_init(); } |