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

mkmux; Fix the cluster start (keyframe)

Browse source
This commit is contained in:
Jaroslav Kysela 2014-11-25 10:56:02 +01:00
parent 4d6c1bba0e
commit 448b0a4acd
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -962,10 +962,14 @@ mk_write_frame_i(mk_mux_t *mkm, mk_track_t *t, th_pkt_t *pkt)
return;
}
if(vkeyframe && mkm->cluster && mkm->cluster->hq_size > mkm->cluster_maxsize)
if(vkeyframe && mkm->cluster &&
(mkm->cluster->hq_size > mkm->cluster_maxsize ||
mkm->cluster_last_close + 1 < dispatch_clock))
mk_close_cluster(mkm);
else if(!mkm->has_video && mkm->cluster && mkm->cluster->hq_size > clusersizemax/40)
else if(!mkm->has_video && mkm->cluster &&
(mkm->cluster->hq_size > clusersizemax/40 ||
mkm->cluster_last_close + 1 < dispatch_clock))
mk_close_cluster(mkm);
else if(mkm->cluster && mkm->cluster->hq_size > clusersizemax)
@ -1005,9 +1009,6 @@ mk_write_frame_i(mk_mux_t *mkm, mk_track_t *t, th_pkt_t *pkt)
c_delta_flags[2] = (keyframe << 7) | skippable;
htsbuf_append(mkm->cluster, c_delta_flags, 3);
htsbuf_append(mkm->cluster, data, len);
if (mkm->cluster_last_close + 1 < dispatch_clock)
mk_close_cluster(mkm);
}