diff options
| author | Rachad Alao <rachad@google.com> | 2013-09-30 22:09:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-30 22:09:43 -0700 |
| commit | c46683a96dd668446ba949c841d6041d2bea2cbc (patch) | |
| tree | 4a5a4d181245e468abf35ed2169c2f7ef5e8285c /media | |
| parent | d990e7b27b1984fcaee6c37005056db9ca5ca3c7 (diff) | |
| parent | 0797fb709d2cdd35fe596b6089b259ad10d345d6 (diff) | |
| download | frameworks_av-c46683a96dd668446ba949c841d6041d2bea2cbc.zip frameworks_av-c46683a96dd668446ba949c841d6041d2bea2cbc.tar.gz frameworks_av-c46683a96dd668446ba949c841d6041d2bea2cbc.tar.bz2 | |
am 0797fb70: Merge "Indicate sync frames returned by encoder" into klp-dev
* commit '0797fb709d2cdd35fe596b6089b259ad10d345d6':
Indicate sync frames returned by encoder
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp index 5f2b5c8..16f0f30 100644 --- a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp +++ b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp @@ -803,6 +803,8 @@ void SoftVPXEncoder::onQueueFilled(OMX_U32 portIndex) { if (encoded_packet->kind == VPX_CODEC_CX_FRAME_PKT) { outputBufferHeader->nTimeStamp = encoded_packet->data.frame.pts; outputBufferHeader->nFlags = 0; + if (encoded_packet->data.frame.flags & VPX_FRAME_IS_KEY) + outputBufferHeader->nFlags |= OMX_BUFFERFLAG_SYNCFRAME; outputBufferHeader->nOffset = 0; outputBufferHeader->nFilledLen = encoded_packet->data.frame.sz; memcpy(outputBufferHeader->pBuffer, |