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

Unified Diff: chromecast/media/cma/base/decoder_config_adapter.cc

Issue 2697863003: color: Clarify default behaviors (Closed)
Patch Set: Do less 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
Index: chromecast/media/cma/base/decoder_config_adapter.cc
diff --git a/chromecast/media/cma/base/decoder_config_adapter.cc b/chromecast/media/cma/base/decoder_config_adapter.cc
index d9039b296518c1338cefa23189c8a3b08ae1c198..ecc8b70c6e02c787e6814d1d8b42cf1d4efb8840 100644
--- a/chromecast/media/cma/base/decoder_config_adapter.cc
+++ b/chromecast/media/cma/base/decoder_config_adapter.cc
@@ -239,8 +239,8 @@ VideoConfig DecoderConfigAdapter::ToCastVideoConfig(
video_config.encryption_scheme = ToEncryptionScheme(
config.encryption_scheme());
- // TODO(servolk): gfx::ColorSpace currently doesn't provide getters for color
- // space components. We'll need to way to fix this. crbug.com/649758
+ // TODO(servolk/ccameron): Use gfx::ColorSpace::GetVideoParameters to get
+ // these values.
// video_config.primaries =
// static_cast<PrimaryID>(config.color_space_info().primaries());
// video_config.transfer =
@@ -273,62 +273,5 @@ VideoConfig DecoderConfigAdapter::ToCastVideoConfig(
return video_config;
}
-// Ensure that Chromecast enum values match enums in gfx::ColorSpace.
-#define STATIC_ASSERT_ENUM(a, b) \
- static_assert(static_cast<int>(a) == static_cast<int>(gfx::ColorSpace::b), \
- "mismatching enums: " #a " and " #b)
-
-STATIC_ASSERT_ENUM(PrimaryID::RESERVED0, PrimaryID::RESERVED0);
-STATIC_ASSERT_ENUM(PrimaryID::BT709, PrimaryID::BT709);
-STATIC_ASSERT_ENUM(PrimaryID::UNSPECIFIED, PrimaryID::UNSPECIFIED);
-STATIC_ASSERT_ENUM(PrimaryID::RESERVED, PrimaryID::RESERVED);
-STATIC_ASSERT_ENUM(PrimaryID::BT470M, PrimaryID::BT470M);
-STATIC_ASSERT_ENUM(PrimaryID::BT470BG, PrimaryID::BT470BG);
-STATIC_ASSERT_ENUM(PrimaryID::SMPTE170M, PrimaryID::SMPTE170M);
-STATIC_ASSERT_ENUM(PrimaryID::SMPTE240M, PrimaryID::SMPTE240M);
-STATIC_ASSERT_ENUM(PrimaryID::FILM, PrimaryID::FILM);
-STATIC_ASSERT_ENUM(PrimaryID::BT2020, PrimaryID::BT2020);
-STATIC_ASSERT_ENUM(PrimaryID::SMPTEST428_1, PrimaryID::SMPTEST428_1);
-STATIC_ASSERT_ENUM(PrimaryID::SMPTEST431_2, PrimaryID::SMPTEST431_2);
-STATIC_ASSERT_ENUM(PrimaryID::SMPTEST431_2, PrimaryID::SMPTEST431_2);
-STATIC_ASSERT_ENUM(PrimaryID::SMPTEST432_1, PrimaryID::SMPTEST432_1);
-
-STATIC_ASSERT_ENUM(TransferID::RESERVED0, TransferID::RESERVED0);
-STATIC_ASSERT_ENUM(TransferID::BT709, TransferID::BT709);
-STATIC_ASSERT_ENUM(TransferID::UNSPECIFIED, TransferID::UNSPECIFIED);
-STATIC_ASSERT_ENUM(TransferID::RESERVED, TransferID::RESERVED);
-STATIC_ASSERT_ENUM(TransferID::GAMMA22, TransferID::GAMMA22);
-STATIC_ASSERT_ENUM(TransferID::GAMMA28, TransferID::GAMMA28);
-STATIC_ASSERT_ENUM(TransferID::SMPTE170M, TransferID::SMPTE170M);
-STATIC_ASSERT_ENUM(TransferID::SMPTE240M, TransferID::SMPTE240M);
-STATIC_ASSERT_ENUM(TransferID::LINEAR, TransferID::LINEAR);
-STATIC_ASSERT_ENUM(TransferID::LOG, TransferID::LOG);
-STATIC_ASSERT_ENUM(TransferID::LOG_SQRT, TransferID::LOG_SQRT);
-STATIC_ASSERT_ENUM(TransferID::IEC61966_2_4, TransferID::IEC61966_2_4);
-STATIC_ASSERT_ENUM(TransferID::BT1361_ECG, TransferID::BT1361_ECG);
-STATIC_ASSERT_ENUM(TransferID::IEC61966_2_1, TransferID::IEC61966_2_1);
-STATIC_ASSERT_ENUM(TransferID::BT2020_10, TransferID::BT2020_10);
-STATIC_ASSERT_ENUM(TransferID::BT2020_12, TransferID::BT2020_12);
-STATIC_ASSERT_ENUM(TransferID::SMPTEST2084, TransferID::SMPTEST2084);
-STATIC_ASSERT_ENUM(TransferID::SMPTEST428_1, TransferID::SMPTEST428_1);
-STATIC_ASSERT_ENUM(TransferID::ARIB_STD_B67, TransferID::ARIB_STD_B67);
-
-STATIC_ASSERT_ENUM(MatrixID::RGB, MatrixID::RGB);
-STATIC_ASSERT_ENUM(MatrixID::BT709, MatrixID::BT709);
-STATIC_ASSERT_ENUM(MatrixID::UNSPECIFIED, MatrixID::UNSPECIFIED);
-STATIC_ASSERT_ENUM(MatrixID::RESERVED, MatrixID::RESERVED);
-STATIC_ASSERT_ENUM(MatrixID::FCC, MatrixID::FCC);
-STATIC_ASSERT_ENUM(MatrixID::BT470BG, MatrixID::BT470BG);
-STATIC_ASSERT_ENUM(MatrixID::SMPTE170M, MatrixID::SMPTE170M);
-STATIC_ASSERT_ENUM(MatrixID::SMPTE240M, MatrixID::SMPTE240M);
-STATIC_ASSERT_ENUM(MatrixID::YCOCG, MatrixID::YCOCG);
-STATIC_ASSERT_ENUM(MatrixID::BT2020_NCL, MatrixID::BT2020_NCL);
-STATIC_ASSERT_ENUM(MatrixID::BT2020_CL, MatrixID::BT2020_CL);
-
-STATIC_ASSERT_ENUM(RangeID::UNSPECIFIED, RangeID::UNSPECIFIED);
-STATIC_ASSERT_ENUM(RangeID::LIMITED, RangeID::LIMITED);
-STATIC_ASSERT_ENUM(RangeID::FULL, RangeID::FULL);
-STATIC_ASSERT_ENUM(RangeID::DERIVED, RangeID::DERIVED);
-
} // namespace media
} // namespace chromecast

Powered by Google App Engine
This is Rietveld 408576698