diff options
| -rw-r--r-- | gst/avi/gstavidemux.c | 22 | ||||
| -rw-r--r-- | sys/oss/gstosssink.c | 6 |
2 files changed, 8 insertions, 20 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 0ee9dc0c..1639d040 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -755,15 +755,10 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstPadQueryType type, else res = FALSE; break; - case GST_FORMAT_SAMPLES: + case GST_FORMAT_UNIT: if (stream->strh.type == GST_RIFF_FCC_auds) *value = stream->strh.length * stream->strh.samplesize; - else - res = FALSE; - break; - case GST_FORMAT_FRAMES: - case GST_FORMAT_FIELDS: - if (stream->strh.type == GST_RIFF_FCC_vids) + else if (stream->strh.type == GST_RIFF_FCC_vids) *value = stream->strh.length; else res = FALSE; @@ -787,15 +782,10 @@ gst_avi_demux_handle_src_query (GstPad *pad, GstPadQueryType type, case GST_FORMAT_BYTES: *value = stream->current_byte; break; - case GST_FORMAT_SAMPLES: + case GST_FORMAT_UNIT: if (stream->strh.type == GST_RIFF_FCC_auds) *value = stream->current_byte * stream->strh.samplesize; - else - res = FALSE; - break; - case GST_FORMAT_FRAMES: - case GST_FORMAT_FIELDS: - if (stream->strh.type == GST_RIFF_FCC_vids) + else if (stream->strh.type == GST_RIFF_FCC_vids) *value = stream->current_frame; else res = FALSE; @@ -890,9 +880,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event) case GST_EVENT_SEEK: switch (GST_EVENT_SEEK_FORMAT (event)) { case GST_FORMAT_BYTES: - case GST_FORMAT_SAMPLES: - case GST_FORMAT_FRAMES: - case GST_FORMAT_FIELDS: + case GST_FORMAT_UNIT: break; case GST_FORMAT_TIME: { diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index 831c24e6..c0bc4bd3 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -595,7 +595,7 @@ gst_osssink_convert (GstPad *pad, GstFormat src_format, gint64 src_value, case GST_FORMAT_TIME: *dest_value = src_value * GST_SECOND / osssink->bps; break; - case GST_FORMAT_SAMPLES: + case GST_FORMAT_UNIT: *dest_value = src_value / (osssink->channels * osssink->width); break; default: @@ -609,14 +609,14 @@ gst_osssink_convert (GstPad *pad, GstFormat src_format, gint64 src_value, case GST_FORMAT_BYTES: *dest_value = src_value * osssink->bps / GST_SECOND; break; - case GST_FORMAT_SAMPLES: + case GST_FORMAT_UNIT: *dest_value = osssink->frequency; break; default: res = FALSE; } break; - case GST_FORMAT_SAMPLES: + case GST_FORMAT_UNIT: switch (*dest_format) { case GST_FORMAT_DEFAULT: *dest_format = GST_FORMAT_TIME; |