Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-15 21:27:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add audio removal to Signal Labs.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-08-10 16:32:57 -04:00
parent 70d48745c0
commit ee59bb4080
41 changed files with 357 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/video/src/main/java/org/thoughtcrime/securesms/video/StreamingTranscoder.java
+12 -5
View File
@@ -43,6 +43,7 @@ public final class StreamingTranscoder {
private final long fileSizeEstimate;
private final @Nullable TranscoderOptions options;
private final boolean allowAudioRemux;
private final boolean muteAudio;
/**
* @param upperSizeLimit A upper size to transcode to. The actual output size can be up to 10% smaller.
@@ -51,12 +52,14 @@ public final class StreamingTranscoder {
@Nullable TranscoderOptions options,
@NonNull List<TranscodingConfig.QualityTier> configs,
long upperSizeLimit,
boolean allowAudioRemux)
boolean allowAudioRemux,
boolean muteAudio)
throws IOException, VideoSourceException
{
this.dataSource = dataSource;
this.options = options;
this.allowAudioRemux = allowAudioRemux;
this.muteAudio = muteAudio;
final MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
try {
@@ -77,7 +80,7 @@ public final class StreamingTranscoder {
this.targetQuality = TranscodingQuality.createFromQualityTiers(configs, duration);
this.upperSizeLimit = upperSizeLimit;
this.transcodeRequired = inputBitRate >= targetQuality.getTargetTotalBitRate() * 1.2 || inSize > upperSizeLimit || containsLocation(mediaMetadataRetriever) || options != null || !isH264(dataSource);
this.transcodeRequired = inputBitRate >= targetQuality.getTargetTotalBitRate() * 1.2 || inSize > upperSizeLimit || containsLocation(mediaMetadataRetriever) || options != null || muteAudio || !isH264(dataSource);
if (!transcodeRequired) {
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.");
}
@@ -91,12 +94,14 @@ public final class StreamingTranscoder {
int videoBitrate,
int audioBitrate,
int shortEdge,
boolean allowAudioRemux)
boolean allowAudioRemux,
boolean muteAudio)
throws IOException, VideoSourceException
{
this.dataSource = dataSource;
this.options = options;
this.allowAudioRemux = allowAudioRemux;
this.muteAudio = muteAudio;
final MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
try {
@@ -124,10 +129,11 @@ public final class StreamingTranscoder {
int videoBitrate,
int audioBitrate,
int shortEdge,
boolean allowAudioRemux)
boolean allowAudioRemux,
boolean muteAudio)
throws VideoSourceException, IOException
{
return new StreamingTranscoder(dataSource, options, codec, videoBitrate, audioBitrate, shortEdge, allowAudioRemux);
return new StreamingTranscoder(dataSource, options, codec, videoBitrate, audioBitrate, shortEdge, allowAudioRemux, muteAudio);
}
/**
@@ -184,6 +190,7 @@ public final class StreamingTranscoder {
converter.setVideoBitrate(targetQuality.getTargetVideoBitRate());
converter.setAudioBitrate(targetQuality.getTargetAudioBitRate());
converter.setAllowAudioRemux(allowAudioRemux);
converter.setSkipAudio(muteAudio);
if (options != null) {
if (options.endTimeUs > 0) {
lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java
+9 -1
View File
@@ -71,6 +71,7 @@ public final class MediaConverter {
private @VideoCodec String mVideoCodec = VIDEO_CODEC_H264;
private int mAudioBitrate = 128000; // 128Kbps
private boolean mAllowAudioRemux = false;
private boolean mSkipAudio = false;
private Listener mListener;
private boolean mCancelled;
@@ -143,6 +144,13 @@ public final class MediaConverter {
mAllowAudioRemux = allow;
}
/**
* When set, the audio track of the input is dropped entirely and the output will be video-only.
*/
public void setSkipAudio(boolean skipAudio) {
mSkipAudio = skipAudio;
}
/**
* @return The total content size of the MP4 mdat box.
*/
@@ -212,7 +220,7 @@ public final class MediaConverter {
muxer = mOutput.createMuxer();
videoTrackConverter = VideoTrackConverter.create(mInput, mTimeFrom, mTimeTo, mVideoResolution, mVideoBitrate, mVideoCodec, excludedDecoders);
audioTrackConverter = AudioTrackConverter.create(mInput, mTimeFrom, mTimeTo, mAudioBitrate, mAllowAudioRemux && muxer.supportsAudioRemux());
audioTrackConverter = mSkipAudio ? null : AudioTrackConverter.create(mInput, mTimeFrom, mTimeTo, mAudioBitrate, mAllowAudioRemux && muxer.supportsAudioRemux());
if (videoTrackConverter == null && audioTrackConverter == null) {
throw new EncodingException("No video and audio tracks");