Media Metadata API: Extract raw tags for audio/video.

media/base/audio_video_metadata_extractor_unittest.cc

Index: media/base/audio_video_metadata_extractor_unittest.cc
diff --git a/media/base/audio_video_metadata_extractor_unittest.cc b/media/base/audio_video_metadata_extractor_unittest.cc
index 52aeca74dbf78ea0da1b853b34bf68b610de15b7..1aba4efa8329aa1df12c583c26a09f2b41790cc4 100644
--- a/media/base/audio_video_metadata_extractor_unittest.cc
+++ b/media/base/audio_video_metadata_extractor_unittest.cc
@@ -45,6 +45,9 @@ TEST(AudioVideoMetadataExtractorTest, AudioOGG) {
   scoped_ptr<AudioVideoMetadataExtractor> extractor =
       GetExtractor("9ch.ogg", true, 0, -1, -1);
   EXPECT_EQ("Processed by SoX", extractor->comment());
+
+  EXPECT_EQ(1u, extractor->raw_tags().size());
+  EXPECT_EQ("Processed by SoX", extractor->raw_tags().find("COMMENT")->second);
 }
 
 TEST(AudioVideoMetadataExtractorTest, AudioWAV) {
@@ -52,12 +55,19 @@ TEST(AudioVideoMetadataExtractorTest, AudioWAV) {
       GetExtractor("sfx_u8.wav", true, 0, -1, -1);
   EXPECT_EQ("Lavf54.37.100", extractor->encoder());
   EXPECT_EQ("Amadeus Pro", extractor->encoded_by());
+
+  EXPECT_EQ(2u, extractor->raw_tags().size());
+  EXPECT_EQ("Lavf54.37.100", extractor->raw_tags().find("encoder")->second);
+  EXPECT_EQ("Amadeus Pro", extractor->raw_tags().find("encoded_by")->second);
 }
 
 TEST(AudioVideoMetadataExtractorTest, VideoWebM) {
   scoped_ptr<AudioVideoMetadataExtractor> extractor =
       GetExtractor("bear-320x240-multitrack.webm", true, 2, 320, 240);
   EXPECT_EQ("Lavf53.9.0", extractor->encoder());
+
+  EXPECT_EQ(1u, extractor->raw_tags().size());
+  EXPECT_EQ("Lavf53.9.0", extractor->raw_tags().find("ENCODER")->second);
 }
 
 #if defined(USE_PROPRIETARY_CODECS)
@@ -66,6 +76,17 @@ TEST(AudioVideoMetadataExtractorTest, AndroidRotatedMP4Video) {
       GetExtractor("90rotation.mp4", true, 0, 1920, 1080);
 
   EXPECT_EQ(90, extractor->rotation());
+
+  EXPECT_EQ(7u, extractor->raw_tags().size());
+  EXPECT_EQ("isom3gp4",
+            extractor->raw_tags().find("compatible_brands")->second);
+  EXPECT_EQ("2014-02-11 00:39:25",
+            extractor->raw_tags().find("creation_time")->second);
+  EXPECT_EQ("VideoHandle", extractor->raw_tags().find("handler_name")->second);
+  EXPECT_EQ("eng", extractor->raw_tags().find("language")->second);
+  EXPECT_EQ("isom", extractor->raw_tags().find("major_brand")->second);
+  EXPECT_EQ("0", extractor->raw_tags().find("minor_version")->second);
+  EXPECT_EQ("90", extractor->raw_tags().find("rotate")->second);
 }
 
 TEST(AudioVideoMetadataExtractorTest, AudioMP3) {
@@ -79,6 +100,15 @@ TEST(AudioVideoMetadataExtractorTest, AudioMP3) {
   EXPECT_EQ("Alternative", extractor->genre());
   EXPECT_EQ("1997", extractor->date());
   EXPECT_EQ("Lavf54.4.100", extractor->encoder());
+
+  EXPECT_EQ(7u, extractor->raw_tags().size());
+  EXPECT_EQ("OK Computer", extractor->raw_tags().find("album")->second);
+  EXPECT_EQ("Radiohead", extractor->raw_tags().find("artist")->second);
+  EXPECT_EQ("1997", extractor->raw_tags().find("date")->second);
+  EXPECT_EQ("Lavf54.4.100", extractor->raw_tags().find("encoder")->second);
+  EXPECT_EQ("Alternative", extractor->raw_tags().find("genre")->second);
+  EXPECT_EQ("Airbag", extractor->raw_tags().find("title")->second);
+  EXPECT_EQ("1", extractor->raw_tags().find("track")->second);
 }
 #endif