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/ShoutcastSource.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/ShoutcastSource.cpp')
-rw-r--r-- | media/libstagefright/ShoutcastSource.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/libstagefright/ShoutcastSource.cpp b/media/libstagefright/ShoutcastSource.cpp index 17b626e..4375f38 100644 --- a/media/libstagefright/ShoutcastSource.cpp +++ b/media/libstagefright/ShoutcastSource.cpp @@ -19,6 +19,7 @@ #include <media/stagefright/HTTPStream.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaBufferGroup.h> +#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/ShoutcastSource.h> #include <media/stagefright/string.h> @@ -36,8 +37,8 @@ ShoutcastSource::ShoutcastSource(HTTPStream *http) char *end; const char *start = metaint.c_str(); mMetaDataOffset = strtol(start, &end, 10); - assert(end > start && *end == '\0'); - assert(mMetaDataOffset > 0); + CHECK(end > start && *end == '\0'); + CHECK(mMetaDataOffset > 0); mBytesUntilMetaData = mMetaDataOffset; } @@ -53,7 +54,7 @@ ShoutcastSource::~ShoutcastSource() { } status_t ShoutcastSource::start(MetaData *) { - assert(!mStarted); + CHECK(!mStarted); mGroup = new MediaBufferGroup; mGroup->add_buffer(new MediaBuffer(4096)); // XXX @@ -64,7 +65,7 @@ status_t ShoutcastSource::start(MetaData *) { } status_t ShoutcastSource::stop() { - assert(mStarted); + CHECK(mStarted); delete mGroup; mGroup = NULL; @@ -85,7 +86,7 @@ sp<MetaData> ShoutcastSource::getFormat() { status_t ShoutcastSource::read( MediaBuffer **out, const ReadOptions *options) { - assert(mStarted); + CHECK(mStarted); *out = NULL; @@ -120,7 +121,7 @@ status_t ShoutcastSource::read( if (mBytesUntilMetaData == 0) { unsigned char num_16_byte_blocks = 0; n = mHttp->receive((char *)&num_16_byte_blocks, 1); - assert(n == 1); + CHECK_EQ(n, 1); char meta[255 * 16]; size_t meta_size = num_16_byte_blocks * 16; |