drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to a type-safe album art interface."

Browse Source
This commit is contained in:
Elliott Hughes
2014-06-11 23:59:33 +00:00
committed by Gerrit Code Review
parent 16719591f4 95d3f86fed
commit 1a3908e959
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/jni/android_media_MediaMetadataRetriever.cpp
View File

@ -23,6 +23,7 @@
#include <utils/threads.h>
#include <core/SkBitmap.h>
#include <media/mediametadataretriever.h>
#include <media/mediascanner.h>
#include <private/media/VideoFrame.h>
#include "jni.h"
@ -326,17 +327,13 @@ static jbyteArray android_media_MediaMetadataRetriever_getEmbeddedPicture(
return NULL;
}
unsigned int len = mediaAlbumArt->mSize;
char* data = (char*) mediaAlbumArt + sizeof(MediaAlbumArt);
jbyteArray array = env->NewByteArray(len);
jbyteArray array = env->NewByteArray(mediaAlbumArt->size());
if (!array) { // OutOfMemoryError exception has already been thrown.
ALOGE("getEmbeddedPicture: OutOfMemoryError is thrown.");
} else {
jbyte* bytes = env->GetByteArrayElements(array, NULL);
if (bytes != NULL) {
memcpy(bytes, data, len);
env->ReleaseByteArrayElements(array, bytes, 0);
}
const jbyte* data =
reinterpret_cast<const jbyte*>(mediaAlbumArt->data());
env->SetByteArrayRegion(array, 0, mediaAlbumArt->size(), data);
}
// No need to delete mediaAlbumArt here

11
media/jni/android_media_MediaScanner.cpp
View File

@ -348,17 +348,16 @@ android_media_MediaScanner_extractAlbumArt(
}
int fd = jniGetFDFromFileDescriptor(env, fileDescriptor);
MediaAlbumArt* mediaAlbumArt =
reinterpret_cast<MediaAlbumArt*>(mp->extractAlbumArt(fd));
MediaAlbumArt* mediaAlbumArt = mp->extractAlbumArt(fd);
if (mediaAlbumArt == NULL) {
return NULL;
}
jbyteArray array = env->NewByteArray(mediaAlbumArt->mSize);
jbyteArray array = env->NewByteArray(mediaAlbumArt->size());
if (array != NULL) {
jbyte* bytes = env->GetByteArrayElements(array, NULL);
memcpy(bytes, &mediaAlbumArt->mData[0], mediaAlbumArt->mSize);
env->ReleaseByteArrayElements(array, bytes, 0);
const jbyte* data =
reinterpret_cast<const jbyte*>(mediaAlbumArt->data());
env->SetByteArrayRegion(array, 0, mediaAlbumArt->size(), data);
}
done: