From e97a14f6174081d2865c773311f45b05296dd5f1 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 16 Apr 2021 09:29:58 -0300
Subject: [PATCH] Prevent crash when thumbnail decoder cannot stop, log
instead.
---
.../video/videoconverter/VideoThumbnailsExtractor.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java
index 92b3896da4..84a0b12478 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java
@@ -105,7 +105,11 @@ final class VideoThumbnailsExtractor {
outputSurface.release();
}
if (decoder != null) {
- decoder.stop();
+ try {
+ decoder.stop();
+ } catch (MediaCodec.CodecException codecException) {
+ Log.w(TAG, "Decoder stop failed: " + codecException.getDiagnosticInfo(), codecException);
+ }
decoder.release();
}
if (extractor != null) {
--
GitLab