diff options
author | Andreas Huber <andih@google.com> | 2013-05-02 14:21:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-02 14:21:39 -0700 |
commit | dcd82dfaf7d4dc60e97f137355193dd816ddb006 (patch) | |
tree | 399864ad649b5a8c58f2c33a1ca58efd91185bef /media/libstagefright/wifi-display/source | |
parent | e53dacd6691aec7ab4ecfebd113c866397b37413 (diff) | |
parent | 6756998ef4ac1573e0f879e49a7936285ec61464 (diff) | |
download | frameworks_av-dcd82dfaf7d4dc60e97f137355193dd816ddb006.zip frameworks_av-dcd82dfaf7d4dc60e97f137355193dd816ddb006.tar.gz frameworks_av-dcd82dfaf7d4dc60e97f137355193dd816ddb006.tar.bz2 |
am 6756998e: am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev
* commit '6756998ef4ac1573e0f879e49a7936285ec61464':
Fix miracast source code to ignore the encoder output format change
Diffstat (limited to 'media/libstagefright/wifi-display/source')
-rw-r--r-- | media/libstagefright/wifi-display/source/Converter.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp index 0a8462c..5344623 100644 --- a/media/libstagefright/wifi-display/source/Converter.cpp +++ b/media/libstagefright/wifi-display/source/Converter.cpp @@ -649,6 +649,13 @@ status_t Converter::doMoreWork() { &bufferIndex, &offset, &size, &timeUs, &flags); if (err != OK) { + if (err == INFO_FORMAT_CHANGED) { + continue; + } else if (err == INFO_OUTPUT_BUFFERS_CHANGED) { + mEncoder->getOutputBuffers(&mEncoderOutputBuffers); + continue; + } + if (err == -EAGAIN) { err = OK; } |