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/omx/OMX.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/omx/OMX.cpp')
| -rw-r--r-- | media/libstagefright/omx/OMX.cpp | 10 |
1 files changed, 4 insertions, 6 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( |