diff options
| author | James Dong <jdong@google.com> | 2012-02-10 14:17:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-10 14:17:06 -0800 |
| commit | 9f1d4448050a4df7118c90c0c0d3e6f9c4b82f3b (patch) | |
| tree | c63307d3e5438e9a33848b2e697ba6fabd7044e7 /media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp | |
| parent | 9d1f02d74fd395ec4de6861147da289423f0ab6f (diff) | |
| parent | f1d5aa162c02a16b7195a43a9bcea4d592600ac4 (diff) | |
| download | frameworks_av-9f1d4448050a4df7118c90c0c0d3e6f9c4b82f3b.zip frameworks_av-9f1d4448050a4df7118c90c0c0d3e6f9c4b82f3b.tar.gz frameworks_av-9f1d4448050a4df7118c90c0c0d3e6f9c4b82f3b.tar.bz2 | |
Merge "Move away from MediaDebug and use ADebug instead"
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp index d538603..20b0f8d 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp @@ -23,8 +23,8 @@ #include "mp4enc_api.h" #include "OMX_Video.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaBufferGroup.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> @@ -379,7 +379,7 @@ status_t M4vH263Encoder::read( *out = NULL; MediaBuffer *outputBuffer; - CHECK_EQ(OK, mGroup->acquire_buffer(&outputBuffer)); + CHECK_EQ((status_t)OK, mGroup->acquire_buffer(&outputBuffer)); uint8_t *outPtr = (uint8_t *) outputBuffer->data(); int32_t dataLength = outputBuffer->size(); @@ -467,7 +467,7 @@ status_t M4vH263Encoder::read( mInputBuffer = NULL; return UNKNOWN_ERROR; } - CHECK_EQ(NULL, PVGetOverrunBuffer(mHandle)); + CHECK(NULL == PVGetOverrunBuffer(mHandle)); if (hintTrack.CodeType == 0) { // I-frame serves as sync frame outputBuffer->meta_data()->setInt32(kKeyIsSyncFrame, 1); } |