diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-01-14 14:14:34 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-14 14:14:34 -0800 |
| commit | 829a01dbb730cd4039a4c21c8eacc63dff5946c7 (patch) | |
| tree | a1c71a6e689736579ed289203abfeddb6e8495be /test | |
| parent | c7d6c0c5a85d70a5a0e619cb41a6c5df35224f35 (diff) | |
| parent | e94b415c3479129944a69fafbeacf550fb9237b7 (diff) | |
| download | libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.tar libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.tar.gz libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.tar.bz2 libvpx-829a01dbb730cd4039a4c21c8eacc63dff5946c7.zip | |
Merge "Add encoder control for setting color space"
Diffstat (limited to 'test')
| -rw-r--r-- | test/vp9_encoder_parms_get_to_decoder.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/vp9_encoder_parms_get_to_decoder.cc b/test/vp9_encoder_parms_get_to_decoder.cc index 6c354fd38..34e7854a9 100644 --- a/test/vp9_encoder_parms_get_to_decoder.cc +++ b/test/vp9_encoder_parms_get_to_decoder.cc @@ -65,14 +65,15 @@ struct EncodeParameters { 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). }; @@ -109,6 +110,7 @@ class Vp9EncoderParmsGetToDecoder 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); @@ -147,7 +149,7 @@ class Vp9EncoderParmsGetToDecoder 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); |