summaryrefslogtreecommitdiffstats
path: root/media/tests/omxjpegdecoder/StreamSource.cpp
diff options
context:
space:
mode:
authorWei-Ta Chen <weita@google.com>2009-12-03 23:19:19 +0800
committerWei-Ta Chen <weita@google.com>2009-12-03 23:19:19 +0800
commitb355012797dfd503eee9f80ed06bc30a17cc3318 (patch)
tree741ac88536b86606176cc305b3b0ad8d9223519b /media/tests/omxjpegdecoder/StreamSource.cpp
parentf623fbc45d5c25c0863314a5766624bd35914e7a (diff)
downloadframeworks_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/StreamSource.cpp')
-rw-r--r--media/tests/omxjpegdecoder/StreamSource.cpp4
1 files changed, 2 insertions, 2 deletions
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();