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

Unified Diff: content/renderer/media/android/webmediasession_android.cc

Issue 2015433003: Implement MediaMetadata artwork in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed dcheng's comments Created 4 years, 5 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: content/renderer/media/android/webmediasession_android.cc
diff --git a/content/renderer/media/android/webmediasession_android.cc b/content/renderer/media/android/webmediasession_android.cc
index c1a936d1e25c6b70a24dd21cf26fdc57c03a66dd..55a7802acb27e050f63a10cd5ad6b4da5781b259 100644
--- a/content/renderer/media/android/webmediasession_android.cc
+++ b/content/renderer/media/android/webmediasession_android.cc
@@ -4,12 +4,15 @@
#include "content/renderer/media/android/webmediasession_android.h"
+#include <iterator>
dcheng 2016/07/06 02:34:15 Nit: this include is no longer needed.
Zhiqiang Zhang (Slow) 2016/07/06 15:38:38 Done.
#include <memory>
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "content/public/common/media_metadata.h"
#include "content/renderer/media/android/renderer_media_session_manager.h"
+#include "third_party/WebKit/public/platform/WebIconSizesParser.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/platform/modules/mediasession/WebMediaMetadata.h"
namespace content {
@@ -42,6 +45,17 @@ void WebMediaSessionAndroid::setMetadata(
metadata.title = web_metadata->title;
metadata.artist = web_metadata->artist;
metadata.album = web_metadata->album;
+ for (const auto& web_artwork : web_metadata->artwork) {
+ MediaMetadata::Artwork artwork;
+ artwork.src = GURL(base::string16(web_artwork.src));
+ artwork.type = web_artwork.type;
+ blink::WebVector<blink::WebSize> web_sizes =
+ blink::WebIconSizesParser::parseIconSizes(web_artwork.sizes);
+ artwork.sizes.insert(artwork.sizes.end(),
+ web_sizes.begin(),
+ web_sizes.end());
+ metadata.artwork.push_back(artwork);
+ }
}
session_manager_->SetMetadata(media_session_id_, metadata);

Powered by Google App Engine
This is Rietveld 408576698