LAV
/
FFmpeg
1
0
Fork 0
Code

MatroskaParser: improve duration retrieval with excessive subtitle cues at the end of the file

This commit is contained in:
Hendrik Leppkes 2021-03-03 17:41:49 +01:00
parent 3afd92c5e3
commit f89374cc4e
Signed by: hendrik
GPG Key ID: 846079A4B0A7C1B5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/MatroskaParser.c
View File

@ -2881,7 +2881,7 @@ static void fixupChapter(ulonglong adj, struct Chapter *ch) {
static longlong findLastTimecode(MatroskaFile *mf) {
ulonglong nd = 0;
unsigned n,vtrack,retry=0;
unsigned n,vtrack,vtrackid,retry=0,cueoffset=0;
if (mf->nTracks == 0)
return -1;
@ -2889,6 +2889,7 @@ static longlong findLastTimecode(MatroskaFile *mf) {
for (n=vtrack=0;n<mf->nTracks;++n)
if (mf->Tracks[n]->Type == TT_VIDEO) {
vtrack = n;
vtrackid = mf->Tracks[n]->Number;
goto ok;
}
@ -2907,11 +2908,17 @@ ok:
if (retry > 0 && (mf->pCluster + (MAXDURATIONREAD << retry) > mf->pSegmentTop) && (mf->pCluster + (MAXDURATIONREAD << (retry - 1)) > mf->pSegmentTop))
break;
} else {
if (retry >= mf->nCues)
if ((retry + cueoffset) >= mf->nCues)
break;
mf->readPosition = mf->Cues[mf->nCues - (1 + retry)].Position + mf->pSegment;
mf->tcCluster = mf->Cues[mf->nCues - (1 + retry)].Time / mf->Seg.TimecodeScale;
struct Cue *pCue = &mf->Cues[mf->nCues - (1 + retry + cueoffset)];
while ((retry + cueoffset) < (mf->nCues - 1) && pCue->Track != vtrackid) {
cueoffset++;
pCue = &mf->Cues[mf->nCues - (1 + retry + cueoffset)];
}
mf->readPosition = pCue->Position + mf->pSegment;
mf->tcCluster = pCue->Time / mf->Seg.TimecodeScale;
}
do