diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-09-15 21:56:51 -0400 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-09-16 06:41:46 -0400 |
commit | eeb5ef0a240cb7c69d5e92cdd9879032fb4bc5a7 (patch) | |
tree | d5c3713996f6630ffe9cfd0bf3c69ecb636d6a59 /test/vp9_encoder_parms_get_to_decoder.cc | |
parent | e562c71783d303bab7f9d6a9852db3debec3f865 (diff) | |
download | libvpx-eeb5ef0a240cb7c69d5e92cdd9879032fb4bc5a7.tar.gz |
Add support for color-range.
In decoder, export (eventually) into vpx_image_t.range field. In
encoder, use oxcf->color_range to set it (same way as for
color_space).
See issue 1059.
Change-Id: Ieabbb2a785fa58cc4044bd54eee66f328f3906ce
Diffstat (limited to 'test/vp9_encoder_parms_get_to_decoder.cc')
-rw-r--r-- | test/vp9_encoder_parms_get_to_decoder.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/vp9_encoder_parms_get_to_decoder.cc b/test/vp9_encoder_parms_get_to_decoder.cc index 1ceff1e7e..901605d06 100644 --- a/test/vp9_encoder_parms_get_to_decoder.cc +++ b/test/vp9_encoder_parms_get_to_decoder.cc @@ -40,15 +40,16 @@ struct EncodeParameters { int32_t lossless; int32_t error_resilient; int32_t frame_parallel; + int32_t color_range; vpx_color_space_t cs; // TODO(JBB): quantizers / bitrate }; const EncodeParameters kVP9EncodeParameterSet[] = { - {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}, + {0, 0, 0, 1, 0, 0, VPX_CS_BT_601}, + {0, 0, 0, 0, 0, 1, VPX_CS_BT_709}, + {0, 0, 1, 0, 0, 1, VPX_CS_BT_2020}, + {0, 2, 0, 0, 1, 0, VPX_CS_UNKNOWN}, // TODO(JBB): Test profiles (requires more work). }; @@ -76,6 +77,7 @@ class VpxEncoderParmsGetToDecoder ::libvpx_test::Encoder *encoder) { if (video->frame() == 1) { encoder->Control(VP9E_SET_COLOR_SPACE, encode_parms.cs); + encoder->Control(VP9E_SET_COLOR_RANGE, encode_parms.color_range); encoder->Control(VP9E_SET_LOSSLESS, encode_parms.lossless); encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING, encode_parms.frame_parallel); @@ -114,6 +116,7 @@ class VpxEncoderParmsGetToDecoder EXPECT_EQ(encode_parms.frame_parallel, common->frame_parallel_decoding_mode); } + EXPECT_EQ(encode_parms.color_range, common->color_range); EXPECT_EQ(encode_parms.cs, common->color_space); EXPECT_EQ(encode_parms.tile_cols, common->log2_tile_cols); EXPECT_EQ(encode_parms.tile_rows, common->log2_tile_rows); |