mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
af360bc9ea
wgetc873988898.patch -O telecomm-01.patch wget0fb5786dbf.patch -O mediaprovider-01.patch wget1a4b9ef510.patch -O wifi-01.patch wget364a1d9962.patch -O bluetooth-01.patch wget87a06448b9.patch -O settings-01.patch wgetaaba724a68.patch -O settings-02.patch wget507304e1f5.patch -O native-01.patch wget89489ff5dd.patch -O base-01.patch wgetd1765c4715.patch -O base-02.patch wgetcbb1a0ecd6.patch -O base-03.patch wget4725772c0b.patch -O base-04.patch wget19747f6923.patch -O base-05.patch wgete7a1aa9ed0.patch -O base-06.patch wget922a7860b1.patch -O base-07.patch wgeted183ed912.patch -O base-08.patch wgetc6fbe1330a.patch -O base-09.patch wget9141cac175.patch -O base-10.patch wget41235bcc67.patch -O av-01.patch wgeta89f704701.patch -O av-02.patch wget6d7cd80d77.patch -O av-03.patch wget75fc175a08.patch -O av-04.patch wgetb023ec300f.patch -O av-05.patch wgetc8117d1539.patch -O av-06.patch wgetf06d23d824.patch -O av-07.patch wget9c7408ab07.patch -O av-08.patch wgetcfbfcefb3c.patch -O launcher-01.patch wget4a27a7f162.patch -O libxml-01.patch Signed-off-by: Tad <tad@spotco.us>
76 lines
2.8 KiB
Diff
76 lines
2.8 KiB
Diff
From 9c7408ab0710a9e36fd2a258098afde863cb6544 Mon Sep 17 00:00:00 2001
|
|
From: Harish Mahendrakar <harish.mahendrakar@ittiam.com>
|
|
Date: Wed, 19 Oct 2022 18:17:07 -0700
|
|
Subject: [PATCH] Codec2 decoders: Invalidate allocated graphic buffer in
|
|
stop()
|
|
|
|
Bug: 243583691
|
|
Test: atest CtsMediaV2TestCases -- --module-arg \
|
|
CtsMediaV2TestCases:instrumentation-arg:codec-prefix:=c2.android.
|
|
|
|
Change-Id: I312c106350b2eb072f0e6f2f9a83f16eb8424cb2
|
|
---
|
|
media/codec2/components/avc/C2SoftAvcDec.cpp | 3 +++
|
|
media/codec2/components/hevc/C2SoftHevcDec.cpp | 3 +++
|
|
media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp | 3 +++
|
|
media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp | 4 +++-
|
|
4 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/media/codec2/components/avc/C2SoftAvcDec.cpp b/media/codec2/components/avc/C2SoftAvcDec.cpp
|
|
index 953afc57cd..96a4c4a756 100644
|
|
--- a/media/codec2/components/avc/C2SoftAvcDec.cpp
|
|
+++ b/media/codec2/components/avc/C2SoftAvcDec.cpp
|
|
@@ -671,6 +671,9 @@ status_t C2SoftAvcDec::resetDecoder() {
|
|
void C2SoftAvcDec::resetPlugin() {
|
|
mSignalledOutputEos = false;
|
|
mTimeStart = mTimeEnd = systemTime();
|
|
+ if (mOutBlock) {
|
|
+ mOutBlock.reset();
|
|
+ }
|
|
}
|
|
|
|
status_t C2SoftAvcDec::deleteDecoder() {
|
|
diff --git a/media/codec2/components/hevc/C2SoftHevcDec.cpp b/media/codec2/components/hevc/C2SoftHevcDec.cpp
|
|
index 5a660c5ca1..7d3b9d9399 100644
|
|
--- a/media/codec2/components/hevc/C2SoftHevcDec.cpp
|
|
+++ b/media/codec2/components/hevc/C2SoftHevcDec.cpp
|
|
@@ -664,6 +664,9 @@ status_t C2SoftHevcDec::resetDecoder() {
|
|
void C2SoftHevcDec::resetPlugin() {
|
|
mSignalledOutputEos = false;
|
|
mTimeStart = mTimeEnd = systemTime();
|
|
+ if (mOutBlock) {
|
|
+ mOutBlock.reset();
|
|
+ }
|
|
}
|
|
|
|
status_t C2SoftHevcDec::deleteDecoder() {
|
|
diff --git a/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp b/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp
|
|
index 9a4191025f..439323c76e 100644
|
|
--- a/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp
|
|
+++ b/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp
|
|
@@ -732,6 +732,9 @@ status_t C2SoftMpeg2Dec::resetDecoder() {
|
|
void C2SoftMpeg2Dec::resetPlugin() {
|
|
mSignalledOutputEos = false;
|
|
mTimeStart = mTimeEnd = systemTime();
|
|
+ if (mOutBlock) {
|
|
+ mOutBlock.reset();
|
|
+ }
|
|
}
|
|
|
|
status_t C2SoftMpeg2Dec::deleteDecoder() {
|
|
diff --git a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp
|
|
index 54a1d0e354..3bf9c48dc3 100644
|
|
--- a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp
|
|
+++ b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp
|
|
@@ -256,7 +256,9 @@ c2_status_t C2SoftMpeg4Dec::onStop() {
|
|
mFramesConfigured = false;
|
|
mSignalledOutputEos = false;
|
|
mSignalledError = false;
|
|
-
|
|
+ if (mOutBlock) {
|
|
+ mOutBlock.reset();
|
|
+ }
|
|
return C2_OK;
|
|
}
|
|
|