stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

matroska muxer: update total duration using only audio/video tracks

Browse source
This commit is contained in:
Jaroslav Kysela 2015-02-02 21:26:07 +01:00
parent 78b5fb6dce
commit 7a2560e642
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/muxer/tvh/mkmux.c
View file

@ -51,6 +51,7 @@ typedef struct mk_track {
int avc;
int type;
int tracknum;
int tracktype;
int disabled;
int64_t nextpts;
@ -334,6 +335,7 @@ mk_build_tracks(mk_mux_t *mkm, const streaming_start_t *ss)
}
tr->tracknum = ++tracknum;
tr->tracktype = tracktype;
mkm->has_video |= (tracktype == 1);
t = htsbuf_queue_alloc(0);
@ -976,7 +978,7 @@ mk_write_frame_i(mk_mux_t *mkm, mk_track_t *t, th_pkt_t *pkt)
nxt = ts_rescale(t->nextpts, 1000000000 / MATROSKA_TIMESCALE);
pts = ts_rescale(pts, 1000000000 / MATROSKA_TIMESCALE);
if(mkm->totduration < nxt)
if((t->tracktype == 1 || t->tracktype == 2) && mkm->totduration < nxt)
mkm->totduration = nxt;
delta = pts - mkm->cluster_tc;