libvpx: Pull from upstream

source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc

 /*
  *  Copyright (c) 2014 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.
  */
 
@@ skipping 47 matching lines @@
 const EncodePerfTestVideo kVP9EncodePerfTestVectors[] = {
     {"niklas_1280_720_30.yuv", 1280, 720, 600, 10},
 };
 
 struct EncodeParameters {
   int32_t tile_rows;
   int32_t tile_cols;
   int32_t lossless;
   int32_t error_resilient;
   int32_t frame_parallel;
+  vpx_color_space_t cs;
   // TODO(JBB): quantizers / bitrate
 };
 
 const EncodeParameters kVP9EncodeParameterSet[] = {
-    {0, 0, 0, 1, 0},
-    {0, 0, 0, 0, 0},
-    {0, 0, 1, 0, 0},
-    {0, 2, 0, 0, 1},
+    {0, 0, 0, 1, 0, VPX_CS_BT_601},
+    {0, 0, 0, 0, 0, VPX_CS_BT_709},
+    {0, 0, 1, 0, 0, VPX_CS_BT_2020},
+    {0, 2, 0, 0, 1, VPX_CS_UNKNOWN},
     // TODO(JBB): Test profiles (requires more work).
 };
 
 int is_extension_y4m(const char *filename) {
   const char *dot = strrchr(filename, '.');
   if (!dot || dot == filename)
     return 0;
   else
     return !strcmp(dot, ".y4m");
 }
@@ skipping 16 matching lines @@
     cfg_.g_lag_in_frames = 25;
     cfg_.g_error_resilient = encode_parms.error_resilient;
     dec_cfg_.threads = 4;
     test_video_ = GET_PARAM(2);
     cfg_.rc_target_bitrate = test_video_.bitrate;
   }
 
   virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
                                   ::libvpx_test::Encoder *encoder) {
     if (video->frame() == 1) {
+      encoder->Control(VP9E_SET_COLOR_SPACE, encode_parms.cs);
       encoder->Control(VP9E_SET_LOSSLESS, encode_parms.lossless);
       encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING,
                        encode_parms.frame_parallel);
       encoder->Control(VP9E_SET_TILE_ROWS, encode_parms.tile_rows);
       encoder->Control(VP9E_SET_TILE_COLUMNS, encode_parms.tile_cols);
       encoder->Control(VP8E_SET_CPUUSED, kCpuUsed);
       encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
       encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);
       encoder->Control(VP8E_SET_ARNR_STRENGTH, 5);
       encoder->Control(VP8E_SET_ARNR_TYPE, 3);
@@ skipping 18 matching lines @@
       EXPECT_EQ(common->tx_mode, ONLY_4X4);
     }
     EXPECT_EQ(common->error_resilient_mode, encode_parms.error_resilient);
     if (encode_parms.error_resilient) {
       EXPECT_EQ(common->frame_parallel_decoding_mode, 1);
       EXPECT_EQ(common->use_prev_frame_mvs, 0);
     } else {
       EXPECT_EQ(common->frame_parallel_decoding_mode,
                 encode_parms.frame_parallel);
     }
-
+    EXPECT_EQ(common->color_space, encode_parms.cs);
     EXPECT_EQ(common->log2_tile_cols, encode_parms.tile_cols);
     EXPECT_EQ(common->log2_tile_rows, encode_parms.tile_rows);
 
     EXPECT_EQ(VPX_CODEC_OK, res_dec) << decoder->DecodeError();
     return VPX_CODEC_OK == res_dec;
   }
 
   EncodePerfTestVideo test_video_;
 
  private:
@@ skipping 19 matching lines @@
   ASSERT_NO_FATAL_FAILURE(RunLoop(video));
   delete(video);
 }
 
 VP9_INSTANTIATE_TEST_CASE(
     Vp9EncoderParmsGetToDecoder,
     ::testing::ValuesIn(kVP9EncodeParameterSet),
     ::testing::ValuesIn(kVP9EncodePerfTestVectors));
 
 }  // namespace