diff options
| author | Chong Zhang <chz@google.com> | 2014-09-10 10:43:41 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-09-10 15:28:10 -0700 |
| commit | c02ca4ca1e7597891bcf92f9294c83d928118cf9 (patch) | |
| tree | 8eac95b4b3e9a92eb20b736d0adfb5541a9ef084 | |
| parent | b6f9a21e7036e5619216faae902f005374bd8cad (diff) | |
| download | frameworks_av-c02ca4ca1e7597891bcf92f9294c83d928118cf9.zip frameworks_av-c02ca4ca1e7597891bcf92f9294c83d928118cf9.tar.gz frameworks_av-c02ca4ca1e7597891bcf92f9294c83d928118cf9.tar.bz2 | |
fix failure in MediaCodecTest#testException
reset codec after failed configure()
Bug: 17418876
Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
| -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( |