diff options
| author | Chong Zhang <chz@google.com> | 2014-09-10 19:27:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 19:27:03 +0000 |
| commit | 748486657623fc0753d11bc2d91c113bca584a1e (patch) | |
| tree | c4033d0d8f749801feae8d348e771035c37dc914 | |
| parent | b606de81ce5fffc8923c53cb7d5d00f5b423c9b9 (diff) | |
| parent | f64b36deccd473b545dbed22c2feb11fc49157e5 (diff) | |
| download | frameworks_av-748486657623fc0753d11bc2d91c113bca584a1e.zip frameworks_av-748486657623fc0753d11bc2d91c113bca584a1e.tar.gz frameworks_av-748486657623fc0753d11bc2d91c113bca584a1e.tar.bz2 | |
Merge "fix failure in MediaCodecTest#testException" into lmp-dev
| -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( |