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/tests | |
| 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/tests')
| -rw-r--r-- | media/tests/omxjpegdecoder/Android.mk | 1 | ||||
| -rw-r--r-- | media/tests/omxjpegdecoder/SkOmxPixelRef.cpp | 4 | ||||
| -rw-r--r-- | media/tests/omxjpegdecoder/StreamSource.cpp | 2 | ||||
| -rw-r--r-- | media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk index 81c6167..025a131 100644 --- a/media/tests/omxjpegdecoder/Android.mk +++ b/media/tests/omxjpegdecoder/Android.mk @@ -26,6 +26,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libskia \ libstagefright \ + libstagefright_foundation \ libbinder \ libutils \ libjpeg diff --git a/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp b/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp index dfdf676..a25e854 100644 --- a/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp +++ b/media/tests/omxjpegdecoder/SkOmxPixelRef.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <media/stagefright/MediaDebug.h> +#include <media/stagefright/foundation/ADebug.h> #include <SkBitmap.h> #include "SkOmxPixelRef.h" @@ -32,7 +32,7 @@ SkOmxPixelRef::SkOmxPixelRef(SkColorTable* ctable, MediaBuffer* buffer, SkOmxPixelRef::~SkOmxPixelRef() { mBuffer->release(); - CHECK_EQ(mDecoder->stop(), OK); + CHECK_EQ(mDecoder->stop(), (status_t)OK); SkSafeUnref(mCTable); } diff --git a/media/tests/omxjpegdecoder/StreamSource.cpp b/media/tests/omxjpegdecoder/StreamSource.cpp index 5f44203..f764121a 100644 --- a/media/tests/omxjpegdecoder/StreamSource.cpp +++ b/media/tests/omxjpegdecoder/StreamSource.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <media/stagefright/MediaDebug.h> +#include <media/stagefright/foundation/ADebug.h> #include "StreamSource.h" 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 ); |