From 4250fa707bc93db59e5671089755ebbe2cde01b6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 22 Apr 2020 14:09:12 -0400 Subject: [PATCH] Fix crash when videos are missing a duration. Fixes #9556 --- .../videoconverter/VideoThumbnailsExtractor.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 a739ced8b6..6641dd501d 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 @@ -84,7 +84,14 @@ final class VideoThumbnailsExtractor { decoder.configure(mediaFormat, outputSurface.getSurface(), null, 0); decoder.start(); - long duration = mediaFormat.getLong(MediaFormat.KEY_DURATION); + long duration = 0; + + if (mediaFormat.containsKey(MediaFormat.KEY_DURATION)) { + duration = mediaFormat.getLong(MediaFormat.KEY_DURATION); + } else { + Log.w(TAG, "Video is missing duration!"); + } + callback.durationKnown(duration); doExtract(extractor, decoder, outputSurface, outputWidthRotated, outputHeightRotated, duration, thumbnailCount, callback); @@ -179,4 +186,4 @@ final class VideoThumbnailsExtractor { } Log.i(TAG, "doExtract finished"); } -} +} \ No newline at end of file