diff options
| author | Marco Nelissen <marcone@google.com> | 2012-12-18 15:17:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-18 15:17:33 -0800 |
| commit | 0ebf429406d796df74f781dfe085ee73851fe2a1 (patch) | |
| tree | d69793e89f361ce400a71e57e50858f13cb67e30 /media/libstagefright | |
| parent | 6fc72b01a3b67903b52f1d33b1ad5c960b5365f1 (diff) | |
| parent | 21ad778dcfcddb8f8fd9dc3fe4992fbef246c511 (diff) | |
| download | frameworks_av-0ebf429406d796df74f781dfe085ee73851fe2a1.zip frameworks_av-0ebf429406d796df74f781dfe085ee73851fe2a1.tar.gz frameworks_av-0ebf429406d796df74f781dfe085ee73851fe2a1.tar.bz2 | |
Merge "Report buffer size even when using hardware buffers"
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 2b20ab0..7920d32 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -612,7 +612,7 @@ status_t ACodec::allocateOutputBuffersFromNativeWindow() { sp<GraphicBuffer> graphicBuffer(new GraphicBuffer(buf, false)); BufferInfo info; info.mStatus = BufferInfo::OWNED_BY_US; - info.mData = new ABuffer(0); + info.mData = new ABuffer(NULL /* data */, def.nBufferSize /* capacity */); info.mGraphicBuffer = graphicBuffer; mBuffers[kPortIndexOutput].push(info); @@ -2868,15 +2868,14 @@ bool ACodec::BaseState::onOMXFillBufferDone( mCodec->sendFormatChange(); } - if (mCodec->mNativeWindow == NULL) { - info->mData->setRange(rangeOffset, rangeLength); - + info->mData->setRange(rangeOffset, rangeLength); #if 0 + if (mCodec->mNativeWindow == NULL) { if (IsIDR(info->mData)) { ALOGI("IDR frame"); } -#endif } +#endif if (mCodec->mSkipCutBuffer != NULL) { mCodec->mSkipCutBuffer->submit(info->mData); |