| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/common/android/media_metadata_android.h" | 5 #include "content/common/android/media_metadata_android.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 base::android::ScopedJavaLocalRef<jobject> | 34 base::android::ScopedJavaLocalRef<jobject> |
| 35 MediaMetadataAndroid::CreateJavaObject( | 35 MediaMetadataAndroid::CreateJavaObject( |
| 36 JNIEnv* env, const MediaMetadata& metadata) { | 36 JNIEnv* env, const MediaMetadata& metadata) { |
| 37 ScopedJavaLocalRef<jstring> j_title( | 37 ScopedJavaLocalRef<jstring> j_title( |
| 38 base::android::ConvertUTF16ToJavaString(env, metadata.title)); | 38 base::android::ConvertUTF16ToJavaString(env, metadata.title)); |
| 39 ScopedJavaLocalRef<jstring> j_artist( | 39 ScopedJavaLocalRef<jstring> j_artist( |
| 40 base::android::ConvertUTF16ToJavaString(env, metadata.artist)); | 40 base::android::ConvertUTF16ToJavaString(env, metadata.artist)); |
| 41 ScopedJavaLocalRef<jstring> j_album( | 41 ScopedJavaLocalRef<jstring> j_album( |
| 42 base::android::ConvertUTF16ToJavaString(env, metadata.album)); | 42 base::android::ConvertUTF16ToJavaString(env, metadata.album)); |
| 43 | 43 |
| 44 ScopedJavaLocalRef<jobject> j_metadata = Java_MediaMetadata_create( | 44 ScopedJavaLocalRef<jobject> j_metadata = |
| 45 env, j_title.obj(), j_artist.obj(), j_album.obj()); | 45 Java_MediaMetadata_create(env, j_title, j_artist, j_album); |
| 46 | 46 |
| 47 for (const auto& artwork : metadata.artwork) { | 47 for (const auto& artwork : metadata.artwork) { |
| 48 std::string src = artwork.src.spec(); | 48 std::string src = artwork.src.spec(); |
| 49 base::string16 type = artwork.type.is_null() ? | 49 base::string16 type = artwork.type.is_null() ? |
| 50 base::string16() : artwork.type.string(); | 50 base::string16() : artwork.type.string(); |
| 51 ScopedJavaLocalRef<jstring> j_src( | 51 ScopedJavaLocalRef<jstring> j_src( |
| 52 base::android::ConvertUTF8ToJavaString(env, src)); | 52 base::android::ConvertUTF8ToJavaString(env, src)); |
| 53 ScopedJavaLocalRef<jstring> j_type( | 53 ScopedJavaLocalRef<jstring> j_type( |
| 54 base::android::ConvertUTF16ToJavaString(env, type)); | 54 base::android::ConvertUTF16ToJavaString(env, type)); |
| 55 ScopedJavaLocalRef<jintArray> j_sizes( | 55 ScopedJavaLocalRef<jintArray> j_sizes( |
| 56 base::android::ToJavaIntArray( | 56 base::android::ToJavaIntArray( |
| 57 env, GetFlattenedSizeArray(artwork.sizes))); | 57 env, GetFlattenedSizeArray(artwork.sizes))); |
| 58 | 58 |
| 59 Java_MediaMetadata_createAndAddArtwork( | 59 Java_MediaMetadata_createAndAddArtwork(env, j_metadata, j_src, j_type, |
| 60 env, j_metadata.obj(), j_src.obj(), j_type.obj(), j_sizes.obj()); | 60 j_sizes); |
| 61 } | 61 } |
| 62 | 62 |
| 63 return j_metadata; | 63 return j_metadata; |
| 64 } | 64 } |
| 65 | 65 |
| 66 } // namespace content | 66 } // namespace content |
| OLD | NEW |