diff options
| author | John Reck <jreck@google.com> | 2015-04-30 21:00:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 21:00:08 +0000 |
| commit | db672b03a2de26127b40dbe50c794b5697b01c37 (patch) | |
| tree | e9610a9faf575cd38bc0c3d14b870fbfffc478a6 /media | |
| parent | 0069301d364a219bbd4b166ba6f4d9be854d556f (diff) | |
| parent | ed207b92747234eac88dd3664ecfb535e45d8ed1 (diff) | |
| download | frameworks_base-db672b03a2de26127b40dbe50c794b5697b01c37.zip frameworks_base-db672b03a2de26127b40dbe50c794b5697b01c37.tar.gz frameworks_base-db672b03a2de26127b40dbe50c794b5697b01c37.tar.bz2 | |
Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MediaMetadataRetriever.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index 88a6771..59fb6d6 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -299,15 +299,16 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, return NULL; } - SkBitmap *bitmap = GraphicsJNI::getSkBitmap(env, jBitmap); + SkBitmap bitmap; + GraphicsJNI::getSkBitmap(env, jBitmap, &bitmap); - 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) { |