diff options
| author | Leon Scroggins III <scroggo@google.com> | 2014-03-17 15:55:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-17 15:55:43 +0000 |
| commit | 96978ee290ea0ef666c49ffa8733a8c74304c9f1 (patch) | |
| tree | 4f2d7ab49e4f120705af69e42724f2b1bdb35887 /media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp | |
| parent | adb3a198beb015ac505aecde585f0c8bca3a29e2 (diff) | |
| parent | f8d8777dddf91c741981b4f795f2fb2b1d81c1b6 (diff) | |
| download | frameworks_base-96978ee290ea0ef666c49ffa8733a8c74304c9f1.zip frameworks_base-96978ee290ea0ef666c49ffa8733a8c74304c9f1.tar.gz frameworks_base-96978ee290ea0ef666c49ffa8733a8c74304c9f1.tar.bz2 | |
am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6':
Update framework to use M33 Skia. DO NOT MERGE
Diffstat (limited to 'media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp')
| -rw-r--r-- | media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp index 6424744..53f04bc 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp @@ -30,6 +30,7 @@ #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> #include <media/stagefright/OMXCodec.h> +#include <SkImage.h> #include <SkMallocPixelRef.h> #include "omx_jpeg_decoder.h" @@ -184,8 +185,7 @@ void OmxJpegImageDecoder::installPixelRef(MediaBuffer *buffer, sp<MediaSource> d void OmxJpegImageDecoder::configBitmapSize(SkBitmap* bm, SkBitmap::Config pref, int width, int height) { - bm->setConfig(getColorSpaceConfig(pref), width, height); - bm->setIsOpaque(true); + bm->setConfig(getColorSpaceConfig(pref), width, height, 0, kOpaque_SkAlphaType); } SkBitmap::Config OmxJpegImageDecoder::getColorSpaceConfig( |