Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 00:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we transcode non-H264 video.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-02-25 11:37:17 -05:00
committed by Cody Henthorne
parent 65a30cf2a7
commit 577e05eb51
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/video/src/main/java/org/thoughtcrime/securesms/video/StreamingTranscoder.java
View File

@@ -1,6 +1,8 @@
package org.thoughtcrime.securesms.video; package org.thoughtcrime.securesms.video;
import android.media.MediaDataSource; import android.media.MediaDataSource;
import android.media.MediaExtractor;
import android.media.MediaFormat;
import android.media.MediaMetadataRetriever; import android.media.MediaMetadataRetriever;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -74,9 +76,9 @@ public final class StreamingTranscoder {
this.targetQuality = TranscodingQuality.createFromPreset(preset, duration); this.targetQuality = TranscodingQuality.createFromPreset(preset, duration);
this.upperSizeLimit = upperSizeLimit; this.upperSizeLimit = upperSizeLimit;
this.transcodeRequired = inputBitRate >= targetQuality.getTargetTotalBitRate() * 1.2 || inSize > upperSizeLimit || containsLocation(mediaMetadataRetriever) || options != null; this.transcodeRequired = inputBitRate >= targetQuality.getTargetTotalBitRate() * 1.2 || inSize > upperSizeLimit || containsLocation(mediaMetadataRetriever) || options != null || !isH264(dataSource);
if (!transcodeRequired) { if (!transcodeRequired) {
Log.i(TAG, "Video is within 20% of target bitrate, below the size limit, contained no location metadata or custom options."); Log.i(TAG, "Video is within 20% of target bitrate, below the size limit, contained no location metadata or custom options, and is already H.264.");
} }
this.fileSizeEstimate = targetQuality.getByteCountEstimate(); this.fileSizeEstimate = targetQuality.getByteCountEstimate();
@@ -249,6 +251,26 @@ public final class StreamingTranscoder {
return locationString != null; return locationString != null;
} }
private static boolean isH264(@NonNull MediaDataSource dataSource) {
MediaExtractor extractor = new MediaExtractor();
try {
extractor.setDataSource(dataSource);
for (int i = 0; i < extractor.getTrackCount(); i++) {
MediaFormat format = extractor.getTrackFormat(i);
String mime = format.getString(MediaFormat.KEY_MIME);
if (mime != null && mime.startsWith("video/")) {
return MediaConverter.VIDEO_CODEC_H264.equals(mime);
}
}
return false;
} catch (IOException e) {
Log.w(TAG, "Unable to check video codec", e);
return false;
} finally {
extractor.release();
}
}
public interface Progress { public interface Progress {
void onProgress(int percent); void onProgress(int percent);
} }