diff options
| -rw-r--r-- | media/libmediaplayerservice/StagefrightMetadataRetriever.cpp | 12 | ||||
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp index fced87bf8ec1..fc4f2c570ee7 100644 --- a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp +++ b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp @@ -86,7 +86,7 @@ VideoFrame *StagefrightMetadataRetriever::captureFrame() { LOGV("captureFrame"); if (mExtractor.get() == NULL) { - LOGE("no extractor."); + LOGV("no extractor."); return NULL; } @@ -104,7 +104,7 @@ VideoFrame *StagefrightMetadataRetriever::captureFrame() { } if (i == n) { - LOGE("no video track found."); + LOGV("no video track found."); return NULL; } @@ -114,7 +114,7 @@ VideoFrame *StagefrightMetadataRetriever::captureFrame() { sp<MediaSource> source = mExtractor->getTrack(i); if (source.get() == NULL) { - LOGE("unable to instantiate video track."); + LOGV("unable to instantiate video track."); return NULL; } @@ -126,7 +126,7 @@ VideoFrame *StagefrightMetadataRetriever::captureFrame() { NULL, OMXCodec::kPreferSoftwareCodecs); if (decoder.get() == NULL) { - LOGE("unable to instantiate video decoder."); + LOGV("unable to instantiate video decoder."); return NULL; } @@ -157,13 +157,13 @@ VideoFrame *StagefrightMetadataRetriever::captureFrame() { if (err != OK) { CHECK_EQ(buffer, NULL); - LOGE("decoding frame failed."); + LOGV("decoding frame failed."); decoder->stop(); return NULL; } - LOGI("successfully decoded video frame."); + LOGV("successfully decoded video frame."); meta = decoder->getFormat(); diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index 8535f5289026..f23efbf49059 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -41,7 +41,7 @@ sp<MediaExtractor> MediaExtractor::Create( } mime = tmp.string(); - LOGI("Autodetected media content as '%s' with confidence %.2f", + LOGV("Autodetected media content as '%s' with confidence %.2f", mime, confidence); } diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 84d0d4b8473a..d5d45d7de0ce 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -107,8 +107,6 @@ static status_t StatusFromOMXError(OMX_ERRORTYPE err) { } status_t OMXNodeInstance::freeNode() { - Mutex::Autolock autoLock(mLock); - OMX_ERRORTYPE err = OMX_MasterFreeHandle(mHandle); mHandle = NULL; @@ -119,9 +117,8 @@ status_t OMXNodeInstance::freeNode() { mOwner->invalidateNodeID(mNodeID); mNodeID = NULL; - LOGI("OMXNodeInstance going away."); - mObserver.clear(); - // delete this; // leads to heap-corruption??? + LOGV("OMXNodeInstance going away."); + delete this; return StatusFromOMXError(err); } |