From e38ef93fad381e76e8189fb00bb53dd18ba801f7 Mon Sep 17 00:00:00 2001 From: folfdev Date: Sun, 25 Apr 2021 12:27:08 +0600 Subject: [PATCH] Add WAV support (#475) --- .../google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java | 3 +++ .../google/android/exoplayer2/mediacodec/MediaCodecInfo.java | 2 ++ .../java/com/google/android/exoplayer2/util/MimeTypes.java | 2 ++ .../src/main/java/org/telegram/messenger/MessageObject.java | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java index a933bfdda..02f0bf16d 100644 --- a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java +++ b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java @@ -90,6 +90,9 @@ public final class FfmpegLibrary { return "flac"; case MimeTypes.AUDIO_ALAC: return "alac"; + case MimeTypes.AUDIO_WAV: + case MimeTypes.AUDIO_X_WAV: + return "wav"; case MimeTypes.AUDIO_MLAW: return "pcm_mulaw"; case MimeTypes.AUDIO_ALAW: diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java index 60c29f618..ce347f3e0 100644 --- a/TMessagesProj/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java +++ b/TMessagesProj/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java @@ -519,6 +519,8 @@ public final class MediaCodecInfo { || MimeTypes.AUDIO_FLAC.equals(mimeType) || MimeTypes.AUDIO_ALAW.equals(mimeType) || MimeTypes.AUDIO_MLAW.equals(mimeType) + || MimeTypes.AUDIO_WAV.equals(mimeType) + || MimeTypes.AUDIO_X_WAV.equals(mimeType) || MimeTypes.AUDIO_MSGSM.equals(mimeType)) { // Platform code should have set a default. return maxChannelCount; diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java index 5465da748..b1480806f 100644 --- a/TMessagesProj/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java +++ b/TMessagesProj/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java @@ -70,6 +70,8 @@ public final class MimeTypes { public static final String AUDIO_FLAC = BASE_TYPE_AUDIO + "/flac"; public static final String AUDIO_ALAC = BASE_TYPE_AUDIO + "/alac"; public static final String AUDIO_MSGSM = BASE_TYPE_AUDIO + "/gsm"; + public static final String AUDIO_WAV = BASE_TYPE_AUDIO + "/wav"; + public static final String AUDIO_X_WAV = BASE_TYPE_AUDIO + "/x-wav"; public static final String AUDIO_UNKNOWN = BASE_TYPE_AUDIO + "/x-unknown"; public static final String TEXT_VTT = BASE_TYPE_TEXT + "/vtt"; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java index 281b31e67..5386c4756 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java @@ -4859,7 +4859,7 @@ public class MessageObject { } if (!TextUtils.isEmpty(document.mime_type)) { String mime = document.mime_type.toLowerCase(); - if (mime.equals("audio/flac") || mime.equals("audio/ogg") || mime.equals("audio/opus") || mime.equals("audio/x-opus+ogg")) { + if (mime.equals("audio/flac") || mime.equals("audio/ogg") || mime.equals("audio/opus") || mime.equals("audio/x-opus+ogg") || mime.equals("audio/wav") || mime.equals("audio/x-wav")) { return true; } else if (mime.equals("application/octet-stream") && FileLoader.getDocumentFileName(document).endsWith(".opus")) { return true;