diff options
| author | Marco Nelissen <marcone@google.com> | 2014-06-16 22:10:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-16 15:46:16 +0000 |
| commit | 3a227969f604d7c6a24a795661a13f70a5f37e1f (patch) | |
| tree | ee0c03d1f094385659bc976077e3f5578bec0faa | |
| parent | 5094675aa55458414e8b00a86a104a32ea1d55c0 (diff) | |
| parent | 7791cf11186a22b3f84d98cfde67393bee748cb0 (diff) | |
| download | frameworks_av-3a227969f604d7c6a24a795661a13f70a5f37e1f.zip frameworks_av-3a227969f604d7c6a24a795661a13f70a5f37e1f.tar.gz frameworks_av-3a227969f604d7c6a24a795661a13f70a5f37e1f.tar.bz2 | |
Merge "Fix logging"
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index d3c508d..9ab1417 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3888,6 +3888,7 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { AString componentName; uint32_t quirks = 0; + int32_t encoder = false; if (msg->findString("componentName", &componentName)) { ssize_t index = matchingCodecs.add(); OMXCodec::CodecNameAndQuirks *entry = &matchingCodecs.editItemAt(index); @@ -3900,7 +3901,6 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { } else { CHECK(msg->findString("mime", &mime)); - int32_t encoder; if (!msg->findInt32("encoder", &encoder)) { encoder = false; } @@ -3936,10 +3936,10 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { if (node == NULL) { if (!mime.empty()) { - ALOGE("Unable to instantiate a decoder for type '%s'.", - mime.c_str()); + ALOGE("Unable to instantiate a %scoder for type '%s'.", + encoder ? "en" : "de", mime.c_str()); } else { - ALOGE("Unable to instantiate decoder '%s'.", componentName.c_str()); + ALOGE("Unable to instantiate codec '%s'.", componentName.c_str()); } mCodec->signalError(OMX_ErrorComponentNotFound); |