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

tsfix: use time offset also for audio streams, sct_type optimization

Browse source
This commit is contained in:
Jaroslav Kysela 2014-12-25 17:42:01 +01:00
parent 03b88cefc0
commit 0324cf8c8b
1 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/plumbing/tsfix.c
View file

@ -36,6 +36,9 @@ typedef struct tfstream {
int tfs_index;
streaming_component_type_t tfs_type;
uint8_t tfs_video;
uint8_t tfs_audio;
uint8_t tfs_subtitle;
int tfs_bad_dts;
int64_t tfs_local_ref;
@ -116,12 +119,19 @@ tfs_find(tsfix_t *tf, th_pkt_t *pkt)
/**
*
*/
static void
static tfstream_t *
tsfix_add_stream(tsfix_t *tf, int index, streaming_component_type_t type)
{
tfstream_t *tfs = calloc(1, sizeof(tfstream_t));
tfs->tfs_type = type;
if (SCT_ISVIDEO(type))
tfs->tfs_video = 1;
else if (SCT_ISAUDIO(type))
tfs->tfs_audio = 1;
else if (SCT_ISSUBTITLE(type))
tfs->tfs_subtitle = 1;
tfs->tfs_index = index;
tfs->tfs_local_ref = PTS_UNSET;
tfs->tfs_last_dts_norm = PTS_UNSET;
@ -129,6 +139,7 @@ tsfix_add_stream(tsfix_t *tf, int index, streaming_component_type_t type)
tfs->tfs_dts_epoch = 0;
LIST_INSERT_HEAD(&tf->tf_streams, tfs, tfs_link);
return tfs;
}
@ -139,11 +150,12 @@ static void
tsfix_start(tsfix_t *tf, streaming_start_t *ss)
{
int i, hasvideo = 0, vwait = 0;
tfstream_t *tfs;
for(i = 0; i < ss->ss_num_components; i++) {
const streaming_start_component_t *ssc = &ss->ss_components[i];
tsfix_add_stream(tf, ssc->ssc_index, ssc->ssc_type);
if (SCT_ISVIDEO(ssc->ssc_type)) {
tfs = tsfix_add_stream(tf, ssc->ssc_index, ssc->ssc_type);
if (tfs->tfs_video) {
if (ssc->ssc_width == 0 || ssc->ssc_height == 0)
/* only first video stream may be valid */
vwait = !hasvideo ? 1 : 0;
@ -200,7 +212,7 @@ normalize_ts(tsfix_t *tf, tfstream_t *tfs, th_pkt_t *pkt)
int64_t upper = 180000; /* two seconds */
d = dts + tfs->tfs_dts_epoch - tfs->tfs_last_dts_norm;
if (SCT_ISSUBTITLE(tfs->tfs_type)) {
if (tfs->tfs_subtitle) {
/*
* special conditions for subtitles, because they may be broadcasted
* with large time gaps
@ -324,7 +336,7 @@ static void
compute_pts(tsfix_t *tf, tfstream_t *tfs, th_pkt_t *pkt)
{
// If PTS is missing, set it to DTS if not video
if(pkt->pkt_pts == PTS_UNSET && !SCT_ISVIDEO(tfs->tfs_type)) {
if(pkt->pkt_pts == PTS_UNSET && !tfs->tfs_video) {
pkt->pkt_pts = pkt->pkt_dts;
tsfixprintf("TSFIX: %-12s PTS set to %"PRId64"\n",
streaming_component_type2txt(tfs->tfs_type),
@ -348,6 +360,7 @@ tsfix_input_packet(tsfix_t *tf, streaming_message_t *sm)
th_pkt_t *pkt = pkt_copy_shallow(sm->sm_data);
tfstream_t *tfs = tfs_find(tf, pkt);
streaming_msg_free(sm);
int64_t diff;
if(tfs == NULL || dispatch_clock < tf->tf_start_time) {
pkt_ref_dec(pkt);
@ -355,16 +368,23 @@ tsfix_input_packet(tsfix_t *tf, streaming_message_t *sm)
}
if(tf->tf_tsref == PTS_UNSET &&
(!tf->tf_hasvideo ||
(SCT_ISVIDEO(tfs->tfs_type) && pkt->pkt_frametype == PKT_I_FRAME))) {
tf->tf_tsref = pkt->pkt_dts & PTS_MASK;
tsfixprintf("reference clock set to %"PRId64"\n", tf->tf_tsref);
} else {
/* For teletext, the encoders might use completely different timestamps */
/* If the difference is greater than 2 seconds, use the actual dts value */
if (tfs->tfs_type == SCT_TELETEXT && tfs->tfs_local_ref == PTS_UNSET &&
tf->tf_tsref != PTS_UNSET && pkt->pkt_dts != PTS_UNSET) {
int64_t diff = tsfix_ts_diff(tf->tf_tsref, pkt->pkt_dts);
((!tf->tf_hasvideo && tfs->tfs_audio) ||
(tfs->tfs_video && pkt->pkt_frametype == PKT_I_FRAME))) {
tf->tf_tsref = pkt->pkt_dts & PTS_MASK;
tsfixprintf("reference clock set to %"PRId64"\n", tf->tf_tsref);
} else if (tfs->tfs_local_ref == PTS_UNSET && tf->tf_tsref != PTS_UNSET &&
pkt->pkt_dts != PTS_UNSET) {
if (tfs->tfs_audio) {
diff = tsfix_ts_diff(tf->tf_tsref, pkt->pkt_dts);
if (diff > 2 * 90000) {
tvhwarn("parser", "The timediff for %s is big (%"PRId64"), using current dts",
streaming_component_type2txt(tfs->tfs_type), diff);
tfs->tfs_local_ref = pkt->pkt_dts;
} else {
tfs->tfs_local_ref = tf->tf_tsref;
}
} else if (tfs->tfs_type == SCT_TELETEXT) {
diff = tsfix_ts_diff(tf->tf_tsref, pkt->pkt_dts);
if (diff > 2 * 90000) {
tfstream_t *tfs2;
tvhwarn("parser", "The timediff for TELETEXT is big (%"PRId64"), using current dts", diff);