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

speex: update for position/query/convert API changes

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-07-28 11:09:08 +01:00
parent b843f8f99c
commit ab62599832
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/speex/gstspeexdec.c
View file

@ -376,6 +376,7 @@ speex_dec_src_query (GstPad * pad, GstQuery * query)
dec = GST_SPEEX_DEC (gst_pad_get_parent (pad));
/* FIXME: why not just pass position/duration queries upstream to demuxer? */
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:{
GstSegment segment;
@ -400,11 +401,11 @@ speex_dec_src_query (GstPad * pad, GstQuery * query)
break;
}
case GST_QUERY_DURATION:{
GstFormat format = GST_FORMAT_TIME;
GstFormat format;
gint64 dur;
/* get duration from demuxer */
if (!gst_pad_query_peer_duration (dec->sinkpad, &format, &dur))
if (!gst_pad_query_peer_duration (dec->sinkpad, GST_FORMAT_TIME, &dur))
break;
gst_query_parse_duration (query, &format, NULL);

34
ext/speex/gstspeexenc.c
View file

@ -291,7 +291,7 @@ gst_speex_enc_sink_getcaps (GstPad * pad, GstCaps * filter)
static gboolean
gst_speex_enc_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
GstFormat * dest_format, gint64 * dest_value)
GstFormat dest_format, gint64 * dest_value)
{
gboolean res = TRUE;
GstSpeexEnc *enc;
@ -306,7 +306,7 @@ gst_speex_enc_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
switch (src_format) {
case GST_FORMAT_BYTES:
switch (*dest_format) {
switch (dest_format) {
case GST_FORMAT_TIME:
*dest_value = src_value * GST_SECOND / avg;
break;
@ -315,7 +315,7 @@ gst_speex_enc_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value,
}
break;
case GST_FORMAT_TIME:
switch (*dest_format) {
switch (dest_format) {
case GST_FORMAT_BYTES:
*dest_value = src_value * avg / GST_SECOND;
break;
@ -430,44 +430,44 @@ gst_speex_enc_src_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:
{
GstFormat fmt, req_fmt;
GstFormat req_fmt;
gint64 pos, val;
gst_query_parse_position (query, &req_fmt, NULL);
if ((res = gst_pad_query_peer_position (enc->sinkpad, &req_fmt, &val))) {
if ((res = gst_pad_query_peer_position (enc->sinkpad, req_fmt, &val))) {
gst_query_set_position (query, req_fmt, val);
break;
}
fmt = GST_FORMAT_TIME;
if (!(res = gst_pad_query_peer_position (enc->sinkpad, &fmt, &pos)))
res = gst_pad_query_peer_position (enc->sinkpad, GST_FORMAT_TIME, &pos);
if (!res)
break;
if ((res =
gst_pad_query_peer_convert (enc->sinkpad, fmt, pos, &req_fmt,
&val)))
gst_pad_query_peer_convert (enc->sinkpad, GST_FORMAT_TIME, pos,
req_fmt, &val))) {
gst_query_set_position (query, req_fmt, val);
}
break;
}
case GST_QUERY_DURATION:
{
GstFormat fmt, req_fmt;
GstFormat req_fmt;
gint64 dur, val;
gst_query_parse_duration (query, &req_fmt, NULL);
if ((res = gst_pad_query_peer_duration (enc->sinkpad, &req_fmt, &val))) {
if ((res = gst_pad_query_peer_duration (enc->sinkpad, req_fmt, &val))) {
gst_query_set_duration (query, req_fmt, val);
break;
}
fmt = GST_FORMAT_TIME;
if (!(res = gst_pad_query_peer_duration (enc->sinkpad, &fmt, &dur)))
res = gst_pad_query_peer_duration (enc->sinkpad, GST_FORMAT_TIME, &dur);
if (!res)
break;
if ((res =
gst_pad_query_peer_convert (enc->sinkpad, fmt, dur, &req_fmt,
&val))) {
gst_pad_query_peer_convert (enc->sinkpad, GST_FORMAT_TIME, dur,
req_fmt, &val))) {
gst_query_set_duration (query, req_fmt, val);
}
break;
@ -478,7 +478,7 @@ gst_speex_enc_src_query (GstPad * pad, GstQuery * query)
gint64 src_val, dest_val;
gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
if (!(res = gst_speex_enc_convert_src (pad, src_fmt, src_val, &dest_fmt,
if (!(res = gst_speex_enc_convert_src (pad, src_fmt, src_val, dest_fmt,
&dest_val)))
goto error;
gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);