yetangitu/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

Merge 01eea2cc50 into fd3f030d0b

Browse source
This commit is contained in:
cp90 2025-09-10 18:45:46 +06:00 • committed by GitHub
commit 2451200e1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
View file

@ -185,9 +185,13 @@ public class Mp4FromDashWriter {
Mp4DashChunk chunk; Mp4DashChunk chunk;
while ((chunk = readers[i].getNextChunk(true)) != null) { while ((chunk = readers[i].getNextChunk(true)) != null) {
if (defaultMediaTime[i] < 1 && chunk.moof.traf.tfhd.defaultSampleDuration > 0) { if (defaultMediaTime[i] < 1) {
if (chunk.moof.traf.tfdt > 0) {
defaultMediaTime[i] = (int) chunk.moof.traf.tfdt;
} else if (chunk.moof.traf.tfhd.defaultSampleDuration > 0) {
defaultMediaTime[i] = chunk.moof.traf.tfhd.defaultSampleDuration; defaultMediaTime[i] = chunk.moof.traf.tfhd.defaultSampleDuration;
} }
}
read += chunk.moof.traf.trun.chunkSize; read += chunk.moof.traf.trun.chunkSize;
sampleExtra[i] += chunk.moof.traf.trun.chunkDuration; // calculate track duration sampleExtra[i] += chunk.moof.traf.trun.chunkDuration; // calculate track duration
@ -763,8 +767,8 @@ public class Mp4FromDashWriter {
final int mediaTime; final int mediaTime;
if (tracks[index].trak.edstElst == null) { if (tracks[index].trak.edstElst == null) {
// is a audio track ¿is edst/elst optional for audio tracks? // there is no edit list, use the first decode timestamp as start time
mediaTime = 0x00; // ffmpeg set this value as zero, instead of defaultMediaTime mediaTime = defaultMediaTime;
bMediaRate = 0x00010000; bMediaRate = 0x00010000;
} else { } else {
mediaTime = (int) tracks[index].trak.edstElst.mediaTime; mediaTime = (int) tracks[index].trak.edstElst.mediaTime;