mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-15 10:48:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: Don't write PCR until PAT/PMT are output.

Browse source 
Make sure streams start cleanly with a PAT/PMT and defer the first PCR
output until after that.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2073>
This commit is contained in:
Jan Schmidt 2021-03-12 18:10:18 +11:00 committed by GStreamer Marge Bot
parent b7e9e606a9
commit 5e4a11bf36
2 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -812,38 +812,46 @@ tsmux_packet_out (TsMux * mux, GstBuffer * buf, gint64 pcr)
return TRUE;
}
if (mux->bitrate)
if (mux->bitrate) {
GST_BUFFER_PTS (buf) =
gst_util_uint64_scale (mux->n_bytes * 8, GST_SECOND, mux->bitrate);
if (mux->bitrate && mux->first_pcr_ts != G_MININT64) {
GList *cur;
/* Check and insert a PCR observation for each program if needed,
* but only for programs that have written their SI at least once,
* so the stream starts with PAT/PMT */
if (mux->first_pcr_ts != G_MININT64) {
GList *cur;
for (cur = mux->programs; cur; cur = cur->next) {
TsMuxProgram *program = (TsMuxProgram *) cur->data;
TsMuxStream *stream = program->pcr_stream;
gint64 cur_pcr = get_current_pcr (mux, 0);
gint64 next_pcr = get_next_pcr (mux, 0);
for (cur = mux->programs; cur; cur = cur->next) {
TsMuxProgram *program = (TsMuxProgram *) cur->data;
TsMuxStream *stream = program->pcr_stream;
gint64 cur_pcr, next_pcr, new_pcr;
gint64 new_pcr = write_new_pcr (mux, stream, cur_pcr, next_pcr);
if (!program->wrote_si)
continue;
if (new_pcr != -1) {
GstBuffer *buf = NULL;
GstMapInfo map;
guint payload_len, payload_offs;
cur_pcr = get_current_pcr (mux, 0);
next_pcr = get_next_pcr (mux, 0);
new_pcr = write_new_pcr (mux, stream, cur_pcr, next_pcr);
if (!tsmux_get_buffer (mux, &buf)) {
goto error;
if (new_pcr != -1) {
GstBuffer *buf = NULL;
GstMapInfo map;
guint payload_len, payload_offs;
if (!tsmux_get_buffer (mux, &buf)) {
goto error;
}
gst_buffer_map (buf, &map, GST_MAP_READ);
tsmux_write_ts_header (mux, map.data, &stream->pi, &payload_len,
&payload_offs, 0);
gst_buffer_unmap (buf, &map);
stream->pi.flags &= TSMUX_PACKET_FLAG_PES_FULL_HEADER;
if (!tsmux_packet_out (mux, buf, new_pcr))
goto error;
}
gst_buffer_map (buf, &map, GST_MAP_READ);
tsmux_write_ts_header (mux, map.data, &stream->pi, &payload_len,
&payload_offs, 0);
gst_buffer_unmap (buf, &map);
stream->pi.flags &= TSMUX_PACKET_FLAG_PES_FULL_HEADER;
if (!tsmux_packet_out (mux, buf, new_pcr))
goto error;
}
}
}
@ -1452,6 +1460,8 @@ rewrite_si (TsMux * mux, gint64 cur_ts)
next_pcr = get_current_pcr (mux, cur_ts);
}
}
program->wrote_si = TRUE;
}
return TRUE;

3
gst/mpegtsmux/tsmux/tsmux.h
View file

@ -111,6 +111,9 @@ struct TsMuxSection {
/* Information for the streams associated with one program */
struct TsMuxProgram {
/* TRUE if the SI has been written at least once */
gboolean wrote_si;
TsMuxSection pmt;
/* PMT version */
guint8 pmt_version;