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

Only write out one MDAT box for a video transcode.

Browse Source 
Co-authored-by: Milan Stevanovic <milan@signal.org>
This commit is contained in:
Greyson Parrelli
2025-01-15 15:11:09 -05:00
parent 753927bf30
commit 7c7dc679e9
8 changed files with 83 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
View File

@@ -267,8 +267,9 @@ public final class AttachmentCompressionJob extends BaseJob {
boolean faststart = false;
try {
int mdatLength;
try (OutputStream outputStream = ModernEncryptingPartOutputStream.createFor(attachmentSecret, file, true).second) {
transcoder.transcode(percent -> {
mdatLength = (int) transcoder.transcode(percent -> {
if (notification != null) {
notification.setProgress(percent / 100f);
}
@@ -299,7 +300,7 @@ public final class AttachmentCompressionJob extends BaseJob {
});
final long plaintextLength = ModernEncryptingPartOutputStream.getPlaintextLength(file.length());
try (MediaStream mediaStream = new MediaStream(postProcessor.process(plaintextLength), MimeTypes.VIDEO_MP4, 0, 0, true)) {
try (MediaStream mediaStream = new MediaStream(postProcessor.processWithMdatLength(plaintextLength, mdatLength), MimeTypes.VIDEO_MP4, 0, 0, true)) {
attachmentDatabase.updateAttachmentData(attachment, mediaStream);
faststart = true;
} catch (VideoPostProcessingException e) {

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

@@ -127,7 +127,10 @@ public final class StreamingTranscoder {
return new StreamingTranscoder(dataSource, options, codec, videoBitrate, audioBitrate, shortEdge, allowAudioRemux);
}
public void transcode(@NonNull Progress progress,
/**
* @return The total content size of the MP4 mdat box.
*/
public long transcode(@NonNull Progress progress,
@NonNull OutputStream stream,
@Nullable TranscoderCancelationSignal cancelationSignal)
throws IOException, EncodingException
@@ -193,7 +196,7 @@ public final class StreamingTranscoder {
return cancelationSignal != null && cancelationSignal.isCanceled();
});
converter.convert();
long mdatSize = converter.convert();
long outSize = outStream.getCount();
float encodeDurationSec = (System.currentTimeMillis() - startTime) / 1000f;
@@ -217,6 +220,8 @@ public final class StreamingTranscoder {
}
stream.flush();
return mdatSize;
}
public boolean isTranscodeRequired() {

2
video/lib/src/main/java/org/thoughtcrime/securesms/video/interfaces/Muxer.java
View File

@@ -17,7 +17,7 @@ public interface Muxer {
void start() throws IOException;
void stop() throws IOException;
long stop() throws IOException;
int addTrack(@NonNull MediaFormat format) throws IOException;

17
video/lib/src/main/java/org/thoughtcrime/securesms/video/postprocessing/Mp4FaststartPostProcessor.kt
View File

@@ -43,6 +43,23 @@ class Mp4FaststartPostProcessor(private val inputStreamFactory: InputStreamFacto
}
}
/**
* It is the responsibility of the caller to close the resulting [InputStream].
*/
fun processWithMdatLength(inputLength: Long, mdatLength: Int): SequenceInputStream {
val metadata = inputStreamFactory.create().use { inputStream ->
inputStream.use {
Mp4Sanitizer.sanitizeFileWithCompoundedMdatBoxes(it, inputLength, mdatLength)
}
}
if (metadata.sanitizedMetadata == null) {
throw VideoPostProcessingException("Sanitized metadata was null!")
}
val inputStream = inputStreamFactory.create()
inputStream.skip(metadata.dataOffset)
return SequenceInputStream(ByteArrayInputStream(metadata.sanitizedMetadata), LimitedInputStream(inputStream, metadata.dataLength))
}
fun interface InputStreamFactory {
fun create(): InputStream
}

3
video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java
View File

@@ -33,8 +33,9 @@ final class AndroidMuxer implements Muxer {
}
@Override
public void stop() {
public long stop() {
muxer.stop();
return 0;
}
@Override

17
video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java
View File

@@ -138,15 +138,21 @@ public final class MediaConverter {
mAllowAudioRemux = allow;
}
/**
* @return The total content size of the MP4 mdat box.
*/
@WorkerThread
@RequiresApi(23)
public void convert() throws EncodingException, IOException {
public long convert() throws EncodingException, IOException {
// Exception that may be thrown during release.
Exception exception = null;
Muxer muxer = null;
VideoTrackConverter videoTrackConverter = null;
AudioTrackConverter audioTrackConverter = null;
long mdatContentLength = 0;
boolean muxerStopped = false;
try {
muxer = mOutput.createMuxer();
@@ -162,6 +168,9 @@ public final class MediaConverter {
audioTrackConverter,
muxer);
mdatContentLength = muxer.stop();
muxerStopped = true;
} catch (EncodingException | IOException e) {
Log.e(TAG, "error converting", e);
exception = e;
@@ -196,7 +205,9 @@ public final class MediaConverter {
}
try {
if (muxer != null) {
muxer.stop();
if (!muxerStopped) {
muxer.stop();
}
muxer.release();
}
} catch (Exception e) {
@@ -209,6 +220,8 @@ public final class MediaConverter {
if (exception != null) {
throw new EncodingException("Transcode failed", exception);
}
return mdatContentLength;
}
/**

42
video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java
View File

@@ -52,6 +52,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@@ -80,6 +81,7 @@ final class Mp4Writer extends DefaultBoxes implements SampleSink {
private final List<StreamingTrack> source;
private final Date creationTime = new Date();
private boolean hasWrittenMdat = false;
/**
* Contains the start time of the next segment in line that will be created.
@@ -106,6 +108,8 @@ final class Mp4Writer extends DefaultBoxes implements SampleSink {
private final Map<StreamingTrack, Long> sampleNumbers = new HashMap<>();
private long bytesWritten = 0;
private long mMDatTotalContentLength = 0;
Mp4Writer(final @NonNull List<StreamingTrack> source, final @NonNull WritableByteChannel sink) throws IOException {
this.source = new ArrayList<>(source);
this.sink = sink;
@@ -152,6 +156,11 @@ final class Mp4Writer extends DefaultBoxes implements SampleSink {
streamingTrack.close();
}
write(sink, createMoov());
hasWrittenMdat = false;
}
public long getTotalMdatContentLength() {
return mMDatTotalContentLength;
}
private Box createMoov() {
@@ -252,8 +261,16 @@ final class Mp4Writer extends DefaultBoxes implements SampleSink {
private void writeChunkContainer(ChunkContainer chunkContainer) throws IOException {
final TrackBox tb = trackBoxes.get(chunkContainer.streamingTrack);
final ChunkOffsetBox stco = Objects.requireNonNull(Path.getPath(tb, "mdia[0]/minf[0]/stbl[0]/stco[0]"));
stco.setChunkOffsets(Mp4Arrays.copyOfAndAppend(stco.getChunkOffsets(), bytesWritten + 8));
final int extraChunkOffset = hasWrittenMdat ? 0 : 8;
stco.setChunkOffsets(Mp4Arrays.copyOfAndAppend(stco.getChunkOffsets(), bytesWritten + extraChunkOffset));
chunkContainer.mdat.includeHeader = !hasWrittenMdat;
write(sink, chunkContainer.mdat);
mMDatTotalContentLength += chunkContainer.mdat.getSize();
if (!hasWrittenMdat) {
hasWrittenMdat = true;
}
}
public void acceptSample(
@@ -401,9 +418,12 @@ final class Mp4Writer extends DefaultBoxes implements SampleSink {
final ArrayList<StreamingSample> samples;
long size;
boolean includeHeader;
Mdat(final @NonNull List<StreamingSample> samples) {
this.samples = new ArrayList<>(samples);
size = 8;
for (StreamingSample sample : samples) {
size += sample.getContent().limit();
}
@@ -416,19 +436,23 @@ final class Mp4Writer extends DefaultBoxes implements SampleSink {
@Override
public long getSize() {
return size;
if (includeHeader) {
return size;
} else {
return size - 8;
}
}
@Override
public void getBox(WritableByteChannel writableByteChannel) throws IOException {
writableByteChannel.write(ByteBuffer.wrap(new byte[]{
(byte) ((size & 0xff000000) >> 24),
(byte) ((size & 0xff0000) >> 16),
(byte) ((size & 0xff00) >> 8),
(byte) ((size & 0xff)),
109, 100, 97, 116, // mdat
if (includeHeader) {
// When we include the header, we specify the declared size as 1, indicating the size is from here until the end of the file
writableByteChannel.write(ByteBuffer.wrap(new byte[] {
0, 0, 0, 0, // size (4 bytes)
109, 100, 97, 116, // 'm' 'd' 'a' 't'
}));
}
}));
for (StreamingSample sample : samples) {
writableByteChannel.write((ByteBuffer) sample.getContent().rewind());
}

6
video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java
View File

@@ -39,7 +39,7 @@ public final class StreamingMuxer implements Muxer {
}
@Override
public void stop() throws IOException {
public long stop() throws IOException {
if (mp4Writer == null) {
throw new IllegalStateException("calling stop prior to start");
}
@@ -47,7 +47,11 @@ public final class StreamingMuxer implements Muxer {
track.finish();
}
mp4Writer.close();
long mdatLength = mp4Writer.getTotalMdatContentLength();
mp4Writer = null;
return mdatLength;
}
@Override