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

Merge change 8845

Browse Source 
* changes:
  While other OMX nodes appear to now have switched to using microseconds to timestamp buffers, at least the TI AAC and MP3 decoders still use milliseconds.
This commit is contained in:
Android (Google) Code Review
2009-07-28 13:32:50 -07:00
parent 7a45a2ec06 970764d14b
commit 3cbaf0087f
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/media/stagefright/OMXDecoder.h
View File

@@ -83,7 +83,8 @@ private:
kDoesntProperlyFlushAllPortsAtOnce = 8,
kRequiresAllocateBufferOnInputPorts = 16,
kRequiresAllocateBufferOnOutputPorts = 32,
kRequiresLoadedToIdleAfterAllocation = 64
kRequiresLoadedToIdleAfterAllocation = 64,
kMeasuresTimeInMilliseconds = 128,
};
OMXClient *mClient;

23
media/libstagefright/OMXDecoder.cpp
View File

@@ -154,6 +154,10 @@ OMXDecoder *OMXDecoder::Create(
if (!strncmp(codec, "OMX.qcom.video.", 15)) {
quirks |= kRequiresLoadedToIdleAfterAllocation;
}
if (!strcmp(codec, "OMX.TI.AAC.decode")
|| !strcmp(codec, "OMX.TI.MP3.decode")) {
quirks |= kMeasuresTimeInMilliseconds;
}
OMXDecoder *decoder = new OMXDecoder(client, node, mime, codec, quirks);
@@ -1497,7 +1501,11 @@ void OMXDecoder::onRealEmptyBufferDone(IOMX::buffer_id buffer) {
OMX_TICKS timestamp = 0;
if (success) {
timestamp = ((OMX_S64)units * 1000000) / scale;
if (mQuirks & kMeasuresTimeInMilliseconds) {
timestamp = ((OMX_S64)units * 1000) / scale;
} else {
timestamp = ((OMX_S64)units * 1000000) / scale;
}
}
input_buffer->release();
@@ -1523,9 +1531,16 @@ void OMXDecoder::onRealFillBufferDone(const omx_message &msg) {
media_buffer->meta_data()->clear();
media_buffer->meta_data()->setInt32(
kKeyTimeUnits,
(msg.u.extended_buffer_data.timestamp + 500) / 1000);
if (mQuirks & kMeasuresTimeInMilliseconds) {
media_buffer->meta_data()->setInt32(
kKeyTimeUnits,
msg.u.extended_buffer_data.timestamp);
} else {
media_buffer->meta_data()->setInt32(
kKeyTimeUnits,
(msg.u.extended_buffer_data.timestamp + 500) / 1000);
}
media_buffer->meta_data()->setInt32(kKeyTimeScale, 1000);
if (msg.u.extended_buffer_data.flags & OMX_BUFFERFLAG_SYNCFRAME) {