nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add Track interleaving

Browse Source
This commit is contained in:
davotoula
2026-03-17 19:51:58 +01:00
parent a2f29d5e2e
commit e7d11fdc84
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
+12 -17
View File
@@ -154,8 +154,8 @@ class MetadataStripper {
val trackIndexMap = mutableMapOf<Int, Int>() val trackIndexMap = mutableMapOf<Int, Int>()
for (i in 0 until extractor.trackCount) { for (i in 0 until extractor.trackCount) {
val format = extractor.getTrackFormat(i) val format = extractor.getTrackFormat(i)
val newTrackIndex = muxer.addTrack(format) trackIndexMap[i] = muxer.addTrack(format)
trackIndexMap[i] = newTrackIndex extractor.selectTrack(i)
} }
muxer.start() muxer.start()
@@ -165,24 +165,19 @@ class MetadataStripper {
val buffer = java.nio.ByteBuffer.allocate(bufferSize) val buffer = java.nio.ByteBuffer.allocate(bufferSize)
val bufferInfo = MediaCodec.BufferInfo() val bufferInfo = MediaCodec.BufferInfo()
for (i in 0 until extractor.trackCount) { while (true) {
extractor.selectTrack(i) val sampleSize = extractor.readSampleData(buffer, 0)
val outputTrack = trackIndexMap[i] ?: continue if (sampleSize < 0) break
while (true) { val outputTrack = trackIndexMap[extractor.sampleTrackIndex] ?: break
val sampleSize = extractor.readSampleData(buffer, 0)
if (sampleSize < 0) break
bufferInfo.offset = 0 bufferInfo.offset = 0
bufferInfo.size = sampleSize bufferInfo.size = sampleSize
bufferInfo.presentationTimeUs = extractor.sampleTime bufferInfo.presentationTimeUs = extractor.sampleTime
bufferInfo.flags = extractorToCodecFlags(extractor.sampleFlags) bufferInfo.flags = extractorToCodecFlags(extractor.sampleFlags)
muxer.writeSampleData(outputTrack, buffer, bufferInfo) muxer.writeSampleData(outputTrack, buffer, bufferInfo)
extractor.advance() extractor.advance()
}
extractor.unselectTrack(i)
} }
muxer.stop() muxer.stop()