commit b5ceb9ee21f37ae0817c16490c1fc148dd3eb5e2
author Andreas Huber <andih@google.com> Wed Aug 26 14:48:20 2009 -0700
committer Andreas Huber <andih@google.com> Wed Aug 26 14:48:20 2009 -0700
tree 6e3e5b4b48f7d2644ddb1971cbcdfdb3eba9fad6
parent 4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf

assert => CHECK in stagefright.

media/libstagefright/ShoutcastSource.cpp

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 @@
         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 @@
 }
 
 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::stop() {
-    assert(mStarted);
+    CHECK(mStarted);
 
     delete mGroup;
     mGroup = NULL;
@@ -85,7 +86,7 @@
 
 status_t ShoutcastSource::read(
         MediaBuffer **out, const ReadOptions *options) {
-    assert(mStarted);
+    CHECK(mStarted);
 
     *out = NULL;
 
@@ -120,7 +121,7 @@
     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;