assert => CHECK in stagefright.

3 files changed, 16 insertions, 22 deletions

diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index 39fa27e..1e59b52 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -20,15 +20,13 @@
 
 #include <sys/socket.h>
 
-#undef NDEBUG
-#include <assert.h>
-
 #include "OMX.h"
 #include "OMXRenderer.h"
 
 #include "pv_omxcore.h"
 
 #include <binder/IMemory.h>
+#include <media/stagefright/MediaDebug.h>
 #include <media/stagefright/QComHardwareRenderer.h>
 #include <media/stagefright/SoftwareRenderer.h>
 #include <media/stagefright/TIHardwareRenderer.h>
@@ -50,7 +48,7 @@ public:
     }
 
     void setHandle(OMX_HANDLETYPE handle) {
-        assert(mHandle == NULL);
+        CHECK_EQ(mHandle, NULL);
         mHandle = handle;
     }
 
@@ -541,7 +539,7 @@ void OMX::fill_buffer(node_id node, buffer_id buffer) {
 
     OMX_ERRORTYPE err =
         OMX_FillThisBuffer(node_meta->handle(), header);
-    assert(err == OMX_ErrorNone);
+    CHECK_EQ(err, OMX_ErrorNone);
 }
 
 void OMX::empty_buffer(
@@ -563,7 +561,7 @@ void OMX::empty_buffer(
 
     OMX_ERRORTYPE err =
         OMX_EmptyThisBuffer(node_meta->handle(), header);
-    assert(err == OMX_ErrorNone);
+    CHECK_EQ(err, OMX_ErrorNone);
 }
 
 status_t OMX::get_extension_index(
diff --git a/media/libstagefright/omx/QComHardwareRenderer.cpp b/media/libstagefright/omx/QComHardwareRenderer.cpp
index 5a23792..e9930be 100644
--- a/media/libstagefright/omx/QComHardwareRenderer.cpp
+++ b/media/libstagefright/omx/QComHardwareRenderer.cpp
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-#undef NDEBUG
-#include <assert.h>
-
 #include <binder/MemoryHeapBase.h>
 #include <binder/MemoryHeapPmem.h>
+#include <media/stagefright/MediaDebug.h>
 #include <media/stagefright/QComHardwareRenderer.h>
 #include <ui/ISurface.h>
 
@@ -68,9 +66,9 @@ QComHardwareRenderer::QComHardwareRenderer(
       mDecodedWidth(decodedWidth),
       mDecodedHeight(decodedHeight),
       mFrameSize((mDecodedWidth * mDecodedHeight * 3) / 2) {
-    assert(mISurface.get() != NULL);
-    assert(mDecodedWidth > 0);
-    assert(mDecodedHeight > 0);
+    CHECK(mISurface.get() != NULL);
+    CHECK(mDecodedWidth > 0);
+    CHECK(mDecodedHeight > 0);
 }
 
 QComHardwareRenderer::~QComHardwareRenderer() {
@@ -133,7 +131,7 @@ void QComHardwareRenderer::publishBuffers(uint32_t pmem_fd) {
             mMemoryHeap);
 
     status_t err = mISurface->registerBuffers(bufferHeap);
-    assert(err == OK);
+    CHECK_EQ(err, OK);
 }
 
 }  // namespace android
diff --git a/media/libstagefright/omx/SoftwareRenderer.cpp b/media/libstagefright/omx/SoftwareRenderer.cpp
index 5483238..da97d55 100644
--- a/media/libstagefright/omx/SoftwareRenderer.cpp
+++ b/media/libstagefright/omx/SoftwareRenderer.cpp
@@ -17,10 +17,8 @@
 #define LOG_TAG "SoftwareRenderer"
 #include <utils/Log.h>
 
-#undef NDEBUG
-#include <assert.h>
-
 #include <binder/MemoryHeapBase.h>
+#include <media/stagefright/MediaDebug.h>
 #include <media/stagefright/SoftwareRenderer.h>
 #include <ui/ISurface.h>
 
@@ -40,10 +38,10 @@ SoftwareRenderer::SoftwareRenderer(
       mFrameSize(mDecodedWidth * mDecodedHeight * 2),  // RGB565
       mMemoryHeap(new MemoryHeapBase(2 * mFrameSize)),
       mIndex(0) {
-    assert(mISurface.get() != NULL);
-    assert(mDecodedWidth > 0);
-    assert(mDecodedHeight > 0);
-    assert(mMemoryHeap->heapID() >= 0);
+    CHECK(mISurface.get() != NULL);
+    CHECK(mDecodedWidth > 0);
+    CHECK(mDecodedHeight > 0);
+    CHECK(mMemoryHeap->heapID() >= 0);
 
     ISurface::BufferHeap bufferHeap(
             mDisplayWidth, mDisplayHeight,
@@ -52,7 +50,7 @@ SoftwareRenderer::SoftwareRenderer(
             mMemoryHeap);
 
     status_t err = mISurface->registerBuffers(bufferHeap);
-    assert(err == OK);
+    CHECK_EQ(err, OK);
 }
 
 SoftwareRenderer::~SoftwareRenderer() {
@@ -65,7 +63,7 @@ void SoftwareRenderer::render(
         LOGE("size is %d, expected %d",
                 size, (mDecodedHeight * mDecodedWidth * 3) / 2);
     }
-    assert(size >= (mDecodedWidth * mDecodedHeight * 3) / 2);
+    CHECK(size >= (mDecodedWidth * mDecodedHeight * 3) / 2);
 
     static const signed kClipMin = -278;
     static const signed kClipMax = 535;