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

Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.

Browse Source 
This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place.

In certain edge cases (encoded audio track contains silence), each buffer would turn out to be an amazing 6(!!!) bytes, we'd spend lots and lots of time streaming network data to fill the codec's buffers of size 6144 bytes with .. silence.

Change-Id: I9f449f310fc64ca384bd02e4a783e33cf5b46fcc
related-to-bug: 2609049
QA-Impact: streamed (http) playback of aac audio content on Droid.
This commit is contained in:
Andreas Huber
2010-04-20 14:26:00 -07:00
parent 0a4ab1b9b4
commit 2dd8ff8c4f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/libstagefright/OMXCodec.cpp
View File

@@ -2004,9 +2004,12 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) {
(const uint8_t *)srcBuffer->data() + srcBuffer->range_offset(),
srcBuffer->range_length());
int64_t lastBufferTimeUs;
CHECK(srcBuffer->meta_data()->findInt64(kKeyTime, &lastBufferTimeUs));
CHECK(timestampUs >= 0);
if (offset == 0) {
CHECK(srcBuffer->meta_data()->findInt64(kKeyTime, &timestampUs));
CHECK(timestampUs >= 0);
timestampUs = lastBufferTimeUs;
}
offset += srcBuffer->range_length();
@@ -2019,6 +2022,13 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) {
if (!(mQuirks & kSupportsMultipleFramesPerInputBuffer)) {
break;
}
int64_t coalescedDurationUs = lastBufferTimeUs - timestampUs;
if (coalescedDurationUs > 250000ll) {
// Don't coalesce more than 250ms worth of encoded data at once.
break;
}
}
if (n > 1) {