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/MP3Extractor.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/MP3Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MP3Extractor.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index 44258ba..14f3e0c 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -18,13 +18,11 @@ #define LOG_TAG "MP3Extractor" #include <utils/Log.h> -#undef NDEBUG -#include <assert.h> - #include <media/stagefright/DataSource.h> #include <media/stagefright/MP3Extractor.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaBufferGroup.h> +#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> @@ -317,7 +315,7 @@ MP3Extractor::MP3Extractor(const sp<DataSource> &source) off_t pos = 0; uint32_t header; bool success = Resync(mDataSource, 0, &pos, &header); - assert(success); + CHECK(success); if (success) { mFirstFramePos = pos; @@ -393,7 +391,7 @@ MP3Source::~MP3Source() { } status_t MP3Source::start(MetaData *) { - assert(!mStarted); + CHECK(!mStarted); mGroup = new MediaBufferGroup; @@ -409,7 +407,7 @@ status_t MP3Source::start(MetaData *) { } status_t MP3Source::stop() { - assert(mStarted); + CHECK(mStarted); delete mGroup; mGroup = NULL; @@ -481,7 +479,7 @@ status_t MP3Source::read( // Try again with the new position. } - assert(frame_size <= buffer->size()); + CHECK(frame_size <= buffer->size()); ssize_t n = mDataSource->read_at(mCurrentPos, buffer->data(), frame_size); if (n < (ssize_t)frame_size) { |