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/SurfaceMediaSource.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/SurfaceMediaSource.cpp')
-rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index d068381..aa047d6 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -16,14 +16,14 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "SurfaceMediaSource" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/SurfaceMediaSource.h> -#include <ui/GraphicBuffer.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/MediaDefs.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/openmax/OMX_IVCommon.h> #include <media/stagefright/MetadataBufferType.h> +#include <ui/GraphicBuffer.h> #include <surfaceflinger/ISurfaceComposer.h> #include <surfaceflinger/SurfaceComposerClient.h> #include <surfaceflinger/IGraphicBufferAlloc.h> @@ -855,7 +855,7 @@ void SurfaceMediaSource::signalBufferReturned(MediaBuffer *buffer) { } if (!foundBuffer) { - CHECK_EQ(0, "signalBufferReturned: bogus buffer"); + CHECK(!"signalBufferReturned: bogus buffer"); } } |