narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

catch early exception in video transcoder

Browse source
This commit is contained in:
Daniel Gultsch 2024-03-27 14:43:34 +01:00
parent 6b37b6377b
commit fbfb6c803f
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
View file

@ -99,17 +99,25 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
final boolean highQuality = "720".equals(getVideoCompression()); final boolean highQuality = "720".equals(getVideoCompression());
final Future<Void> future = Transcoder.into(file.getAbsolutePath()). final Future<Void> future;
try {
future = Transcoder.into(file.getAbsolutePath()).
addDataSource(mXmppConnectionService, uri) addDataSource(mXmppConnectionService, uri)
.setVideoTrackStrategy(highQuality ? TranscoderStrategies.VIDEO_720P : TranscoderStrategies.VIDEO_360P) .setVideoTrackStrategy(highQuality ? TranscoderStrategies.VIDEO_720P : TranscoderStrategies.VIDEO_360P)
.setAudioTrackStrategy(highQuality ? TranscoderStrategies.AUDIO_HQ : TranscoderStrategies.AUDIO_MQ) .setAudioTrackStrategy(highQuality ? TranscoderStrategies.AUDIO_HQ : TranscoderStrategies.AUDIO_MQ)
.setListener(this) .setListener(this)
.transcode(); .transcode();
} catch (final RuntimeException e) {
// transcode can already throw if there is an invalid file format or a platform bug
mXmppConnectionService.stopForcingForegroundNotification();
processAsFile();
return;
}
try { try {
future.get(); future.get();
} catch (InterruptedException e) { } catch (final InterruptedException e) {
throw new AssertionError(e); throw new AssertionError(e);
} catch (ExecutionException e) { } catch (final ExecutionException e) {
if (e.getCause() instanceof Error) { if (e.getCause() instanceof Error) {
mXmppConnectionService.stopForcingForegroundNotification(); mXmppConnectionService.stopForcingForegroundNotification();
processAsFile(); processAsFile();