diff options
Diffstat (limited to 'media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp')
| -rw-r--r-- | media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp index 42df66c..6424744 100644 --- a/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp +++ b/media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp @@ -25,7 +25,7 @@ #include <binder/IServiceManager.h> #include <binder/ProcessState.h> #include <media/IMediaPlayerService.h> -#include <media/stagefright/MediaDebug.h> +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> @@ -89,7 +89,7 @@ static int64_t getNowUs() { OmxJpegImageDecoder::OmxJpegImageDecoder() { status_t err = mClient.connect(); - CHECK_EQ(err, OK); + CHECK_EQ(err, (status_t)OK); } OmxJpegImageDecoder::~OmxJpegImageDecoder() { @@ -152,7 +152,7 @@ bool OmxJpegImageDecoder::decodeSource(sp<MediaSource> decoder, int64_t duration = getNowUs() - startTime; if (err != OK) { - CHECK_EQ(buffer, NULL); + CHECK(buffer == NULL); } printf("Duration in decoder->read(): %.1f (msecs). \n", duration / 1E3 ); |