diff options
| author | James Dong <jdong@google.com> | 2012-02-06 23:46:37 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-02-10 11:43:09 -0800 |
| commit | 8e9d67a1356881d7dce75c83d8c6639a562d1a7a (patch) | |
| tree | 56593c0b48cf5014a7041c98a5dc32af0840e9f9 /media/libstagefright/codecs/avc | |
| parent | 55ee84154b3afe07afef6311f707928856840f89 (diff) | |
| download | frameworks_base-8e9d67a1356881d7dce75c83d8c6639a562d1a7a.zip frameworks_base-8e9d67a1356881d7dce75c83d8c6639a562d1a7a.tar.gz frameworks_base-8e9d67a1356881d7dce75c83d8c6639a562d1a7a.tar.bz2 | |
Move away from MediaDebug and use ADebug instead
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
Diffstat (limited to 'media/libstagefright/codecs/avc')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/AVCEncoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp index e202a2b..7533f07 100644 --- a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp @@ -24,8 +24,8 @@ #include "avcenc_int.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> @@ -417,7 +417,7 @@ status_t AVCEncoder::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(); uint32_t dataLength = outputBuffer->size(); @@ -557,9 +557,9 @@ status_t AVCEncoder::read( encoderStatus = PVAVCEncodeNAL(mHandle, outPtr, &dataLength, &type); if (encoderStatus == AVCENC_SUCCESS) { outputBuffer->meta_data()->setInt32(kKeyIsSyncFrame, mIsIDRFrame); - CHECK_EQ(NULL, PVAVCEncGetOverrunBuffer(mHandle)); + CHECK(NULL == PVAVCEncGetOverrunBuffer(mHandle)); } else if (encoderStatus == AVCENC_PICTURE_READY) { - CHECK_EQ(NULL, PVAVCEncGetOverrunBuffer(mHandle)); + CHECK(NULL == PVAVCEncGetOverrunBuffer(mHandle)); if (mIsIDRFrame) { outputBuffer->meta_data()->setInt32(kKeyIsSyncFrame, mIsIDRFrame); mIsIDRFrame = 0; |