Media: AudioVideoMetadataParser - Parse rotation metadata.

BUG=332228

Review URL: https://codereview.chromium.org/148113012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251867 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/extensions/api/media_galleries.idl

@@ -106,6 +106,9 @@ namespace mediaGalleries {
 
     // Defined for audio and video. In seconds.
     double? duration;
+
+    // Defined for images and video. In degrees.
+    long? rotation;
 
     // Generic metadata tags.
     DOMString? album;

chrome/utility/media_galleries/media_metadata_parser.cc

@@ -75,6 +75,7 @@ void MediaMetadataParser::PopulateAudioVideoMetadata() {
   SetIntScopedPtr(extractor.disc(), &metadata_->disc);
   SetStringScopedPtr(extractor.genre(), &metadata_->genre);
   SetStringScopedPtr(extractor.language(), &metadata_->language);
+  SetIntScopedPtr(extractor.rotation(), &metadata_->rotation);
   SetStringScopedPtr(extractor.title(), &metadata_->title);
   SetIntScopedPtr(extractor.track(), &metadata_->track);
 }

media/base/audio_video_metadata_extractor.cc

@@ -55,6 +55,7 @@ AudioVideoMetadataExtractor::AudioVideoMetadataExtractor()
       width_(-1),
       height_(-1),
       disc_(-1),
+      rotation_(-1),
       track_(-1) {
 }
 
@@ -129,6 +130,11 @@ int AudioVideoMetadataExtractor::height() const {
   return height_;
 }
 
+int AudioVideoMetadataExtractor::rotation() const {
+  DCHECK(extracted_);
+  return rotation_;
+}
+
 const std::string& AudioVideoMetadataExtractor::album() const {
   DCHECK(extracted_);
   return album_;
@@ -195,6 +201,7 @@ void AudioVideoMetadataExtractor::ExtractDictionary(AVDictionary* metadata) {
 
   AVDictionaryEntry* tag = NULL;
   while ((tag = av_dict_get(metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
+    if (ExtractInt(tag, "rotate", &rotation_)) continue;
     if (ExtractString(tag, "album", &album_)) continue;
     if (ExtractString(tag, "artist", &artist_)) continue;
     if (ExtractString(tag, "comment", &comment_)) continue;

media/base/audio_video_metadata_extractor.h

@@ -34,6 +34,9 @@ class MEDIA_EXPORT AudioVideoMetadataExtractor {
   int width() const;
   int height() const;
 
+  // Returns -1 if undefined.
+  int rotation() const;
+
   // Returns -1 or an empty string if the value is undefined.
   const std::string& album() const;
   const std::string& artist() const;
@@ -67,6 +70,7 @@ class MEDIA_EXPORT AudioVideoMetadataExtractor {
   std::string encoded_by_;
   std::string genre_;
   std::string language_;
+  int rotation_;
   std::string title_;
   int track_;
 

media/base/audio_video_metadata_extractor_unittest.cc

@@ -61,6 +61,13 @@ TEST(AudioVideoMetadataExtractorTest, VideoWebM) {
 }
 
 #if defined(USE_PROPRIETARY_CODECS)
+TEST(AudioVideoMetadataExtractorTest, AndroidRotatedMP4Video) {
+  scoped_ptr<AudioVideoMetadataExtractor> extractor =
+      GetExtractor("90rotation.mp4", true, 0, 1920, 1080);
+
+  EXPECT_EQ(90, extractor->rotation());
+}
+
 TEST(AudioVideoMetadataExtractorTest, AudioMP3) {
   scoped_ptr<AudioVideoMetadataExtractor> extractor =
       GetExtractor("id3_png_test.mp3", true, 1, -1, -1);