commit 5945c909d49df71270a119eae586d6428ea2dede
author Dorin Drimus <dorindrimus@google.com> Thu Mar 16 13:58:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 16 13:58:45 2023 +0000
tree 08998af2af7440f4f07541f3990862dbb5b49e01
parent e99fcd2e61d2c5210f007f88f4e2cb8bda0ed561
parent d88e606f65ae176012ab94911577236646bf2bf4

Merge "Fix codec2 setParameters before successful configure" am: 30b9abfae4 am: d88e606f65

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2471264

Change-Id: I5bb7033c6f2ee291ab13ffe10509d6250b804635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 695ea33..9b8cc5e 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -5702,6 +5702,9 @@
 }
 
 status_t MediaCodec::onSetParameters(const sp<AMessage> &params) {
+    if (mState == UNINITIALIZED || mState == INITIALIZING) {
+        return NO_INIT;
+    }
     updateLowLatency(params);
     mapFormat(mComponentName, params, nullptr, false);
     updateTunnelPeek(params);