diff options
author | Wei-Ta Chen <weita@google.com> | 2009-12-03 23:19:19 +0800 |
---|---|---|
committer | Wei-Ta Chen <weita@google.com> | 2009-12-03 23:19:19 +0800 |
commit | b355012797dfd503eee9f80ed06bc30a17cc3318 (patch) | |
tree | 741ac88536b86606176cc305b3b0ad8d9223519b /media/tests/omxjpegdecoder | |
parent | f623fbc45d5c25c0863314a5766624bd35914e7a (diff) | |
download | frameworks_base-b355012797dfd503eee9f80ed06bc30a17cc3318.zip frameworks_base-b355012797dfd503eee9f80ed06bc30a17cc3318.tar.gz frameworks_base-b355012797dfd503eee9f80ed06bc30a17cc3318.tar.bz2 |
Fix the broken build of omxjpegdecoder: http://b/2299035.
1) Add the include path for jni.h.
2) Rename InitCheck() and read_at() to initCheck() and readAt(),
repectively in StreamSource, as done in DataSource.
3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
Need to do so because SkJPEGImageDecoder is not defined in a header file.
Diffstat (limited to 'media/tests/omxjpegdecoder')
-rw-r--r-- | media/tests/omxjpegdecoder/Android.mk | 1 | ||||
-rw-r--r-- | media/tests/omxjpegdecoder/StreamSource.cpp | 4 | ||||
-rw-r--r-- | media/tests/omxjpegdecoder/StreamSource.h | 4 | ||||
-rw-r--r-- | media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp | 11 |
4 files changed, 16 insertions, 4 deletions
diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk index 731907c..e989078 100644 --- a/media/tests/omxjpegdecoder/Android.mk +++ b/media/tests/omxjpegdecoder/Android.mk @@ -34,6 +34,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright LOCAL_C_INCLUDES := \ + $(JNI_H_INCLUDE) \ $(TOP)/external/jpeg \ $(TOP)/external/skia/include/config \ $(TOP)/external/skia/include/core \ diff --git a/media/tests/omxjpegdecoder/StreamSource.cpp b/media/tests/omxjpegdecoder/StreamSource.cpp index 3ca5857..76aa85b 100644 --- a/media/tests/omxjpegdecoder/StreamSource.cpp +++ b/media/tests/omxjpegdecoder/StreamSource.cpp @@ -31,11 +31,11 @@ StreamSource::~StreamSource() { mStream = NULL; } -status_t StreamSource::InitCheck() const { +status_t StreamSource::initCheck() const { return mStream != NULL ? OK : NO_INIT; } -ssize_t StreamSource::read_at(off_t offset, void *data, size_t size) { +ssize_t StreamSource::readAt(off_t offset, void *data, size_t size) { Mutex::Autolock autoLock(mLock); mStream->rewind(); diff --git a/media/tests/omxjpegdecoder/StreamSource.h b/media/tests/omxjpegdecoder/StreamSource.h index dd765d4..c1ed5bf 100644 --- a/media/tests/omxjpegdecoder/StreamSource.h +++ b/media/tests/omxjpegdecoder/StreamSource.h @@ -31,8 +31,8 @@ class StreamSource : public DataSource { public: // Pass the ownership of SkStream to StreamSource. StreamSource(SkStream *SkStream); - status_t InitCheck() const; - virtual ssize_t read_at(off_t offset, void *data, size_t size); + virtual status_t initCheck() const; + virtual ssize_t readAt(off_t offset, void *data, size_t size); virtual status_t getSize(off_t *size); protected: diff --git a/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp b/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp index 3a13afa..78b89ca 100644 --- a/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp +++ b/media/tests/omxjpegdecoder/jpeg_decoder_bench.cpp @@ -25,6 +25,17 @@ #include "SkStream.h" #include "omx_jpeg_decoder.h" +class SkJPEGImageDecoder : public SkImageDecoder { +public: + virtual Format getFormat() const { + return kJPEG_Format; + } + +protected: + virtual bool onDecode(SkStream* stream, SkBitmap* bm, + SkBitmap::Config pref, Mode); +}; + int nullObjectReturn(const char msg[]) { if (msg) { SkDebugf("--- %s\n", msg); |