diff options
author | Andreas Huber <andih@google.com> | 2009-08-26 14:48:20 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-08-26 14:48:20 -0700 |
commit | 0c89199745bc1bf05b997fc7c342017807676b6f (patch) | |
tree | 2f0e1b4ed919909207d70ce9814f5854dba551ea /media/libstagefright/CameraSource.cpp | |
parent | 355edcea2f15c0f619c1e1d0f4fa433b0d38098f (diff) | |
download | frameworks_av-0c89199745bc1bf05b997fc7c342017807676b6f.zip frameworks_av-0c89199745bc1bf05b997fc7c342017807676b6f.tar.gz frameworks_av-0c89199745bc1bf05b997fc7c342017807676b6f.tar.bz2 |
assert => CHECK in stagefright.
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
-rw-r--r-- | media/libstagefright/CameraSource.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index ee12873..f75b173 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -16,13 +16,11 @@ #include <sys/time.h> -#undef NDEBUG -#include <assert.h> - #include <OMX_Component.h> #include <binder/IServiceManager.h> #include <media/stagefright/CameraSource.h> +#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> #include <ui/ICameraClient.h> @@ -56,12 +54,12 @@ public: } virtual void notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) { - assert(mSource != NULL); + CHECK(mSource != NULL); mSource->notifyCallback(msgType, ext1, ext2); } virtual void dataCallback(int32_t msgType, const sp<IMemory> &data) { - assert(mSource != NULL); + CHECK(mSource != NULL); mSource->dataCallback(msgType, data); } @@ -128,16 +126,16 @@ CameraSource::~CameraSource() { } status_t CameraSource::start(MetaData *) { - assert(!mStarted); + CHECK(!mStarted); status_t err = mCamera->lock(); - assert(err == OK); + CHECK_EQ(err, OK); err = mCamera->setPreviewDisplay(new DummySurface); - assert(err == OK); + CHECK_EQ(err, OK); mCamera->setPreviewCallbackFlag(1); mCamera->startPreview(); - assert(err == OK); + CHECK_EQ(err, OK); mStarted = true; @@ -145,7 +143,7 @@ status_t CameraSource::start(MetaData *) { } status_t CameraSource::stop() { - assert(mStarted); + CHECK(mStarted); mCamera->stopPreview(); mCamera->unlock(); @@ -167,7 +165,7 @@ sp<MetaData> CameraSource::getFormat() { status_t CameraSource::read( MediaBuffer **buffer, const ReadOptions *options) { - assert(mStarted); + CHECK(mStarted); *buffer = NULL; |