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

Unified Diff: media/filters/vpx_video_decoder.cc

Issue 2697863003: color: Clarify default behaviors (Closed)
Patch Set: Incorporate review feedback Created 3 years, 10 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.cc » ('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 07b1bed0b5cb0ae9807b3cfb54061200cf95195b..9ee8eaa5945082e582119170725d43e1dfe2e99b 100644
--- a/media/filters/vpx_video_decoder.cc
+++ b/media/filters/vpx_video_decoder.cc
@@ -604,11 +604,9 @@ bool VpxVideoDecoder::VpxDecode(const scoped_refptr<DecoderBuffer>& buffer,
// bitstream data below.
(*video_frame)->set_color_space(config_.color_space_info());
} else {
- gfx::ColorSpace::PrimaryID primaries =
- gfx::ColorSpace::PrimaryID::UNSPECIFIED;
- gfx::ColorSpace::TransferID transfer =
- gfx::ColorSpace::TransferID::UNSPECIFIED;
- gfx::ColorSpace::MatrixID matrix = gfx::ColorSpace::MatrixID::UNSPECIFIED;
+ gfx::ColorSpace::PrimaryID primaries = gfx::ColorSpace::PrimaryID::INVALID;
+ gfx::ColorSpace::TransferID transfer = gfx::ColorSpace::TransferID::INVALID;
+ gfx::ColorSpace::MatrixID matrix = gfx::ColorSpace::MatrixID::INVALID;
gfx::ColorSpace::RangeID range = vpx_image->range == VPX_CR_FULL_RANGE
? gfx::ColorSpace::RangeID::FULL
: gfx::ColorSpace::RangeID::LIMITED;
@@ -651,7 +649,8 @@ bool VpxVideoDecoder::VpxDecode(const scoped_refptr<DecoderBuffer>& buffer,
break;
}
- if (primaries != gfx::ColorSpace::PrimaryID::UNSPECIFIED) {
+ // TODO(ccameron): Set a color space even for unspecified values.
+ if (primaries != gfx::ColorSpace::PrimaryID::INVALID) {
(*video_frame)
->set_color_space(
gfx::ColorSpace(primaries, transfer, matrix, range));
« no previous file with comments | « media/filters/h264_parser.cc ('k') | media/formats/webm/webm_colour_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698