mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsparse: Packetize output on default srcpad

Browse source 
Align buffer boundaries with mpeg-ts packets, instead of keeping
whatever packetization we have from the source (network, file reading).
This commit is contained in:
Vivia Nikolaidou 2020-01-10 17:58:34 +02:00 committed by GStreamer Merge Bot
parent e44cbfb1da
commit 34af8ed66a
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/mpegtsdemux/mpegtsparse.c
View file

@ -102,6 +102,8 @@ mpegts_parse_push (MpegTSBase * base, MpegTSPacketizerPacket * packet,
GstMpegtsSection * section); GstMpegtsSection * section);
static void mpegts_parse_inspect_packet (MpegTSBase * base, static void mpegts_parse_inspect_packet (MpegTSBase * base,
MpegTSPacketizerPacket * packet); MpegTSPacketizerPacket * packet);
static GstFlowReturn mpegts_parse_have_buffer (MpegTSBase * base,
GstBuffer * buffer);
static MpegTSParsePad *mpegts_parse_create_tspad (MpegTSParse2 * parse, static MpegTSParsePad *mpegts_parse_create_tspad (MpegTSParse2 * parse,
const gchar * name); const gchar * name);
@ -119,8 +121,6 @@ static gboolean push_event (MpegTSBase * base, GstEvent * event);
#define mpegts_parse_parent_class parent_class #define mpegts_parse_parent_class parent_class
G_DEFINE_TYPE (MpegTSParse2, mpegts_parse, GST_TYPE_MPEGTS_BASE); G_DEFINE_TYPE (MpegTSParse2, mpegts_parse, GST_TYPE_MPEGTS_BASE);
static void mpegts_parse_reset (MpegTSBase * base); static void mpegts_parse_reset (MpegTSBase * base);
static GstFlowReturn mpegts_parse_input_done (MpegTSBase * base,
GstBuffer * buffer);
static GstFlowReturn static GstFlowReturn
drain_pending_buffers (MpegTSParse2 * parse, gboolean drain_all); drain_pending_buffers (MpegTSParse2 * parse, gboolean drain_all);
@ -180,7 +180,6 @@ mpegts_parse_class_init (MpegTSParse2Class * klass)
ts_class->program_started = GST_DEBUG_FUNCPTR (mpegts_parse_program_started); ts_class->program_started = GST_DEBUG_FUNCPTR (mpegts_parse_program_started);
ts_class->program_stopped = GST_DEBUG_FUNCPTR (mpegts_parse_program_stopped); ts_class->program_stopped = GST_DEBUG_FUNCPTR (mpegts_parse_program_stopped);
ts_class->reset = GST_DEBUG_FUNCPTR (mpegts_parse_reset); ts_class->reset = GST_DEBUG_FUNCPTR (mpegts_parse_reset);
ts_class->input_done = GST_DEBUG_FUNCPTR (mpegts_parse_input_done);
ts_class->inspect_packet = GST_DEBUG_FUNCPTR (mpegts_parse_inspect_packet); ts_class->inspect_packet = GST_DEBUG_FUNCPTR (mpegts_parse_inspect_packet);
} }
@ -190,9 +189,8 @@ mpegts_parse_init (MpegTSParse2 * parse)
MpegTSBase *base = (MpegTSBase *) parse; MpegTSBase *base = (MpegTSBase *) parse;
base->program_size = sizeof (MpegTSParseProgram); base->program_size = sizeof (MpegTSParseProgram);
/* We will only need to handle data/section if we have request pads */ base->push_data = TRUE;
base->push_data = FALSE; base->push_section = TRUE;
base->push_section = FALSE;
parse->user_pcr_pid = parse->pcr_pid = -1; parse->user_pcr_pid = parse->pcr_pid = -1;
@ -426,7 +424,6 @@ static void
mpegts_parse_pad_removed (GstElement * element, GstPad * pad) mpegts_parse_pad_removed (GstElement * element, GstPad * pad)
{ {
MpegTSParsePad *tspad; MpegTSParsePad *tspad;
MpegTSBase *base = (MpegTSBase *) element;
MpegTSParse2 *parse = GST_MPEGTS_PARSE (element); MpegTSParse2 *parse = GST_MPEGTS_PARSE (element);
if (gst_pad_get_direction (pad) == GST_PAD_SINK) if (gst_pad_get_direction (pad) == GST_PAD_SINK)
@ -438,10 +435,6 @@ mpegts_parse_pad_removed (GstElement * element, GstPad * pad)
parse->srcpads = g_list_remove_all (parse->srcpads, pad); parse->srcpads = g_list_remove_all (parse->srcpads, pad);
} }
if (parse->srcpads == NULL) {
base->push_data = FALSE;
base->push_section = FALSE;
}
if (GST_ELEMENT_CLASS (parent_class)->pad_removed) if (GST_ELEMENT_CLASS (parent_class)->pad_removed)
GST_ELEMENT_CLASS (parent_class)->pad_removed (element, pad); GST_ELEMENT_CLASS (parent_class)->pad_removed (element, pad);
@ -451,7 +444,6 @@ static GstPad *
mpegts_parse_request_new_pad (GstElement * element, GstPadTemplate * template, mpegts_parse_request_new_pad (GstElement * element, GstPadTemplate * template,
const gchar * padname, const GstCaps * caps) const gchar * padname, const GstCaps * caps)
{ {
MpegTSBase *base = (MpegTSBase *) element;
MpegTSParse2 *parse; MpegTSParse2 *parse;
MpegTSParsePad *tspad; MpegTSParsePad *tspad;
MpegTSParseProgram *parseprogram; MpegTSParseProgram *parseprogram;
@ -484,8 +476,6 @@ mpegts_parse_request_new_pad (GstElement * element, GstPadTemplate * template,
pad = tspad->pad; pad = tspad->pad;
parse->srcpads = g_list_append (parse->srcpads, pad); parse->srcpads = g_list_append (parse->srcpads, pad);
base->push_data = TRUE;
base->push_section = TRUE;
gst_pad_set_active (pad, TRUE); gst_pad_set_active (pad, TRUE);
@ -624,6 +614,7 @@ mpegts_parse_push (MpegTSBase * base, MpegTSPacketizerPacket * packet,
MpegTSParsePad *tspad; MpegTSParsePad *tspad;
GstFlowReturn ret; GstFlowReturn ret;
GList *srcpads; GList *srcpads;
GstBuffer *buf;
GST_OBJECT_LOCK (parse); GST_OBJECT_LOCK (parse);
srcpads = parse->srcpads; srcpads = parse->srcpads;
@ -643,6 +634,9 @@ mpegts_parse_push (MpegTSBase * base, MpegTSPacketizerPacket * packet,
} }
GST_OBJECT_UNLOCK (parse); GST_OBJECT_UNLOCK (parse);
buf = mpegts_packet_to_buffer (packet);
ret = mpegts_parse_have_buffer (base, buf);
while (pad && !done) { while (pad && !done) {
tspad = gst_pad_get_element_private (pad); tspad = gst_pad_get_element_private (pad);
@ -864,7 +858,7 @@ drain_pending_buffers (MpegTSParse2 * parse, gboolean drain_all)
} }
static GstFlowReturn static GstFlowReturn
mpegts_parse_input_done (MpegTSBase * base, GstBuffer * buffer) mpegts_parse_have_buffer (MpegTSBase * base, GstBuffer * buffer)
{ {
MpegTSParse2 *parse = GST_MPEGTS_PARSE (base); MpegTSParse2 *parse = GST_MPEGTS_PARSE (base);
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;