diff options
author | Steve Block <steveblock@google.com> | 2012-01-04 20:05:49 +0000 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 14:44:56 -0800 |
commit | 53feeb42c721e8fc9285e35e679906a951f3277c (patch) | |
tree | bb48afd280bf7429d61229bfba2e733aa2805711 /media/libstagefright/mpeg2ts | |
parent | 52546c0ef96aa3e7e21482e0f9b6e982557c8da9 (diff) | |
download | frameworks_av-53feeb42c721e8fc9285e35e679906a951f3277c.zip frameworks_av-53feeb42c721e8fc9285e35e679906a951f3277c.tar.gz frameworks_av-53feeb42c721e8fc9285e35e679906a951f3277c.tar.bz2 |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 18 | ||||
-rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 16 | ||||
-rw-r--r-- | media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp | 8 | ||||
-rw-r--r-- | media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp index da911e4..576693a 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -282,7 +282,7 @@ status_t ATSParser::Program::parseProgramMap(ABitReader *br) { ssize_t index = mStreams.indexOfKey(info.mPID); if (index >= 0 && mStreams.editValueAt(index)->type() != info.mType) { - LOGI("uh oh. stream PIDs have changed."); + ALOGI("uh oh. stream PIDs have changed."); PIDsChanged = true; break; } @@ -290,18 +290,18 @@ status_t ATSParser::Program::parseProgramMap(ABitReader *br) { if (PIDsChanged) { #if 0 - LOGI("before:"); + ALOGI("before:"); for (size_t i = 0; i < mStreams.size(); ++i) { sp<Stream> stream = mStreams.editValueAt(i); - LOGI("PID 0x%08x => type 0x%02x", stream->pid(), stream->type()); + ALOGI("PID 0x%08x => type 0x%02x", stream->pid(), stream->type()); } - LOGI("after:"); + ALOGI("after:"); for (size_t i = 0; i < infos.size(); ++i) { StreamInfo &info = infos.editItemAt(i); - LOGI("PID 0x%08x => type 0x%02x", info.mPID, info.mType); + ALOGI("PID 0x%08x => type 0x%02x", info.mPID, info.mType); } #endif @@ -340,7 +340,7 @@ status_t ATSParser::Program::parseProgramMap(ABitReader *br) { } if (!success) { - LOGI("Stream PIDs changed and we cannot recover."); + ALOGI("Stream PIDs changed and we cannot recover."); return ERROR_MALFORMED; } } @@ -475,7 +475,7 @@ status_t ATSParser::Stream::parse( // Increment in multiples of 64K. neededSize = (neededSize + 65535) & ~65535; - LOGI("resizing buffer to %d bytes", neededSize); + ALOGI("resizing buffer to %d bytes", neededSize); sp<ABuffer> newBuffer = new ABuffer(neededSize); memcpy(newBuffer->data(), mBuffer->data(), mBuffer->size()); @@ -634,7 +634,7 @@ status_t ATSParser::Stream::parsePES(ABitReader *br) { CHECK_EQ(br->getBits(1), 1u); ALOGV("PTS = %llu", PTS); - // LOGI("PTS = %.2f secs", PTS / 90000.0f); + // ALOGI("PTS = %.2f secs", PTS / 90000.0f); optional_bytes_remaining -= 5; @@ -968,7 +968,7 @@ status_t ATSParser::parseTS(ABitReader *br) { unsigned continuity_counter = br->getBits(4); ALOGV("continuity_counter = %u", continuity_counter); - // LOGI("PID = 0x%04x, continuity_counter = %u", PID, continuity_counter); + // ALOGI("PID = 0x%04x, continuity_counter = %u", PID, continuity_counter); if (adaptation_field_control == 2 || adaptation_field_control == 3) { parseAdaptationField(br); diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index edb4232..05c87fd 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -144,7 +144,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an H.264/MPEG syncword at " + ALOGI("found something resembling an H.264/MPEG syncword at " "offset %ld", startOffset); } @@ -177,7 +177,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an H.264/MPEG syncword at " + ALOGI("found something resembling an H.264/MPEG syncword at " "offset %ld", startOffset); } @@ -210,7 +210,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an AAC syncword at offset %ld", + ALOGI("found something resembling an AAC syncword at offset %ld", startOffset); } @@ -237,7 +237,7 @@ status_t ElementaryStreamQueue::appendData( } if (startOffset > 0) { - LOGI("found something resembling an MPEG audio " + ALOGI("found something resembling an MPEG audio " "syncword at offset %ld", startOffset); } @@ -280,7 +280,7 @@ status_t ElementaryStreamQueue::appendData( #if 0 if (mMode == AAC) { - LOGI("size = %d, timeUs = %.2f secs", size, timeUs / 1E6); + ALOGI("size = %d, timeUs = %.2f secs", size, timeUs / 1E6); hexdump(data, size); } #endif @@ -337,7 +337,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitAAC() { CHECK(mFormat->findInt32(kKeySampleRate, &sampleRate)); CHECK(mFormat->findInt32(kKeyChannelCount, &numChannels)); - LOGI("found AAC codec config (%d Hz, %d channels)", + ALOGI("found AAC codec config (%d Hz, %d channels)", sampleRate, numChannels); } else { // profile_ObjectType, sampling_frequency_index, private_bits, @@ -714,7 +714,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMPEGVideo() { mFormat->setInt32(kKeyWidth, width); mFormat->setInt32(kKeyHeight, height); - LOGI("found MPEG2 video codec config (%d x %d)", width, height); + ALOGI("found MPEG2 video codec config (%d x %d)", width, height); sp<ABuffer> csd = new ABuffer(offset); memcpy(csd->data(), data, offset); @@ -880,7 +880,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMPEG4Video() { mFormat->setInt32(kKeyWidth, width); mFormat->setInt32(kKeyHeight, height); - LOGI("found MPEG4 video codec config (%d x %d)", + ALOGI("found MPEG4 video codec config (%d x %d)", width, height); sp<ABuffer> csd = new ABuffer(offset); diff --git a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp index df30a9c..727c931 100644 --- a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp @@ -315,7 +315,7 @@ ssize_t MPEG2PSExtractor::dequeuePES() { unsigned descriptor_tag = br.getBits(8); unsigned descriptor_length = br.getBits(8); - LOGI("found descriptor tag 0x%02x of length %u", + ALOGI("found descriptor tag 0x%02x of length %u", descriptor_tag, descriptor_length); if (offset + 2 + descriptor_length > program_stream_info_length) { @@ -338,7 +338,7 @@ ssize_t MPEG2PSExtractor::dequeuePES() { unsigned stream_type = br.getBits(8); unsigned elementary_stream_id = br.getBits(8); - LOGI("elementary stream id 0x%02x has stream type 0x%02x", + ALOGI("elementary stream id 0x%02x has stream type 0x%02x", elementary_stream_id, stream_type); mStreamTypeByESID.add(elementary_stream_id, stream_type); @@ -409,7 +409,7 @@ ssize_t MPEG2PSExtractor::dequeuePES() { CHECK_EQ(br.getBits(1), 1u); ALOGV("PTS = %llu", PTS); - // LOGI("PTS = %.2f secs", PTS / 90000.0f); + // ALOGI("PTS = %.2f secs", PTS / 90000.0f); optional_bytes_remaining -= 5; @@ -568,7 +568,7 @@ MPEG2PSExtractor::Track::Track( if (supported) { mQueue = new ElementaryStreamQueue(mode); } else { - LOGI("unsupported stream ID 0x%02x", stream_id); + ALOGI("unsupported stream ID 0x%02x", stream_id); } } diff --git a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp index 17cf45a..03033f5 100644 --- a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp @@ -199,7 +199,7 @@ void MPEG2TSExtractor::init() { } } - LOGI("haveAudio=%d, haveVideo=%d", haveAudio, haveVideo); + ALOGI("haveAudio=%d, haveVideo=%d", haveAudio, haveVideo); } status_t MPEG2TSExtractor::feedMore() { |