diff options
| author | John Reck <jreck@google.com> | 2015-04-20 22:06:31 +0000 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-04-20 22:06:31 +0000 |
| commit | edc22fba5921f5c2d3502727e707f959b8c3a460 (patch) | |
| tree | 947113958a48609f55d003e2735739727b6cc70f /media/jni/android_media_MediaMetadataRetriever.cpp | |
| parent | a771b9861d11671c780092d35c0062eeefcf37c0 (diff) | |
| download | frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.zip frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.tar.gz frameworks_base-edc22fba5921f5c2d3502727e707f959b8c3a460.tar.bz2 | |
Revert "Change how Java Bitmaps are accessed in a few places"
Bug: 20207616
This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.
Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
Diffstat (limited to 'media/jni/android_media_MediaMetadataRetriever.cpp')
| -rw-r--r-- | media/jni/android_media_MediaMetadataRetriever.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index c6fa379..2f6bbf4 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -281,16 +281,15 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, return NULL; } - SkBitmap bitmap; - GraphicsJNI::getSkBitmap(env, jBitmap, &bitmap); + SkBitmap *bitmap = GraphicsJNI::getSkBitmap(env, jBitmap); - bitmap.lockPixels(); - rotate((uint16_t*)bitmap.getPixels(), + bitmap->lockPixels(); + rotate((uint16_t*)bitmap->getPixels(), (uint16_t*)((char*)videoFrame + sizeof(VideoFrame)), videoFrame->mWidth, videoFrame->mHeight, videoFrame->mRotationAngle); - bitmap.unlockPixels(); + bitmap->unlockPixels(); if (videoFrame->mDisplayWidth != videoFrame->mWidth || videoFrame->mDisplayHeight != videoFrame->mHeight) { |