diff options
| author | Chong Zhang <chz@google.com> | 2014-09-10 10:43:41 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2014-09-10 11:27:09 -0700 |
| commit | f64b36deccd473b545dbed22c2feb11fc49157e5 (patch) | |
| tree | 9aa396f0c688ae811636cd988c3f3f35e58ab376 /media | |
| parent | d3a5ff9afff08b3be1b2853868c0f28eefc36f19 (diff) | |
| download | frameworks_av-f64b36deccd473b545dbed22c2feb11fc49157e5.zip frameworks_av-f64b36deccd473b545dbed22c2feb11fc49157e5.tar.gz frameworks_av-f64b36deccd473b545dbed22c2feb11fc49157e5.tar.bz2 | |
fix failure in MediaCodecTest#testException
reset codec after failed configure()
Bug: 17418876
Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
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( |