diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-06-22 17:51:37 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-06-27 14:52:10 +0200 |
| commit | c4b480b993da3811ddfaf531d9bd0e36af792d8c (patch) | |
| tree | c53b18ff340c40078b8caf10f10c35099df9ad51 /gst/mpegtsmux | |
| parent | ba87a4524fe95eea38160c90dd7f0229367cfe2a (diff) | |
| download | gstreamer-plugins-bad-c4b480b993da3811ddfaf531d9bd0e36af792d8c.tar.gz | |
mpegtsmux: apply some more CLOCK_BASE to ensure slack for PCR offset
Conflicts:
gst/mpegtsmux/tsmux/tsmux.c
Diffstat (limited to 'gst/mpegtsmux')
| -rw-r--r-- | gst/mpegtsmux/tsmux/tsmux.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c index 2393ae207..9b0e6583d 100644 --- a/gst/mpegtsmux/tsmux/tsmux.c +++ b/gst/mpegtsmux/tsmux/tsmux.c @@ -763,11 +763,12 @@ tsmux_write_stream_packet (TsMux * mux, TsMuxStream * stream) /* FIXME: The current PCR needs more careful calculation than just * writing a fixed offset */ - if (cur_pts != -1 && (cur_pts >= TSMUX_PCR_OFFSET)) + if (cur_pts != -1) { + /* CLOCK_BASE >= TSMUX_PCR_OFFSET */ + cur_pts += CLOCK_BASE; cur_pcr = (cur_pts - TSMUX_PCR_OFFSET) * (TSMUX_SYS_CLOCK_FREQ / TSMUX_CLOCK_FREQ); - - cur_pcr += (gint64) CLOCK_BASE *(TSMUX_SYS_CLOCK_FREQ / TSMUX_CLOCK_FREQ); + } /* Need to decide whether to write a new PCR in this packet */ if (stream->last_pcr == -1 || |