diff --git a/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp b/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp index 2d05a49752e2e..7537e35319d26 100644 --- a/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp +++ b/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp @@ -32,8 +32,7 @@ public: } protected: - virtual bool onDecode(SkStream* stream, SkBitmap* bm, - SkBitmap::Config pref, Mode); + virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode); }; int nullObjectReturn(const char msg[]) { diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp index f229f9d025b9e..209e71c10a5b1 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp @@ -97,14 +97,14 @@ OmxJpegImageDecoder::~OmxJpegImageDecoder() { } bool OmxJpegImageDecoder::onDecode(SkStream* stream, - SkBitmap* bm, SkBitmap::Config pref, Mode mode) { + SkBitmap* bm, Mode mode) { sp source = prepareMediaSource(stream); sp meta = source->getFormat(); int width; int height; meta->findInt32(kKeyWidth, &width); meta->findInt32(kKeyHeight, &height); - configBitmapSize(bm, pref, width, height); + configBitmapSize(bm, getPrefConfig(k32Bit_SrcDepth, false), width, height); // mode == DecodeBounds if (mode == SkImageDecoder::kDecodeBounds_Mode) { diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.h b/media/tests/omxjpegdecoder/omx_jpeg_decoder.h index 7d8bac09cb9c0..a313877ac808b 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.h +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.h @@ -42,8 +42,7 @@ public: } protected: - virtual bool onDecode(SkStream* stream, SkBitmap* bm, - SkBitmap::Config pref, Mode mode); + virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode); private: JPEGSource* prepareMediaSource(SkStream* stream);