Implement MediaMetadata artwork in content

content/common/android/media_metadata_android.cc

 // Copyright 2016 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 "content/common/android/media_metadata_android.h"
 
 #include "base/android/jni_string.h"
 #include "content/public/common/media_metadata.h"
 #include "jni/MediaMetadata_jni.h"
 
 namespace content {
 
 // static
 base::android::ScopedJavaLocalRef<jobject>
 MediaMetadataAndroid::CreateJavaObject(
     JNIEnv* env, const MediaMetadata& metadata) {
   ScopedJavaLocalRef<jstring> j_title(
       base::android::ConvertUTF16ToJavaString(env, metadata.title));
   ScopedJavaLocalRef<jstring> j_artist(
       base::android::ConvertUTF16ToJavaString(env, metadata.artist));
   ScopedJavaLocalRef<jstring> j_album(
       base::android::ConvertUTF16ToJavaString(env, metadata.album));
 
-  return Java_MediaMetadata_create(
+  ScopedJavaLocalRef<jobject> j_metadata = Java_MediaMetadata_create(
       env, j_title.obj(), j_artist.obj(), j_album.obj());
+
+  for (const auto& artwork : metadata.artwork) {
+    std::string src = artwork.src.spec();
+    base::string16 type = artwork.type.is_null() ?
+        base::string16() : artwork.type.string();
+    ScopedJavaLocalRef<jstring> j_src(
+        base::android::ConvertUTF8ToJavaString(env, src));
+    ScopedJavaLocalRef<jstring> j_type(
+        base::android::ConvertUTF16ToJavaString(env, type));
+
+    ScopedJavaLocalRef<jobject> j_artwork = Java_MediaMetadata_createArtwork(
+        env, j_src.obj(), j_type.obj());

[mlamouri (slow - plz ping), 2016/06/21 13:19:46]

Is there any way you can pass the sizes in there? Something similar to
std::vector<std::pair<int,int>>? Maybe with arrays of arrays where the second
array is of size 2? If you can do that, you could just have addArtwork() which
would make all of this simpler (and less JNI calls).

[Zhiqiang Zhang (Slow), 2016/06/21 16:35:21]

Now I flatten the std::vector<std::pair<int,int>> into std::vector<int>, convert
it into jintArray, and pass it to Java.

+    for (const auto& size : artwork.sizes) {
+      Java_MediaMetadata_addArtworkSize(
+          env, j_artwork.obj(), size.width(), size.height());
+    }
+    Java_MediaMetadata_addArtwork(
+        env, j_metadata.obj(), j_artwork.obj());
+  }
+
+  return j_metadata;
 }
 
 // static
 bool MediaMetadataAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content