shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Enable aq mode 3 for all datarate tests."

--- a/test/svc_datarate_test.cc

+++ b/test/svc_datarate_test.cc

@@ -207,6 +207,8 @@

     }

     if (dynamic_drop_layer_) {

+      // TODO(jian): Disable AQ Mode for this test for now.

+      encoder->Control(VP9E_SET_AQ_MODE, 0);

       if (video->frame() == 0) {

         // Change layer bitrates to set top layers to 0. This will trigger skip

         // encoding/dropping of top two spatial layers.

@@ -838,7 +840,7 @@

   layer_framedrop_ = GET_PARAM(2);

   AssignLayerBitrates();

   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));

-  CheckLayerRateTargeting(number_spatial_layers_, number_temporal_layers_, 0.75,

+  CheckLayerRateTargeting(number_spatial_layers_, number_temporal_layers_, 0.71,

                           1.45);

 #if CONFIG_VP9_DECODER

   // The non-reference frames are expected to be mismatched frames as the

@@ -885,7 +887,7 @@

   layer_framedrop_ = GET_PARAM(2);

   AssignLayerBitrates();

   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));

-  CheckLayerRateTargeting(number_spatial_layers_, number_temporal_layers_, 0.73,

+  CheckLayerRateTargeting(number_spatial_layers_, number_temporal_layers_, 0.58,

                           1.2);

 #if CONFIG_VP9_DECODER

   // The non-reference frames are expected to be mismatched frames as the

@@ -1137,7 +1139,7 @@

   ResetModel();

   AssignLayerBitrates();

   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));

-  CheckLayerRateTargeting(number_spatial_layers_, number_temporal_layers_, 0.78,

+  CheckLayerRateTargeting(number_spatial_layers_, number_temporal_layers_, 0.77,

                           1.15);

 #if CONFIG_VP9_DECODER

   // The non-reference frames are expected to be mismatched frames as the

--- a/test/svc_test.cc

+++ b/test/svc_test.cc

@@ -26,6 +26,7 @@

     encoder->Control(VP9E_SET_SVC, 1);

     encoder->Control(VP9E_SET_SVC_PARAMETERS, &svc_params_);

     encoder->Control(VP8E_SET_CPUUSED, speed_setting_);

+    encoder->Control(VP9E_SET_AQ_MODE, 3);

     encoder->Control(VP9E_SET_TILE_COLUMNS, 0);

     encoder->Control(VP8E_SET_MAX_INTRA_BITRATE_PCT, 300);

     encoder->Control(VP9E_SET_TILE_COLUMNS, get_msb(cfg_.g_threads));

--- a/test/vp9_datarate_test.cc

+++ b/test/vp9_datarate_test.cc

@@ -110,7 +110,10 @@

   virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,

                                   ::libvpx_test::Encoder *encoder) {

-    if (video->frame() == 0) encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);

+    if (video->frame() == 0) {

+      encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);

+      encoder->Control(VP9E_SET_AQ_MODE, 3);

+    }

     if (denoiser_offon_test_) {

       ASSERT_GT(denoiser_offon_period_, 0)

@@ -128,6 +131,7 @@

     if (use_roi_) {

       encoder->Control(VP9E_SET_ROI_MAP, &roi_);

+      encoder->Control(VP9E_SET_AQ_MODE, 0);

     }

     if (cfg_.ts_number_layers > 1) {