diff options
| author | Andreas Huber <andih@google.com> | 2010-09-21 13:13:15 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-09-21 15:12:19 -0700 |
| commit | 6e4c5c499999c04c2477b987f9e64f3ff2bf1a06 (patch) | |
| tree | d19a0fc9db90d33a693f0e64cc79c31f38d414c4 /media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp | |
| parent | 425587d4566c1667448bf91fa452b4def8b6cedb (diff) | |
| download | frameworks_av-6e4c5c499999c04c2477b987f9e64f3ff2bf1a06.zip frameworks_av-6e4c5c499999c04c2477b987f9e64f3ff2bf1a06.tar.gz frameworks_av-6e4c5c499999c04c2477b987f9e64f3ff2bf1a06.tar.bz2 | |
Remove stagefright foundation's incompatible logging interface and update callsites.
Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
Diffstat (limited to 'media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp')
| -rw-r--r-- | media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp index f68a35b..13988cd 100644 --- a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "AMPEG4ElementaryAssembler" +#include <utils/Log.h> + #include "AMPEG4ElementaryAssembler.h" #include "ARTPSource.h" @@ -28,8 +32,6 @@ #include <ctype.h> #include <stdint.h> -#define BE_VERBOSE 0 - namespace android { static bool GetAttribute(const char *s, const char *key, AString *value) { @@ -201,9 +203,7 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket( mNextExpectedSeqNoValid = true; mNextExpectedSeqNo = (uint32_t)buffer->int32Data(); } else if ((uint32_t)buffer->int32Data() != mNextExpectedSeqNo) { -#if BE_VERBOSE - LOG(VERBOSE) << "Not the sequence number I expected"; -#endif + LOGV("Not the sequence number I expected"); return WRONG_SEQUENCE_NUMBER; } @@ -336,9 +336,7 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket( void AMPEG4ElementaryAssembler::submitAccessUnit() { CHECK(!mPackets.empty()); -#if BE_VERBOSE - LOG(VERBOSE) << "Access unit complete (" << mPackets.size() << " nal units)"; -#endif + LOGV("Access unit complete (%d nal units)", mPackets.size()); size_t totalSize = 0; for (List<sp<ABuffer> >::iterator it = mPackets.begin(); @@ -385,7 +383,7 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::assembleMore( void AMPEG4ElementaryAssembler::packetLost() { CHECK(mNextExpectedSeqNoValid); - LOG(VERBOSE) << "packetLost (expected " << mNextExpectedSeqNo << ")"; + LOGV("packetLost (expected %d)", mNextExpectedSeqNo); ++mNextExpectedSeqNo; |