FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tsmux: maintain packet counters in a global array

Browse Source 
We can have multiple TsMuxPacketInfo objects for the same PID
with user-provided sections, for example ATSC requires multiple
tables with the same PID.
This commit is contained in:
Mathieu Duponchelle 2019-05-23 00:03:18 +02:00 committed by Mathieu Duponchelle
parent 09749192d8
commit 5d41740ff6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gst/mpegtsmux/tsmux/tsmux.c
View File

@ -821,7 +821,7 @@ tsmux_write_adaptation_field (guint8 * buf,
} }
static gboolean static gboolean
tsmux_write_ts_header (guint8 * buf, TsMuxPacketInfo * pi, tsmux_write_ts_header (TsMux * mux, guint8 * buf, TsMuxPacketInfo * pi,
guint * payload_len_out, guint * payload_offset_out, guint stream_avail) guint * payload_len_out, guint * payload_offset_out, guint stream_avail)
{ {
guint8 *tmp; guint8 *tmp;
@ -835,7 +835,7 @@ tsmux_write_ts_header (guint8 * buf, TsMuxPacketInfo * pi,
buf[0] = TSMUX_SYNC_BYTE; buf[0] = TSMUX_SYNC_BYTE;
TS_DEBUG ("PID 0x%04x, counter = 0x%01x, %u bytes avail", pi->pid, TS_DEBUG ("PID 0x%04x, counter = 0x%01x, %u bytes avail", pi->pid,
pi->packet_count & 0x0f, stream_avail); mux->pid_packet_counts[pi->pid] & 0x0f, stream_avail);
/* 3 bits: /* 3 bits:
* transport_error_indicator * transport_error_indicator
@ -893,10 +893,10 @@ tsmux_write_ts_header (guint8 * buf, TsMuxPacketInfo * pi,
g_assert (payload_len <= stream_avail); g_assert (payload_len <= stream_avail);
/* Packet with payload, increment the continuity counter */ /* Packet with payload, increment the continuity counter */
pi->packet_count++; mux->pid_packet_counts[pi->pid]++;
} }
adaptation_flag |= pi->packet_count & 0x0f; adaptation_flag |= mux->pid_packet_counts[pi->pid] & 0x0f;
/* Write the byte of transport_scrambling_control, adaptation_field_control /* Write the byte of transport_scrambling_control, adaptation_field_control
* + continuity counter out */ * + continuity counter out */
@ -960,7 +960,7 @@ tsmux_section_write_packet (GstMpegtsSectionType * type,
/* Wee need room for a pointer byte */ /* Wee need room for a pointer byte */
section->pi.stream_avail++; section->pi.stream_avail++;
if (!tsmux_write_ts_header (packet, &section->pi, &len, &offset, if (!tsmux_write_ts_header (mux, packet, &section->pi, &len, &offset,
section->pi.stream_avail)) section->pi.stream_avail))
goto fail; goto fail;
@ -969,7 +969,7 @@ tsmux_section_write_packet (GstMpegtsSectionType * type,
payload_len = len - 1; payload_len = len - 1;
} else { } else {
if (!tsmux_write_ts_header (packet, &section->pi, &len, &offset, if (!tsmux_write_ts_header (mux, packet, &section->pi, &len, &offset,
section->pi.stream_avail)) section->pi.stream_avail))
goto fail; goto fail;
payload_len = len; payload_len = len;
@ -1218,7 +1218,7 @@ pad_stream (TsMux * mux, TsMuxStream * stream, gint64 cur_ts)
if ((new_pcr = if ((new_pcr =
write_new_pcr (mux, stream, get_current_pcr (mux, write_new_pcr (mux, stream, get_current_pcr (mux,
cur_ts)) != -1)) cur_ts)) != -1))
tsmux_write_ts_header (map.data, &stream->pi, &payload_len, tsmux_write_ts_header (mux, map.data, &stream->pi, &payload_len,
&payload_offs, 0); &payload_offs, 0);
else else
tsmux_write_null_ts_header (map.data); tsmux_write_null_ts_header (map.data);
@ -1297,7 +1297,7 @@ tsmux_write_stream_packet (TsMux * mux, TsMuxStream * stream)
gst_buffer_map (buf, &map, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
if (!tsmux_write_ts_header (map.data, pi, &payload_len, &payload_offs, if (!tsmux_write_ts_header (mux, map.data, pi, &payload_len, &payload_offs,
pi->stream_avail)) pi->stream_avail))
goto fail; goto fail;

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

@ -186,6 +186,9 @@ struct TsMux {
guint64 bitrate; guint64 bitrate;
guint64 n_bytes; guint64 n_bytes;
/* For the per-PID continuity counter */
guint8 pid_packet_counts[8192];
}; };
/* create/free new muxer session */ /* create/free new muxer session */

3
gst/mpegtsmux/tsmux/tsmuxcommon.h
View File

@ -135,9 +135,6 @@ struct TsMuxPacketInfo {
gboolean packet_start_unit_indicator; gboolean packet_start_unit_indicator;
/* continuity counter */
guint8 packet_count;
/* payload bytes available /* payload bytes available
* (including PES header if applicable) */ * (including PES header if applicable) */
guint stream_avail; guint stream_avail;