From b933055cf3f7f8ea89bfd3bc9c37a3891ff7310a Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 16 Jun 2014 17:31:48 -0400 Subject: stop using (deprecated) SkBitmap::Config Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b --- media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp | 13 ++++--------- media/tests/omxjpegdecoder/omx_jpeg_decoder.h | 4 +--- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'media/tests') diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp index a4d292a..b8b6c04 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp @@ -169,15 +169,10 @@ bool OmxJpegImageDecoder::decodeSource(sp decoder, return true; } -void OmxJpegImageDecoder::configBitmapSize(SkBitmap* bm, SkBitmap::Config pref, +void OmxJpegImageDecoder::configBitmapSize(SkBitmap* bm, SkColorType pref, int width, int height) { - bm->setConfig(getColorSpaceConfig(pref), width, height, 0, kOpaque_SkAlphaType); -} - -SkBitmap::Config OmxJpegImageDecoder::getColorSpaceConfig( - SkBitmap::Config pref) { - - // Set the color space to ARGB_8888 for now + // Set the color space to ARGB_8888 for now (ignoring pref) // because of limitation in hardware support. - return SkBitmap::kARGB_8888_Config; + bm->setInfo(SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType); } + diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.h b/media/tests/omxjpegdecoder/omx_jpeg_decoder.h index e431e72..e487245 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.h +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.h @@ -49,9 +49,7 @@ private: sp getDecoder(OMXClient* client, const sp& source); bool decodeSource(sp decoder, const sp& source, SkBitmap* bm); - void configBitmapSize(SkBitmap* bm, SkBitmap::Config pref, int width, - int height); - SkBitmap::Config getColorSpaceConfig(SkBitmap::Config pref); + void configBitmapSize(SkBitmap* bm, SkColorType, int width, int height); OMXClient mClient; }; -- cgit v1.1