diff options
| author | Andreas Huber <andih@google.com> | 2013-05-02 21:16:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-02 21:16:09 +0000 |
| commit | 093a1f3a001a5fb3bac011abc2aa376f621c1bfe (patch) | |
| tree | 2eea734153023b4949d3a7c1f5604a7aebd72dbb /media/libstagefright/wifi-display | |
| parent | 688492164e7d92618a1409b567f884bcbd9a5d02 (diff) | |
| parent | 2edb6a6aee4f0c8c518397393015a48d1fcce5d2 (diff) | |
| download | frameworks_av-093a1f3a001a5fb3bac011abc2aa376f621c1bfe.zip frameworks_av-093a1f3a001a5fb3bac011abc2aa376f621c1bfe.tar.gz frameworks_av-093a1f3a001a5fb3bac011abc2aa376f621c1bfe.tar.bz2 | |
Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev
Diffstat (limited to 'media/libstagefright/wifi-display')
| -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; } |