mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 13:02:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

update for new variable names

Browse source
This commit is contained in:
Wim Taymans 2012-07-27 15:21:51 +02:00
parent 628bc44ca5
commit 683a38ad65
5 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/ogg/gstoggdemux.c
View file

@ -3050,8 +3050,8 @@ gst_ogg_demux_perform_seek_pull (GstOggDemux * ogg, GstEvent * event)
GstFormat format; GstFormat format;
gdouble rate; gdouble rate;
GstSeekFlags flags; GstSeekFlags flags;
GstSeekType cur_type, stop_type; GstSeekType start_type, stop_type;
gint64 cur, stop; gint64 start, stop;
gboolean update; gboolean update;
guint32 seqnum; guint32 seqnum;
GstEvent *tevent; GstEvent *tevent;
@ -3060,7 +3060,7 @@ gst_ogg_demux_perform_seek_pull (GstOggDemux * ogg, GstEvent * event)
GST_DEBUG_OBJECT (ogg, "seek with event"); GST_DEBUG_OBJECT (ogg, "seek with event");
gst_event_parse_seek (event, &rate, &format, &flags, gst_event_parse_seek (event, &rate, &format, &flags,
&cur_type, &cur, &stop_type, &stop); &start_type, &start, &stop_type, &stop);
/* we can only seek on time */ /* we can only seek on time */
if (format != GST_FORMAT_TIME) { if (format != GST_FORMAT_TIME) {
@ -3121,7 +3121,7 @@ gst_ogg_demux_perform_seek_pull (GstOggDemux * ogg, GstEvent * event)
if (event) { if (event) {
gst_segment_do_seek (&ogg->segment, rate, format, flags, gst_segment_do_seek (&ogg->segment, rate, format, flags,
cur_type, cur, stop_type, stop, &update); start_type, start, stop_type, stop, &update);
} }
GST_DEBUG_OBJECT (ogg, "segment positions set to %" GST_TIME_FORMAT "-%" GST_DEBUG_OBJECT (ogg, "segment positions set to %" GST_TIME_FORMAT "-%"

14
gst-libs/gst/audio/gstaudiodecoder.c
View file

@ -1811,12 +1811,12 @@ gst_audio_decoder_src_eventfunc (GstAudioDecoder * dec, GstEvent * event)
GstFormat format; GstFormat format;
gdouble rate; gdouble rate;
GstSeekFlags flags; GstSeekFlags flags;
GstSeekType cur_type, stop_type; GstSeekType start_type, stop_type;
gint64 cur, stop; gint64 start, stop;
gint64 tcur, tstop; gint64 tstart, tstop;
guint32 seqnum; guint32 seqnum;
gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start,
&stop_type, &stop); &stop_type, &stop);
seqnum = gst_event_get_seqnum (event); seqnum = gst_event_get_seqnum (event);
@ -1834,8 +1834,8 @@ gst_audio_decoder_src_eventfunc (GstAudioDecoder * dec, GstEvent * event)
/* ... though a non-time seek can be aided as well */ /* ... though a non-time seek can be aided as well */
/* First bring the requested format to time */ /* First bring the requested format to time */
if (!(res = if (!(res =
gst_pad_query_convert (dec->srcpad, format, cur, GST_FORMAT_TIME, gst_pad_query_convert (dec->srcpad, format, start,
&tcur))) GST_FORMAT_TIME, &tstart)))
goto convert_error; goto convert_error;
if (!(res = if (!(res =
gst_pad_query_convert (dec->srcpad, format, stop, GST_FORMAT_TIME, gst_pad_query_convert (dec->srcpad, format, stop, GST_FORMAT_TIME,
@ -1844,7 +1844,7 @@ gst_audio_decoder_src_eventfunc (GstAudioDecoder * dec, GstEvent * event)
/* then seek with time on the peer */ /* then seek with time on the peer */
event = gst_event_new_seek (rate, GST_FORMAT_TIME, event = gst_event_new_seek (rate, GST_FORMAT_TIME,
flags, cur_type, tcur, stop_type, tstop); flags, start_type, tstart, stop_type, tstop);
gst_event_set_seqnum (event, seqnum); gst_event_set_seqnum (event, seqnum);
res = gst_pad_push_event (dec->sinkpad, event); res = gst_pad_push_event (dec->sinkpad, event);

22
gst-libs/gst/tag/gsttagdemux.c
View file

@ -766,30 +766,30 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstObject * parent, GstEvent * event)
{ {
gdouble rate; gdouble rate;
GstFormat format; GstFormat format;
GstSeekType cur_type, stop_type; GstSeekType start_type, stop_type;
GstSeekFlags flags; GstSeekFlags flags;
gint64 cur, stop; gint64 start, stop;
gst_event_parse_seek (event, &rate, &format, &flags, gst_event_parse_seek (event, &rate, &format, &flags,
&cur_type, &cur, &stop_type, &stop); &start_type, &start, &stop_type, &stop);
if (format == GST_FORMAT_BYTES && if (format == GST_FORMAT_BYTES &&
tagdemux->priv->state == GST_TAG_DEMUX_STREAMING && tagdemux->priv->state == GST_TAG_DEMUX_STREAMING &&
gst_pad_is_linked (tagdemux->priv->sinkpad)) { gst_pad_is_linked (tagdemux->priv->sinkpad)) {
GstEvent *upstream; GstEvent *upstream;
switch (cur_type) { switch (start_type) {
case GST_SEEK_TYPE_SET: case GST_SEEK_TYPE_SET:
if (cur == -1) if (start == -1)
cur = 0; start = 0;
cur += tagdemux->priv->strip_start; start += tagdemux->priv->strip_start;
break; break;
case GST_SEEK_TYPE_END: case GST_SEEK_TYPE_END:
/* Adjust the seek to be relative to the start of any end tag /* Adjust the seek to be relative to the start of any end tag
* (note: 10 bytes before end is represented by stop=-10) */ * (note: 10 bytes before end is represented by stop=-10) */
if (cur > 0) if (start > 0)
cur = 0; start = 0;
cur -= tagdemux->priv->strip_end; start -= tagdemux->priv->strip_end;
break; break;
case GST_SEEK_TYPE_NONE: case GST_SEEK_TYPE_NONE:
default: default:
@ -814,7 +814,7 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstObject * parent, GstEvent * event)
break; break;
} }
upstream = gst_event_new_seek (rate, format, flags, upstream = gst_event_new_seek (rate, format, flags,
cur_type, cur, stop_type, stop); start_type, start, stop_type, stop);
res = gst_pad_push_event (tagdemux->priv->sinkpad, upstream); res = gst_pad_push_event (tagdemux->priv->sinkpad, upstream);
} }
break; break;

14
gst-libs/gst/video/gstvideodecoder.c
View file

@ -1153,12 +1153,12 @@ gst_video_decoder_src_event_default (GstVideoDecoder * decoder,
GstFormat format; GstFormat format;
gdouble rate; gdouble rate;
GstSeekFlags flags; GstSeekFlags flags;
GstSeekType cur_type, stop_type; GstSeekType start_type, stop_type;
gint64 cur, stop; gint64 start, stop;
gint64 tcur, tstop; gint64 tstart, tstop;
guint32 seqnum; guint32 seqnum;
gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start,
&stop_type, &stop); &stop_type, &stop);
seqnum = gst_event_get_seqnum (event); seqnum = gst_event_get_seqnum (event);
@ -1176,8 +1176,8 @@ gst_video_decoder_src_event_default (GstVideoDecoder * decoder,
/* ... though a non-time seek can be aided as well */ /* ... though a non-time seek can be aided as well */
/* First bring the requested format to time */ /* First bring the requested format to time */
if (!(res = if (!(res =
gst_pad_query_convert (decoder->srcpad, format, cur, gst_pad_query_convert (decoder->srcpad, format, start,
GST_FORMAT_TIME, &tcur))) GST_FORMAT_TIME, &tstart)))
goto convert_error; goto convert_error;
if (!(res = if (!(res =
gst_pad_query_convert (decoder->srcpad, format, stop, gst_pad_query_convert (decoder->srcpad, format, stop,
@ -1186,7 +1186,7 @@ gst_video_decoder_src_event_default (GstVideoDecoder * decoder,
/* then seek with time on the peer */ /* then seek with time on the peer */
event = gst_event_new_seek (rate, GST_FORMAT_TIME, event = gst_event_new_seek (rate, GST_FORMAT_TIME,
flags, cur_type, tcur, stop_type, tstop); flags, start_type, tstart, stop_type, tstop);
gst_event_set_seqnum (event, seqnum); gst_event_set_seqnum (event, seqnum);
res = gst_pad_push_event (decoder->sinkpad, event); res = gst_pad_push_event (decoder->sinkpad, event);

10
gst/gdp/dataprotocol.c
View file

@ -530,8 +530,8 @@ gst_dp_event_from_packet_0_2 (guint header_length, const guint8 * header,
gdouble rate; gdouble rate;
GstFormat format; GstFormat format;
GstSeekFlags flags; GstSeekFlags flags;
GstSeekType cur_type, stop_type; GstSeekType start_type, stop_type;
gint64 cur, stop; gint64 start, stop;
g_return_val_if_fail (payload != NULL, NULL); g_return_val_if_fail (payload != NULL, NULL);
@ -539,12 +539,12 @@ gst_dp_event_from_packet_0_2 (guint header_length, const guint8 * header,
rate = 1.0; rate = 1.0;
format = (GstFormat) GST_READ_UINT32_BE (payload); format = (GstFormat) GST_READ_UINT32_BE (payload);
flags = (GstSeekFlags) GST_READ_UINT32_BE (payload + 4); flags = (GstSeekFlags) GST_READ_UINT32_BE (payload + 4);
cur_type = (GstSeekType) GST_READ_UINT32_BE (payload + 8); start_type = (GstSeekType) GST_READ_UINT32_BE (payload + 8);
cur = (gint64) GST_READ_UINT64_BE (payload + 12); start = (gint64) GST_READ_UINT64_BE (payload + 12);
stop_type = (GstSeekType) GST_READ_UINT32_BE (payload + 20); stop_type = (GstSeekType) GST_READ_UINT32_BE (payload + 20);
stop = (gint64) GST_READ_UINT64_BE (payload + 24); stop = (gint64) GST_READ_UINT64_BE (payload + 24);
event = gst_event_new_seek (rate, format, flags, cur_type, cur, event = gst_event_new_seek (rate, format, flags, start_type, start,
stop_type, stop); stop_type, stop);
GST_EVENT_TIMESTAMP (event) = GST_DP_HEADER_TIMESTAMP (header); GST_EVENT_TIMESTAMP (event) = GST_DP_HEADER_TIMESTAMP (header);
break; break;