mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 09:12:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavidemux.c: Revert one change to fix streaming avi (adapter size != data size).

Browse source 
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_read_subindexes_pull),
(gst_avi_demux_sync), (gst_avi_demux_stream_header_push),
(gst_avi_demux_stream_data):
Revert one change to fix streaming avi (adapter size != data size).
This commit is contained in:
Stefan Kost 2006-09-06 09:05:33 +00:00
parent 92753a26de
commit 4b7c760e11
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-09-06 Stefan Kost <ensonic@users.sf.net>
* gst/avi/gstavidemux.c: (gst_avi_demux_read_subindexes_pull),
(gst_avi_demux_sync), (gst_avi_demux_stream_header_push),
(gst_avi_demux_stream_data):
Revert one change to fix streaming avi (adapter size != data size).
2006-09-04 Tim-Philipp Müller <tim at centricular dot net> 2006-09-04 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Frédéric Riss <frederic.riss at gmail dot com> Patch by: Frédéric Riss <frederic.riss at gmail dot com>

28
gst/avi/gstavidemux.c
View file

@ -101,7 +101,7 @@ static GstStateChangeReturn gst_avi_demux_change_state (GstElement * element,
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
/* GObject mathods */ /* GObject methods */
GType GType
gst_avi_demux_get_type (void) gst_avi_demux_get_type (void)
@ -1619,7 +1619,6 @@ no_index:
/* /*
* Sync to next data chunk. * Sync to next data chunk.
*/ */
static gboolean static gboolean
gst_avi_demux_skip (GstAviDemux * avi, gboolean prevent_eos) gst_avi_demux_skip (GstAviDemux * avi, gboolean prevent_eos)
{ {
@ -2854,6 +2853,9 @@ gst_avi_demux_do_seek (GstAviDemux * avi, GstSegment * segment)
return TRUE; return TRUE;
} }
/*
* Handle seek.
*/
static gboolean static gboolean
gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event) gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event)
{ {
@ -3201,7 +3203,8 @@ short_buffer:
} }
/* /*
* Read data. If we have an index it delegates to gst_avi_demux_process_next_entry(). * Read data. If we have an index it delegates to
* gst_avi_demux_process_next_entry().
*/ */
static GstFlowReturn static GstFlowReturn
gst_avi_demux_stream_data (GstAviDemux * avi) gst_avi_demux_stream_data (GstAviDemux * avi)
@ -3282,20 +3285,20 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
GstClockTime next_ts = 0; GstClockTime next_ts = 0;
GstFormat format; GstFormat format;
GstBuffer *buf; GstBuffer *buf;
const guint8 *data = NULL;
//const guint8 * data = NULL;
gst_adapter_flush (avi->adapter, 8); gst_adapter_flush (avi->adapter, 8);
/* get buffer */ /* get buffer */
buf = gst_adapter_take_buffer (avi->adapter, ((size + 1) & ~1)); /* this does not work, as the data-size is 'size', but we eventually
/* * need to flush more data from the adapter.
buf = gst_buffer_new_and_alloc (size); buf = gst_adapter_take_buffer (avi->adapter, ((size + 1) & ~1));
data = gst_adapter_peek (avi->adapter, ((size + 1) & ~1));
gst_adapter_flush (avi->adapter, ((size + 1) & ~1));
memcpy (GST_BUFFER_DATA (buf), data, size);
GST_BUFFER_SIZE (buf) = size;
*/ */
buf = gst_buffer_new_and_alloc (size);
data = gst_adapter_peek (avi->adapter, ((size + 1) & ~1));
gst_adapter_flush (avi->adapter, ((size + 1) & ~1));
memcpy (GST_BUFFER_DATA (buf), data, size);
GST_BUFFER_SIZE (buf) = size;
avi->offset += 8 + ((size + 1) & ~1); avi->offset += 8 + ((size + 1) & ~1);
/* get time of this buffer */ /* get time of this buffer */
@ -3319,6 +3322,7 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
gst_buffer_unref (buf); gst_buffer_unref (buf);
} else { */ } else { */
if (!stream->pad || !gst_pad_is_linked (stream->pad)) { if (!stream->pad || !gst_pad_is_linked (stream->pad)) {
GST_WARNING ("No pad or not linked.");
gst_buffer_unref (buf); gst_buffer_unref (buf);
} else { } else {
GstClockTime dur_ts = 0; GstClockTime dur_ts = 0;