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/libstagefright/StagefrightMetadataRetriever.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/libstagefright/StagefrightMetadataRetriever.cpp')
-rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index fcd9a85..e4d3c79 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -375,10 +375,7 @@ VideoFrame *StagefrightMetadataRetriever::getFrameAtTime( size_t dataSize; if (fileMeta->findData(kKeyAlbumArt, &type, &data, &dataSize) && mAlbumArt == NULL) { - mAlbumArt = new MediaAlbumArt; - mAlbumArt->mSize = dataSize; - mAlbumArt->mData = new uint8_t[dataSize]; - memcpy(mAlbumArt->mData, data, dataSize); + mAlbumArt = MediaAlbumArt::fromData(dataSize, data); } VideoFrame *frame = @@ -411,7 +408,7 @@ MediaAlbumArt *StagefrightMetadataRetriever::extractAlbumArt() { } if (mAlbumArt) { - return new MediaAlbumArt(*mAlbumArt); + return mAlbumArt->clone(); } return NULL; @@ -480,10 +477,7 @@ void StagefrightMetadataRetriever::parseMetaData() { size_t dataSize; if (meta->findData(kKeyAlbumArt, &type, &data, &dataSize) && mAlbumArt == NULL) { - mAlbumArt = new MediaAlbumArt; - mAlbumArt->mSize = dataSize; - mAlbumArt->mData = new uint8_t[dataSize]; - memcpy(mAlbumArt->mData, data, dataSize); + mAlbumArt = MediaAlbumArt::fromData(dataSize, data); } size_t numTracks = mExtractor->countTracks(); |