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

Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer"

Browse Source
This commit is contained in:
Andreas Huber
2011-05-24 15:56:42 -07:00
committed by Android (Google) Code Review
parent 7eaa5e57d8 60a3cb81c0
commit 1b50fe2952
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
View File

@@ -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, &timestamp, &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;

2
media/libstagefright/omx/SoftOMXPlugin.cpp
View File

@@ -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;