Chromium Code Reviews| Index: media/filters/vpx_video_decoder.cc |
| diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc |
| index 9ee8eaa5945082e582119170725d43e1dfe2e99b..5fb9439c5fcb640215e41a9a8169ddd9951d0eeb 100644 |
| --- a/media/filters/vpx_video_decoder.cc |
| +++ b/media/filters/vpx_video_decoder.cc |
| @@ -598,11 +598,12 @@ bool VpxVideoDecoder::VpxDecode(const scoped_refptr<DecoderBuffer>& buffer, |
| ->metadata() |
| ->SetInteger(VideoFrameMetadata::COLOR_SPACE, color_space); |
| - if (config_.color_space_info() != gfx::ColorSpace()) { |
| + if (config_.color_space_info() != VideoColorSpace()) { |
|
ccameron
2017/03/20 21:58:24
IsValid (if you want ... we got in the habit of "c
hubbe
2017/03/20 22:03:09
IsValid() and comparing against ctor have differen
|
| // config_.color_space_info() comes from the color tag which is |
| // more expressive than the bitstream, so prefer it over the |
| // bitstream data below. |
| - (*video_frame)->set_color_space(config_.color_space_info()); |
| + (*video_frame) |
| + ->set_color_space(config_.color_space_info().ToGfxColorSpace()); |
| } else { |
| gfx::ColorSpace::PrimaryID primaries = gfx::ColorSpace::PrimaryID::INVALID; |
| gfx::ColorSpace::TransferID transfer = gfx::ColorSpace::TransferID::INVALID; |