mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: Carry over GST_BUFFER_FLAG_HEADER

Browse source 
In the same way we do it for the DELTA_UNIT flag

This allows downstream elements to know whether a given mpeg-ts
packet contains a corresponding HEADER elementary unit
This commit is contained in:
Edward Hervey 2015-04-17 15:35:43 +02:00 committed by Edward Hervey
parent 8d728abd8c
commit 43621624c8
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/mpegtsmux/mpegtsmux.c
View file

@ -1090,7 +1090,7 @@ mpegtsmux_collected_buffer (GstCollectPads * pads, GstCollectData * data,
TsMuxProgram *prog; TsMuxProgram *prog;
gint64 pts = -1; gint64 pts = -1;
guint64 dts = -1; guint64 dts = -1;
gboolean delta = TRUE; gboolean delta = TRUE, header = FALSE;
StreamData *stream_data; StreamData *stream_data;
GST_DEBUG_OBJECT (mux, "Pads collected"); GST_DEBUG_OBJECT (mux, "Pads collected");
@ -1189,6 +1189,7 @@ mpegtsmux_collected_buffer (GstCollectPads * pads, GstCollectData * data,
if (best->stream->is_video_stream) { if (best->stream->is_video_stream) {
delta = GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT); delta = GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
header = GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_HEADER);
#if 0 #if 0
GST_OBJECT_LOCK (mux); GST_OBJECT_LOCK (mux);
if (mux->element_index && !delta && best->element_index_writer_id != -1) { if (mux->element_index && !delta && best->element_index_writer_id != -1) {
@ -1215,6 +1216,7 @@ mpegtsmux_collected_buffer (GstCollectPads * pads, GstCollectData * data,
} }
mux->is_delta = delta; mux->is_delta = delta;
mux->is_header = header;
while (tsmux_stream_bytes_in_buffer (best->stream) > 0) { while (tsmux_stream_bytes_in_buffer (best->stream) > 0) {
if (!tsmux_write_stream_packet (mux->tsmux, best->stream)) { if (!tsmux_write_stream_packet (mux->tsmux, best->stream)) {
/* Failed writing data for some reason. Set appropriate error */ /* Failed writing data for some reason. Set appropriate error */
@ -1344,6 +1346,10 @@ new_packet_common_init (MpegTsMux * mux, GstBuffer * buf, guint8 * data,
} }
if (buf) { if (buf) {
if (mux->is_header) {
GST_LOG_OBJECT (mux, "marking as header buffer");
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_HEADER);
}
if (mux->is_delta) { if (mux->is_delta) {
GST_LOG_OBJECT (mux, "marking as delta unit"); GST_LOG_OBJECT (mux, "marking as delta unit");
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT); GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);

1
gst/mpegtsmux/mpegtsmux.h
View file

@ -152,6 +152,7 @@ struct MpegTsMux {
GList *streamheader; GList *streamheader;
gboolean streamheader_sent; gboolean streamheader_sent;
gboolean is_delta; gboolean is_delta;
gboolean is_header;
GstClockTime last_ts; GstClockTime last_ts;
/* m2ts specific */ /* m2ts specific */