1 From 9fce0ed5dd37daa6d98d0a4aaed05faafb2e6771 Mon Sep 17 00:00:00 2001
2 From: Andreas Oberritter <obi@opendreambox.org>
3 Date: Wed, 21 Mar 2012 15:55:42 +0100
4 Subject: [PATCH 3/3] mpegpsdemux_speedup.diff
7 gst/mpegdemux/gstmpegdemux.c | 52 +++++++++++++++++++++++++++++++++++++-----
8 gst/mpegdemux/gstmpegdemux.h | 4 +++
9 2 files changed, 50 insertions(+), 6 deletions(-)
11 diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
12 index 8359285..35a7ee9 100644
13 --- a/gst/mpegdemux/gstmpegdemux.c
14 +++ b/gst/mpegdemux/gstmpegdemux.c
15 @@ -285,7 +285,10 @@ gst_flups_demux_reset (GstFluPSDemux * demux)
18 gst_element_remove_pad (GST_ELEMENT_CAST (demux), stream->pad);
22 + if (stream->meta_buf)
23 + gst_buffer_unref(stream->meta_buf);
25 demux->streams[i] = NULL;
27 @@ -415,6 +418,15 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
28 stream->type = stream_type;
29 stream->pad = gst_pad_new_from_template (template, name);
30 stream->segment_thresh = threshold;
32 + if (threshold == VIDEO_SEGMENT_THRESHOLD) {
33 + stream->buf = malloc(64*1024);
34 + stream->buf_pos = 0;
35 + stream->meta_buf = gst_buffer_new();
40 gst_pad_set_event_function (stream->pad,
41 GST_DEBUG_FUNCPTR (gst_flups_demux_src_event));
42 gst_pad_set_query_function (stream->pad,
43 @@ -466,6 +478,7 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
47 + gboolean sent = FALSE;
51 @@ -568,11 +581,38 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
52 demux->next_pts = G_MAXUINT64;
53 demux->next_dts = G_MAXUINT64;
55 - result = gst_pad_push (stream->pad, buf);
56 - GST_DEBUG_OBJECT (demux, "pushed stream id 0x%02x type 0x%02x, time: %"
57 - GST_TIME_FORMAT ", size %d. result: %s",
58 - stream->id, stream->type, GST_TIME_ARGS (timestamp),
59 - size, gst_flow_get_name (result));
60 + if (stream->buf && stream->buf_pos && (timestamp != GST_CLOCK_TIME_NONE || stream->buf_pos+size > 64*1024)) {
61 + GstBuffer *tmp = gst_buffer_new_and_alloc(stream->buf_pos);
62 + gst_buffer_copy_metadata(tmp, stream->meta_buf, GST_BUFFER_COPY_ALL);
63 + GST_BUFFER_SIZE(tmp) = stream->buf_pos;
64 + memcpy(GST_BUFFER_DATA(tmp), stream->buf, stream->buf_pos);
65 + result = gst_pad_push (stream->pad, tmp);
66 + GST_DEBUG_OBJECT (demux, "pushed stream id 0x%02x type 0x%02x, time: %"
67 + GST_TIME_FORMAT ", size %d. result: %s",
68 + stream->id, stream->type, GST_TIME_ARGS (timestamp),
69 + stream->buf_pos, gst_flow_get_name (result));
70 + stream->buf_pos = 0;
74 + if (!stream->buf || size > 64*1024) {
75 + result = gst_pad_push (stream->pad, buf);
76 + GST_DEBUG_OBJECT (demux, "pushed stream id 0x%02x type 0x%02x, time: %"
77 + GST_TIME_FORMAT ", size %d. result: %s",
78 + stream->id, stream->type, GST_TIME_ARGS (timestamp),
79 + size, gst_flow_get_name (result));
82 + if (!stream->buf_pos)
83 + gst_buffer_copy_metadata(stream->meta_buf, buf, GST_BUFFER_COPY_ALL);
85 + memcpy(stream->buf + stream->buf_pos, GST_BUFFER_DATA(buf), size);
86 + stream->buf_pos += size;
87 + gst_buffer_unref(buf);
90 + result = GST_FLOW_OK;
95 diff --git a/gst/mpegdemux/gstmpegdemux.h b/gst/mpegdemux/gstmpegdemux.h
96 index 6cf7aed..5977578 100644
97 --- a/gst/mpegdemux/gstmpegdemux.h
98 +++ b/gst/mpegdemux/gstmpegdemux.h
99 @@ -92,6 +92,10 @@ struct _GstFluPSStream
102 gboolean need_segment;
104 + GstBuffer *meta_buf;
105 + unsigned char *buf;
109 struct _GstFluPSDemux