| commit | d8824bba5f62e11e3a60a20db5c8ac4c04a490ac | [log] [tgz] |
|---|---|---|
| author | Jay Patel <pateljay@google.com> | Tue Feb 23 22:11:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 22:11:09 2021 +0000 |
| tree | 7489bebd86bc39c75d9795b64711b24ac8281883 | |
| parent | d5a3fb2900ddbbe150eae43916f93a5a2688fec8 [diff] | |
| parent | 4e0e82267341fc312b5888999374e081fedd3182 [diff] |
Merge "Reset mFatalError after media resource reclaim in ACodec" am: a5ac95f3c0 am: 4e0e822673 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1522078 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib284cd09edc9c4c013971b7d3985edd6ab50f4e8
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 8f1da0d..71a4ad8 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp
@@ -6860,6 +6860,7 @@ ALOGV("onAllocateComponent"); CHECK(mCodec->mOMXNode == NULL); + mCodec->mFatalError = false; sp<AMessage> notify = new AMessage(kWhatOMXMessageList, mCodec); notify->setInt32("generation", mCodec->mNodeGeneration + 1);