commit 945a9df6e31cf951d6f323a85a7e75c19c7f60f6
author Mike Reed <reed@google.com> Wed Mar 03 13:24:37 2010 -0500
committer Mike Reed <reed@google.com> Wed Mar 03 14:04:19 2010 -0500
tree 14d4fa6369631cbf7ff05964257e4f48f3b33267
parent f3685afc5d30e07fc35a0a4724d0c5d0cfea112b

add optional preftable to image codecs, for more control over the resulting bitmap config

media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp

diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp
index f229f9d..209e71c 100644
--- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp
+++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp
@@ -97,14 +97,14 @@
 }
 
 bool OmxJpegImageDecoder::onDecode(SkStream* stream,
-        SkBitmap* bm, SkBitmap::Config pref, Mode mode) {
+        SkBitmap* bm, Mode mode) {
     sp<MediaSource> source = prepareMediaSource(stream);
     sp<MetaData> 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) {