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 | f1d5aa162c02a16b7195a43a9bcea4d592600ac4 (patch) | |
tree | dc270a6e1a4ee6695e309eeb29c4d9ed7f3a20a2 /media/libstagefright/StagefrightMetadataRetriever.cpp | |
parent | 43089daaf82bd2b8e5f9a29b80af5abaae4657b3 (diff) | |
download | frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.zip frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.tar.gz frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.tar.bz2 |
Move away from MediaDebug and use ADebug instead
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
Diffstat (limited to 'media/libstagefright/StagefrightMetadataRetriever.cpp')
-rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index 43bfd9e..35f9c1f 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -20,10 +20,10 @@ #include "include/StagefrightMetadataRetriever.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/ColorConverter.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/FileSource.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXCodec.h> @@ -37,7 +37,7 @@ StagefrightMetadataRetriever::StagefrightMetadataRetriever() ALOGV("StagefrightMetadataRetriever()"); DataSource::RegisterDefaultSniffers(); - CHECK_EQ(mClient.connect(), OK); + CHECK_EQ(mClient.connect(), (status_t)OK); } StagefrightMetadataRetriever::~StagefrightMetadataRetriever() { @@ -169,7 +169,7 @@ static VideoFrame *extractVideoFrameWithCodecFlags( || (buffer != NULL && buffer->range_length() == 0)); if (err != OK) { - CHECK_EQ(buffer, NULL); + CHECK(buffer == NULL); ALOGV("decoding frame failed."); decoder->stop(); |