diff options
| author | Chong Zhang <chz@google.com> | 2014-09-10 19:47:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 19:47:57 +0000 |
| commit | f2745669be588f8bc8fdb3dea60a12d91f6eb9c9 (patch) | |
| tree | 0e33d5c52307c09953621a28edd906a76edb2722 /media | |
| parent | 55e9e26779b2e08b460da1af2a420767655bde12 (diff) | |
| parent | 748486657623fc0753d11bc2d91c113bca584a1e (diff) | |
| download | frameworks_av-f2745669be588f8bc8fdb3dea60a12d91f6eb9c9.zip frameworks_av-f2745669be588f8bc8fdb3dea60a12d91f6eb9c9.tar.gz frameworks_av-f2745669be588f8bc8fdb3dea60a12d91f6eb9c9.tar.bz2 | |
am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-dev
* commit '748486657623fc0753d11bc2d91c113bca584a1e':
fix failure in MediaCodecTest#testException
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index fc2dd30..0bfc6e4 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -270,7 +270,20 @@ status_t MediaCodec::configure( } sp<AMessage> response; - return PostAndAwaitResponse(msg, &response); + status_t err = PostAndAwaitResponse(msg, &response); + + if (err != OK && err != INVALID_OPERATION) { + // MediaCodec now set state to UNINITIALIZED upon any fatal error. + // To maintain backward-compatibility, do a reset() to put codec + // back into INITIALIZED state. + // But don't reset if the err is INVALID_OPERATION, which means + // the configure failure is due to wrong state. + + ALOGE("configure failed with err 0x%08x, resetting...", err); + reset(); + } + + return err; } status_t MediaCodec::createInputSurface( |