summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-05-21 13:57:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-21 13:57:06 -0700
commita92896f62d8f4a4a6ff61f26439ad61c210ce728 (patch)
tree50d633ad7d8e4a3a9a7985d7e0b052d4e4a66796 /media
parent9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1 (diff)
parent21a0dca457bc0f3b8bafca0c49dfe2d442acbde0 (diff)
downloadframeworks_av-a92896f62d8f4a4a6ff61f26439ad61c210ce728.zip
frameworks_av-a92896f62d8f4a4a6ff61f26439ad61c210ce728.tar.gz
frameworks_av-a92896f62d8f4a4a6ff61f26439ad61c210ce728.tar.bz2
Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
Diffstat (limited to 'media')
-rwxr-xr-xmedia/libstagefright/OMXCodec.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index ba8dd57..66111dc 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -3148,11 +3148,6 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) {
mNoMoreOutputData = false;
}
- CODEC_LOGV("Calling emptyBuffer on buffer %p (length %d), "
- "timestamp %lld us (%.2f secs)",
- info->mBuffer, offset,
- timestampUs, timestampUs / 1E6);
-
if (info == NULL) {
CHECK(mFlags & kUseSecureInputBuffers);
CHECK(signalEOS);
@@ -3163,6 +3158,11 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) {
info = findEmptyInputBuffer();
}
+ CODEC_LOGV("Calling emptyBuffer on buffer %p (length %d), "
+ "timestamp %lld us (%.2f secs)",
+ info->mBuffer, offset,
+ timestampUs, timestampUs / 1E6);
+
err = mOMX->emptyBuffer(
mNode, info->mBuffer, 0, offset,
flags, timestampUs);