diff options
author | Elliott Hughes <enh@google.com> | 2014-06-10 16:55:38 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-06-11 14:45:27 -0700 |
commit | f3e80dddd7376aa9deeb27de25e1d50030a2ad98 (patch) | |
tree | a3ebf2e96fa0bb9b0375281692adf48333bca468 /media/libmediaplayerservice/MetadataRetrieverClient.cpp | |
parent | d3af4265dca4c8ebcead5376f1c73a5dafc34778 (diff) | |
download | frameworks_av-f3e80dddd7376aa9deeb27de25e1d50030a2ad98.zip frameworks_av-f3e80dddd7376aa9deeb27de25e1d50030a2ad98.tar.gz frameworks_av-f3e80dddd7376aa9deeb27de25e1d50030a2ad98.tar.bz2 |
Offer a type-safe album art interface.
Bug: 15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
Diffstat (limited to 'media/libmediaplayerservice/MetadataRetrieverClient.cpp')
-rw-r--r-- | media/libmediaplayerservice/MetadataRetrieverClient.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index 348957f..5c9bd8f 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -230,7 +230,7 @@ sp<IMemory> MetadataRetrieverClient::extractAlbumArt() ALOGE("failed to extract an album art"); return NULL; } - size_t size = sizeof(MediaAlbumArt) + albumArt->mSize; + size_t size = sizeof(MediaAlbumArt) + albumArt->size(); sp<MemoryHeapBase> heap = new MemoryHeapBase(size, 0, "MetadataRetrieverClient"); if (heap == NULL) { ALOGE("failed to create MemoryDealer object"); @@ -243,11 +243,9 @@ sp<IMemory> MetadataRetrieverClient::extractAlbumArt() delete albumArt; return NULL; } - MediaAlbumArt *albumArtCopy = static_cast<MediaAlbumArt *>(mAlbumArt->pointer()); - albumArtCopy->mSize = albumArt->mSize; - albumArtCopy->mData = (uint8_t *)albumArtCopy + sizeof(MediaAlbumArt); - memcpy(albumArtCopy->mData, albumArt->mData, albumArt->mSize); - delete albumArt; // Fix memory leakage + MediaAlbumArt::init((MediaAlbumArt *) mAlbumArt->pointer(), + albumArt->size(), albumArt->data()); + delete albumArt; // We've taken our copy. return mAlbumArt; } |