Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(592)

Unified Diff: media/filters/vpx_video_decoder.cc

Issue 2746013006: use VideoColorSpace in decoder configuration (Closed)
Patch Set: oops, win compile fix reapplied Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/h264_parser.cc ('k') | media/formats/webm/webm_colour_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()) {
// 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;
« no previous file with comments | « media/filters/h264_parser.cc ('k') | media/formats/webm/webm_colour_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698