[gst-cvs] gst-plugins-bad: mpegtsmux: mark delta-unit on outgoing buffers
Edward Hervey
bilboed at kemper.freedesktop.org
Fri Jan 8 04:16:11 PST 2010
Module: gst-plugins-bad
Branch: master
Commit: 5fab65aafbde8d05a202995c7756065a7eddd3a6
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=5fab65aafbde8d05a202995c7756065a7eddd3a6
Author: Thomas Vander Stichele <thomas at apestaart.org>
Date: Fri Dec 18 14:14:17 2009 +0100
mpegtsmux: mark delta-unit on outgoing buffers
Signed-off-by: Marc-André Lureau <mlureau at flumotion.com>
---
gst/mpegtsmux/mpegtsmux.c | 24 +++++++++++++++++++++---
gst/mpegtsmux/tsmux/tsmux.c | 10 +++++-----
gst/mpegtsmux/tsmux/tsmux.h | 4 ++--
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index 7145ba3..b0a7b55 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -135,7 +135,7 @@ static void gst_mpegtsmux_get_property (GObject * object, guint prop_id,
static void mpegtsmux_dispose (GObject * object);
static gboolean new_packet_cb (guint8 * data, guint len, void *user_data,
- gint64 new_pcr);
+ gint64 new_pcr, gboolean delta);
static void release_buffer_cb (guint8 * data, void *user_data);
static gboolean mpegtsdemux_prepare_srcpad (MpegTsMux * mux);
@@ -622,6 +622,7 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux)
TsMuxProgram *prog = best->prog;
GstBuffer *buf = best->queued_buf;
gint64 pts = -1;
+ gboolean delta;
if (prog == NULL) {
GST_ELEMENT_ERROR (mux, STREAM, MUX, ("Stream is not associated with "
@@ -642,6 +643,9 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux)
}
g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
+ delta = GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+ GST_DEBUG_OBJECT (mux, "delta: %d", delta);
+
GST_DEBUG_OBJECT (COLLECT_DATA_PAD (best),
"Chose stream for output (PID: 0x%04x)", best->pid);
@@ -657,10 +661,11 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux)
best->queued_buf = NULL;
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, delta)) {
GST_DEBUG_OBJECT (mux, "Failed to write data packet");
goto write_fail;
}
+ delta = TRUE;
}
if (prog->pcr_stream == best->stream) {
mux->last_ts = best->last_ts;
@@ -759,7 +764,8 @@ mpegtsmux_release_pad (GstElement * element, GstPad * pad)
}
static gboolean
-new_packet_cb (guint8 * data, guint len, void *user_data, gint64 new_pcr)
+new_packet_cb (guint8 * data, guint len, void *user_data, gint64 new_pcr,
+ gboolean delta)
{
/* Called when the TsMux has prepared a packet for output. Return FALSE
* on error */
@@ -774,6 +780,12 @@ new_packet_cb (guint8 * data, guint len, void *user_data, gint64 new_pcr)
if (mux->m2ts_mode == TRUE) {
/* Enters when the m2ts-mode is set true */
buf = gst_buffer_new_and_alloc (M2TS_PACKET_LENGTH);
+ if (delta) {
+ GST_LOG_OBJECT (mux, "marking as delta unit");
+ GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+ } else {
+ GST_DEBUG_OBJECT (mux, "marking as non-delta unit");
+ }
if (G_UNLIKELY (buf == NULL)) {
mux->last_flow_ret = GST_FLOW_ERROR;
return FALSE;
@@ -846,6 +858,12 @@ new_packet_cb (guint8 * data, guint len, void *user_data, gint64 new_pcr)
/* In case of Normal Ts packets */
GST_LOG_OBJECT (mux, "Outputting a packet of length %d", len);
buf = gst_buffer_new_and_alloc (len);
+ if (delta) {
+ GST_LOG_OBJECT (mux, "marking as delta unit");
+ GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+ } else {
+ GST_DEBUG_OBJECT (mux, "marking as non-delta unit");
+ }
if (G_UNLIKELY (buf == NULL)) {
mux->last_flow_ret = GST_FLOW_ERROR;
return FALSE;
diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c
index 70ad3dc..77f1468 100644
--- a/gst/mpegtsmux/tsmux/tsmux.c
+++ b/gst/mpegtsmux/tsmux/tsmux.c
@@ -438,13 +438,13 @@ tsmux_find_stream (TsMux * mux, guint16 pid)
}
static gboolean
-tsmux_packet_out (TsMux * mux)
+tsmux_packet_out (TsMux * mux, gboolean delta)
{
if (G_UNLIKELY (mux->write_func == NULL))
return TRUE;
return mux->write_func (mux->packet_buf, TSMUX_PACKET_LENGTH,
- mux->write_func_data, mux->new_pcr);
+ mux->write_func_data, mux->new_pcr, delta);
}
/*
@@ -704,7 +704,7 @@ tsmux_write_ts_header (guint8 * buf, TsMuxPacketInfo * pi,
* Returns: TRUE if the packet could be written.
*/
gboolean
-tsmux_write_stream_packet (TsMux * mux, TsMuxStream * stream)
+tsmux_write_stream_packet (TsMux * mux, TsMuxStream * stream, gboolean delta)
{
guint payload_len, payload_offs;
TsMuxPacketInfo *pi = &stream->pi;
@@ -788,7 +788,7 @@ tsmux_write_stream_packet (TsMux * mux, TsMuxStream * stream)
payload_len))
return FALSE;
- res = tsmux_packet_out (mux);
+ res = tsmux_packet_out (mux, delta);
/* Reset all dynamic flags */
stream->pi.flags &= TSMUX_PACKET_FLAG_PES_FULL_HEADER;
@@ -859,7 +859,7 @@ tsmux_write_section (TsMux * mux, TsMuxSection * section)
cur_in += payload_len;
payload_remain -= payload_len;
- if (G_UNLIKELY (!tsmux_packet_out (mux))) {
+ if (G_UNLIKELY (!tsmux_packet_out (mux, TRUE))) {
mux->new_pcr = -1;
return FALSE;
}
diff --git a/gst/mpegtsmux/tsmux/tsmux.h b/gst/mpegtsmux/tsmux/tsmux.h
index 8b4df09..b2ec469 100644
--- a/gst/mpegtsmux/tsmux/tsmux.h
+++ b/gst/mpegtsmux/tsmux/tsmux.h
@@ -95,7 +95,7 @@ G_BEGIN_DECLS
typedef struct TsMuxSection TsMuxSection;
typedef struct TsMux TsMux;
-typedef gboolean (*TsMuxWriteFunc) (guint8 *data, guint len, void *user_data, gint64 new_pcr);
+typedef gboolean (*TsMuxWriteFunc) (guint8 *data, guint len, void *user_data, gint64 new_pcr, gboolean delta);
struct TsMuxSection {
TsMuxPacketInfo pi;
@@ -176,7 +176,7 @@ void tsmux_program_add_stream (TsMuxProgram *program, TsMuxStream *stream);
void tsmux_program_set_pcr_stream (TsMuxProgram *program, TsMuxStream *stream);
/* writing stuff */
-gboolean tsmux_write_stream_packet (TsMux *mux, TsMuxStream *stream);
+gboolean tsmux_write_stream_packet (TsMux *mux, TsMuxStream *stream, gboolean delta);
G_END_DECLS
More information about the Gstreamer-commits
mailing list