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

Unified Diff: media/formats/webm/webm_stream_parser_unittest.cc

Issue 2333663003: Add color metadata info to VideoDecoderConfig. (Closed)
Patch Set: Commented the RangeID comment as suggested Created 4 years, 3 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/formats/webm/webm_parser.cc ('k') | media/formats/webm/webm_video_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/webm/webm_stream_parser_unittest.cc
diff --git a/media/formats/webm/webm_stream_parser_unittest.cc b/media/formats/webm/webm_stream_parser_unittest.cc
index 03cf928f050b8aab2460fba3d18bedad198e7d39..e19e91f19635eebddd2ebf789706789ca743c8e1 100644
--- a/media/formats/webm/webm_stream_parser_unittest.cc
+++ b/media/formats/webm/webm_stream_parser_unittest.cc
@@ -153,4 +153,44 @@ TEST_F(WebMStreamParserTest, VerifyDetectedTracks_AVText) {
EXPECT_EQ(media_tracks_->tracks()[1]->type(), MediaTrack::Audio);
}
+TEST_F(WebMStreamParserTest, ColourElement) {
+ EXPECT_MEDIA_LOG(testing::HasSubstr("Estimating WebM block duration"))
+ .Times(testing::AnyNumber());
+ StreamParser::InitParameters params(kInfiniteDuration);
+ params.detected_audio_track_count = 0;
+ params.detected_video_track_count = 1;
+ params.detected_text_track_count = 0;
+ ParseWebMFile("colour.webm", params);
+ EXPECT_EQ(media_tracks_->tracks().size(), 1u);
+
+ const auto& video_track = media_tracks_->tracks()[0];
+ EXPECT_EQ(video_track->type(), MediaTrack::Video);
+
+ const VideoDecoderConfig& video_config =
+ media_tracks_->getVideoConfig(video_track->bytestream_track_id());
+
+ gfx::ColorSpace expected_color_space(gfx::ColorSpace::PrimaryID::SMPTEST428_1,
+ gfx::ColorSpace::TransferID::LOG,
+ gfx::ColorSpace::MatrixID::RGB,
+ gfx::ColorSpace::RangeID::FULL);
+ EXPECT_EQ(video_config.color_space_info(), expected_color_space);
+
+ base::Optional<HDRMetadata> hdr_metadata = video_config.hdr_metadata();
+ EXPECT_TRUE(hdr_metadata.has_value());
+ EXPECT_EQ(hdr_metadata->max_cll, 11u);
+ EXPECT_EQ(hdr_metadata->max_fall, 12u);
+
+ const MasteringMetadata& mmdata = hdr_metadata->mastering_metadata;
+ EXPECT_FLOAT_EQ(mmdata.primary_r_chromaticity_x, 0.1f);
+ EXPECT_FLOAT_EQ(mmdata.primary_r_chromaticity_y, 0.2f);
+ EXPECT_FLOAT_EQ(mmdata.primary_g_chromaticity_x, 0.1f);
+ EXPECT_FLOAT_EQ(mmdata.primary_g_chromaticity_y, 0.2f);
+ EXPECT_FLOAT_EQ(mmdata.primary_b_chromaticity_x, 0.1f);
+ EXPECT_FLOAT_EQ(mmdata.primary_b_chromaticity_y, 0.2f);
+ EXPECT_FLOAT_EQ(mmdata.white_point_chromaticity_x, 0.1f);
+ EXPECT_FLOAT_EQ(mmdata.white_point_chromaticity_y, 0.2f);
+ EXPECT_EQ(mmdata.luminance_max, 40);
+ EXPECT_EQ(mmdata.luminance_min, 30);
+}
+
} // namespace media
« no previous file with comments | « media/formats/webm/webm_parser.cc ('k') | media/formats/webm/webm_video_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698