Media Galleries API: Audio/Video attached pictures support.

media/base/audio_video_metadata_extractor.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/audio_video_metadata_extractor.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
@@ skipping 29 matching lines @@
 
   int temporary = -1;
   if (*destination < 0 && base::StringToInt(tag->value, &temporary) &&
       temporary >= 0) {
     *destination = temporary;
   }
 
   return true;
 }
 
+// Set attached picture size limit to 4MB. Chosen arbitrarily.
+const int kAttachedPicSizeLimit = 4 * 1024 * 1024;
+
 }  // namespace
 
 AudioVideoMetadataExtractor::StreamInfo::StreamInfo() {}
 
 AudioVideoMetadataExtractor::StreamInfo::~StreamInfo() {}
 
 AudioVideoMetadataExtractor::AudioVideoMetadataExtractor()
     : extracted_(false),
       duration_(-1),
       width_(-1),
       height_(-1),
       disc_(-1),
       rotation_(-1),
       track_(-1) {
 }
 
 AudioVideoMetadataExtractor::~AudioVideoMetadataExtractor() {
 }
 
-bool AudioVideoMetadataExtractor::Extract(DataSource* source) {
+bool AudioVideoMetadataExtractor::Extract(DataSource* source,
+                                          bool extract_attached_pictures) {
   DCHECK(!extracted_);
 
   bool read_ok = true;
   media::BlockingUrlProtocol protocol(source, base::Bind(&OnError, &read_ok));
   media::FFmpegGlue glue(&protocol);
   AVFormatContext* format_context = glue.format_context();
 
   if (!glue.OpenContext())
     return false;
 
@@ skipping 30 matching lines @@
       continue;
 
     info.type = avcodec_get_name(stream->codec->codec_id);
 
     // Extract dimensions of largest stream that's not an attached picture.
     if (stream->codec->width > 0 && stream->codec->width > width_ &&
         stream->codec->height > 0 && stream->codec->height > height_) {
       width_ = stream->codec->width;
       height_ = stream->codec->height;
     }
+
+    // Extract attached picture if requested.
+    if (extract_attached_pictures &&
+        stream->disposition == AV_DISPOSITION_ATTACHED_PIC &&
+        stream->attached_pic.size > 0 &&
+        stream->attached_pic.size <= kAttachedPicSizeLimit &&
+        stream->attached_pic.data != NULL) {
+      std::string buffer(

[vandebo (ex-Chrome), 2014/04/23 23:22:45]

Looks like an extra copy... maybe pushback an empty string and then swap them.

[tommycli, 2014/04/29 00:15:51]

Done.

+          reinterpret_cast<const char*>(stream->attached_pic.data),
+          stream->attached_pic.size);
+      attached_pictures_bytes_.push_back(buffer);
+    }
   }
 
   extracted_ = true;
   return true;
 }
 
 double AudioVideoMetadataExtractor::duration() const {
   DCHECK(extracted_);
   return duration_;
 }
@@ skipping 72 matching lines @@
   DCHECK(extracted_);
   return track_;
 }
 
 const std::vector<AudioVideoMetadataExtractor::StreamInfo>&
 AudioVideoMetadataExtractor::stream_infos() const {
   DCHECK(extracted_);
   return stream_infos_;
 }
 
+const std::vector<std::string>&
+AudioVideoMetadataExtractor::attached_pictures_bytes() const {
+  DCHECK(extracted_);
+  return attached_pictures_bytes_;
+}
+
 void AudioVideoMetadataExtractor::ExtractDictionary(
     AVDictionary* metadata, TagDictionary* raw_tags) {
   if (!metadata)
     return;
 
   AVDictionaryEntry* tag = NULL;
   while ((tag = av_dict_get(metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
     if (raw_tags->find(tag->key) == raw_tags->end())
       (*raw_tags)[tag->key] = tag->value;
 
     if (ExtractInt(tag, "rotate", &rotation_)) continue;
     if (ExtractString(tag, "album", &album_)) continue;
     if (ExtractString(tag, "artist", &artist_)) continue;
     if (ExtractString(tag, "comment", &comment_)) continue;
     if (ExtractString(tag, "copyright", &copyright_)) continue;
     if (ExtractString(tag, "date", &date_)) continue;
     if (ExtractInt(tag, "disc", &disc_)) continue;
     if (ExtractString(tag, "encoder", &encoder_)) continue;
     if (ExtractString(tag, "encoded_by", &encoded_by_)) continue;
     if (ExtractString(tag, "genre", &genre_)) continue;
     if (ExtractString(tag, "language", &language_)) continue;
     if (ExtractString(tag, "title", &title_)) continue;
     if (ExtractInt(tag, "track", &track_)) continue;
   }
 }
 
 }  // namespace media