Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."

Browse Source
This commit is contained in:
Andreas Huber
2011-09-27 15:26:43 -07:00
committed by Android (Google) Code Review
parent f7def66480 262d7e8e21
commit d4fb497cf4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/AwesomePlayer.cpp
View File

@@ -249,7 +249,7 @@ void AwesomePlayer::setListener(const wp<MediaPlayerBase> &listener) {
} }
void AwesomePlayer::setUID(uid_t uid) { void AwesomePlayer::setUID(uid_t uid) {
LOGI("AwesomePlayer running on behalf of uid %d", uid); LOGV("AwesomePlayer running on behalf of uid %d", uid);
mUID = uid; mUID = uid;
mUIDValid = true; mUIDValid = true;
@@ -362,7 +362,7 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) {
if (!meta->findInt32(kKeyBitRate, &bitrate)) { if (!meta->findInt32(kKeyBitRate, &bitrate)) {
const char *mime; const char *mime;
CHECK(meta->findCString(kKeyMIMEType, &mime)); CHECK(meta->findCString(kKeyMIMEType, &mime));
LOGW("track of type '%s' does not publish bitrate", mime); LOGV("track of type '%s' does not publish bitrate", mime);
totalBitRate = -1; totalBitRate = -1;
break; break;
@@ -1192,7 +1192,7 @@ void AwesomePlayer::shutdownVideoDecoder_l() {
usleep(1000); usleep(1000);
} }
IPCThreadState::self()->flushCommands(); IPCThreadState::self()->flushCommands();
LOGI("video decoder shutdown completed"); LOGV("video decoder shutdown completed");
} }
status_t AwesomePlayer::setNativeWindow_l(const sp<ANativeWindow> &native) { status_t AwesomePlayer::setNativeWindow_l(const sp<ANativeWindow> &native) {
@@ -1202,7 +1202,7 @@ status_t AwesomePlayer::setNativeWindow_l(const sp<ANativeWindow> &native) {
return OK; return OK;
} }
LOGI("attempting to reconfigure to use new surface"); LOGV("attempting to reconfigure to use new surface");
bool wasPlaying = (mFlags & PLAYING) != 0; bool wasPlaying = (mFlags & PLAYING) != 0;

10
media/libstagefright/OMXCodec.cpp
View File

@@ -1635,7 +1635,7 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) {
return err; return err;
} }
CODEC_LOGI("allocating %lu buffers of size %lu on %s port", CODEC_LOGV("allocating %lu buffers of size %lu on %s port",
def.nBufferCountActual, def.nBufferSize, def.nBufferCountActual, def.nBufferSize,
portIndex == kPortIndexInput ? "input" : "output"); portIndex == kPortIndexInput ? "input" : "output");
@@ -1876,7 +1876,7 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() {
return err; return err;
} }
CODEC_LOGI("allocating %lu buffers from a native window of size %lu on " CODEC_LOGV("allocating %lu buffers from a native window of size %lu on "
"output port", def.nBufferCountActual, def.nBufferSize); "output port", def.nBufferCountActual, def.nBufferSize);
// Dequeue buffers and send them to OMX // Dequeue buffers and send them to OMX
@@ -3654,7 +3654,7 @@ status_t OMXCodec::stop() {
mSource->stop(); mSource->stop();
CODEC_LOGI("stopped in state %d", mState); CODEC_LOGV("stopped in state %d", mState);
return OK; return OK;
} }
@@ -4219,14 +4219,14 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {
inputFormat->findInt32(kKeySampleRate, &sampleRate); inputFormat->findInt32(kKeySampleRate, &sampleRate);
if ((OMX_U32)numChannels != params.nChannels) { if ((OMX_U32)numChannels != params.nChannels) {
LOGW("Codec outputs a different number of channels than " LOGV("Codec outputs a different number of channels than "
"the input stream contains (contains %d channels, " "the input stream contains (contains %d channels, "
"codec outputs %ld channels).", "codec outputs %ld channels).",
numChannels, params.nChannels); numChannels, params.nChannels);
} }
if (sampleRate != (int32_t)params.nSamplingRate) { if (sampleRate != (int32_t)params.nSamplingRate) {
LOGW("Codec outputs at different sampling rate than " LOGV("Codec outputs at different sampling rate than "
"what the input stream contains (contains data at " "what the input stream contains (contains data at "
"%d Hz, codec outputs %lu Hz)", "%d Hz, codec outputs %lu Hz)",
sampleRate, params.nSamplingRate); sampleRate, params.nSamplingRate);