diff options
| author | Andreas Huber <andih@google.com> | 2013-05-02 14:19:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-02 14:19:50 -0700 |
| commit | 93f343af103aaad6e2c213047c4545e94b043197 (patch) | |
| tree | 536c986f511fd52d15348b02458a815e184b42cf /media | |
| parent | b8bbf36447b2831726c417b45f6d606f901d4262 (diff) | |
| parent | 093a1f3a001a5fb3bac011abc2aa376f621c1bfe (diff) | |
| download | frameworks_av-93f343af103aaad6e2c213047c4545e94b043197.zip frameworks_av-93f343af103aaad6e2c213047c4545e94b043197.tar.gz frameworks_av-93f343af103aaad6e2c213047c4545e94b043197.tar.bz2 | |
am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev
* commit 'de6bf9cc0fd94452ffcd6685e1469092db74a454':
Fix miracast source code to ignore the encoder output format change
Diffstat (limited to 'media')
| -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; } |