mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-09 07:52:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsmux: actually respect the PCR frequency we target

Browse source
This commit is contained in:
Mathieu Duponchelle 2019-04-22 22:10:42 +02:00 committed by Mathieu Duponchelle
parent dc2b28d456
commit 4d53a7ac09
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/mpegtsmux/tsmux/tsmux.c
View file

@ -1067,14 +1067,16 @@ tsmux_write_stream_packet (TsMux * mux, TsMuxStream * stream)
} }
/* Need to decide whether to write a new PCR in this packet */ /* Need to decide whether to write a new PCR in this packet */
if (stream->last_pcr == -1 || if (stream->next_pcr == -1 || cur_pcr > stream->next_pcr) {
(cur_pcr - stream->last_pcr >
(TSMUX_SYS_CLOCK_FREQ / TSMUX_DEFAULT_PCR_FREQ))) {
stream->pi.flags |= stream->pi.flags |=
TSMUX_PACKET_FLAG_ADAPTATION | TSMUX_PACKET_FLAG_WRITE_PCR; TSMUX_PACKET_FLAG_ADAPTATION | TSMUX_PACKET_FLAG_WRITE_PCR;
stream->pi.pcr = cur_pcr; stream->pi.pcr = cur_pcr;
stream->last_pcr = cur_pcr;
if (stream->next_pcr == -1)
stream->next_pcr =
cur_pcr + TSMUX_SYS_CLOCK_FREQ / TSMUX_DEFAULT_PCR_FREQ;
else
stream->next_pcr += TSMUX_SYS_CLOCK_FREQ / TSMUX_DEFAULT_PCR_FREQ;
} else { } else {
cur_pcr = -1; cur_pcr = -1;
} }

2
gst/mpegtsmux/tsmux/tsmuxstream.c
View file

@ -228,7 +228,7 @@ tsmux_stream_new (guint16 pid, TsMuxStreamType stream_type)
stream->last_dts = GST_CLOCK_STIME_NONE; stream->last_dts = GST_CLOCK_STIME_NONE;
stream->pcr_ref = 0; stream->pcr_ref = 0;
stream->last_pcr = -1; stream->next_pcr = -1;
return stream; return stream;
} }

4
gst/mpegtsmux/tsmux/tsmuxstream.h
View file

@ -199,8 +199,8 @@ struct TsMuxStream {
/* count of programs using this as PCR */ /* count of programs using this as PCR */
gint pcr_ref; gint pcr_ref;
/* last time PCR written */ /* Next time PCR should be written */
gint64 last_pcr; gint64 next_pcr;
/* audio parameters for stream /* audio parameters for stream
* (used in stream descriptor) */ * (used in stream descriptor) */