diff options
author | James Dong <jdong@google.com> | 2012-02-08 13:51:46 -0800 |
---|---|---|
committer | James Dong <jdong@google.com> | 2012-02-08 16:08:33 -0800 |
commit | c4689fae1bdb8d1c94eb28af1b2a1f30d2b1a3da (patch) | |
tree | 671c1ad1ba63040c35961f4b13db515edb1d0dd4 /libvideoeditor/vss | |
parent | 0a684cc5346e7d95acd3c3c0582c2b0161815fb0 (diff) | |
download | frameworks_av-c4689fae1bdb8d1c94eb28af1b2a1f30d2b1a3da.zip frameworks_av-c4689fae1bdb8d1c94eb28af1b2a1f30d2b1a3da.tar.gz frameworks_av-c4689fae1bdb8d1c94eb28af1b2a1f30d2b1a3da.tar.bz2 |
Move away from MediaDebug and use ADebug instead
Change-Id: I307b3f565808ec8e3b9a4d944c6c0d1f603b04c9
Diffstat (limited to 'libvideoeditor/vss')
8 files changed, 11 insertions, 10 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index 398750e..e81f8da 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -55,6 +55,7 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libbinder \ libstagefright \ + libstagefright_foundation \ libstagefright_omx \ libgui \ libvideoeditorplayer diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp index cf0edb7..c4c4d84 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp @@ -46,13 +46,13 @@ #include "ESDS.h" #include "utils/Log.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/FileSource.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaExtractor.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> @@ -1605,7 +1605,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, } else if( (M4DA_StreamTypeVideoMpeg4 == streamType) ) { if (meta->findData(kKeyESDS, &type, &data, &size)) { ESDS esds((const char *)data, size); - CHECK_EQ(esds.InitCheck(), OK); + CHECK_EQ(esds.InitCheck(), (status_t)OK); (*pStreamHandler)->m_ESDSInfoSize = size; (*pStreamHandler)->m_pESDSInfo = (M4OSA_UInt8*)\ @@ -1718,7 +1718,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, if (meta->findData(kKeyESDS, &type, &data, &size)) { ESDS esds((const char *)data, size); - CHECK_EQ(esds.InitCheck(), OK); + CHECK_EQ(esds.InitCheck(), (status_t)OK); esds.getCodecSpecificInfo(&codec_specific_data, &codec_specific_data_size); @@ -1765,7 +1765,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, } else if((M4DA_StreamTypeAudioAac == streamType)) { if (meta->findData(kKeyESDS, &type, &data, &size)) { ESDS esds((const char *)data, size); - CHECK_EQ(esds.InitCheck(), OK); + CHECK_EQ(esds.InitCheck(), (status_t)OK); (*pStreamHandler)->m_ESDSInfoSize = size; (*pStreamHandler)->m_pESDSInfo = (M4OSA_UInt8*)M4OSA_32bitAlignedMalloc( diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp index 02aabae..9b35d07 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp @@ -30,8 +30,8 @@ #include "utils/Log.h" #include "utils/Vector.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaSource.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp index 6526651..a91f3ee 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp @@ -28,8 +28,8 @@ #include "VideoEditorUtils.h" #include "utils/Log.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaSource.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp index 153d732..af53c54 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp @@ -32,13 +32,13 @@ #include "VideoEditorUtils.h" #include "utils/Log.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/FileSource.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaExtractor.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp index 80a7f0b..5309bd4 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp @@ -26,8 +26,8 @@ #include "VideoEditorUtils.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaErrors.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MetaData.h> diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp index 5f856f9..aa26252 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp @@ -29,9 +29,9 @@ #include "VideoEditorUtils.h" #include "M4VD_Tools.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/MediaDefs.h> -#include <media/stagefright/MediaDebug.h> /******************** * DEFINITIONS * ********************/ diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp index 3ec1a73..9311e94 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp @@ -33,8 +33,8 @@ #include "utils/Log.h" #include "utils/Vector.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaSource.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/OMXClient.h> |