diff options
author | Andreas Huber <andih@google.com> | 2011-05-24 14:53:30 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-05-24 14:53:30 -0700 |
commit | f2af5a2c607e71ff4cd39da28b077c0a68b206fe (patch) | |
tree | 8b836eb9a3dad85163dfe000faae8ef07a986fec /media/libstagefright | |
parent | 9eff287f4f59d6a0c9ca1d5dd8a7bb6e64acf5a4 (diff) | |
download | frameworks_av-f2af5a2c607e71ff4cd39da28b077c0a68b206fe.zip frameworks_av-f2af5a2c607e71ff4cd39da28b077c0a68b206fe.tar.gz frameworks_av-f2af5a2c607e71ff4cd39da28b077c0a68b206fe.tar.bz2 |
Make sure the software mpeg4 decoder supports multiple input frames per input buffer
to enable faster throughput in ACodec.
Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | 27 | ||||
-rw-r--r-- | media/libstagefright/omx/SoftOMXPlugin.cpp | 2 |
2 files changed, 21 insertions, 8 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp index 13e1662..cffbfb5 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp @@ -360,10 +360,14 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { mFramesConfigured = true; } - uint32_t timestamp = 0xFFFFFFFF; + uint32_t useExtTimestamp = (inHeader->nOffset == 0); + + // decoder deals in ms, OMX in us. + uint32_t timestamp = + useExtTimestamp ? (inHeader->nTimeStamp + 500) / 1000 : 0xFFFFFFFF; + int32_t bufferSize = inHeader->nFilledLen; - uint32_t useExtTimestamp = 0; if (PVDecodeVideoFrame( mHandle, &bitstream, ×tamp, &bufferSize, &useExtTimestamp, @@ -379,13 +383,20 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { return; } - outHeader->nTimeStamp = inHeader->nTimeStamp; + // decoder deals in ms, OMX in us. + outHeader->nTimeStamp = timestamp * 1000; - inInfo->mOwnedByUs = false; - inQueue.erase(inQueue.begin()); - inInfo = NULL; - notifyEmptyBufferDone(inHeader); - inHeader = NULL; + CHECK_LE(bufferSize, inHeader->nFilledLen); + inHeader->nOffset += inHeader->nFilledLen - bufferSize; + inHeader->nFilledLen = bufferSize; + + if (inHeader->nFilledLen == 0) { + inInfo->mOwnedByUs = false; + inQueue.erase(inQueue.begin()); + inInfo = NULL; + notifyEmptyBufferDone(inHeader); + inHeader = NULL; + } ++mInputBufferCount; diff --git a/media/libstagefright/omx/SoftOMXPlugin.cpp b/media/libstagefright/omx/SoftOMXPlugin.cpp index 6bd6624..cfbcb96 100644 --- a/media/libstagefright/omx/SoftOMXPlugin.cpp +++ b/media/libstagefright/omx/SoftOMXPlugin.cpp @@ -21,6 +21,7 @@ #include "SoftOMXPlugin.h" #include "include/SoftOMXComponent.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AString.h> #include <dlfcn.h> @@ -128,6 +129,7 @@ OMX_ERRORTYPE SoftOMXPlugin::destroyComponentInstance( void *libHandle = me->libHandle(); + CHECK_EQ(me->getStrongCount(), 1); me->decStrong(this); me = NULL; |