From: Thomas Vander Stichele Date: Tue, 22 Nov 2005 13:14:07 +0000 (+0000) Subject: remove some deprecated functions X-Git-Tag: 1.19.3~511^2~12495 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08cd3b973fefc94f774b2dc30297a8543691a46a;p=platform%2Fupstream%2Fgstreamer.git remove some deprecated functions Original commit message from CVS: remove some deprecated functions --- diff --git a/ChangeLog b/ChangeLog index ad95863..87f9362 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-22 Thomas Vander Stichele + + * gst-libs/gst/audio/audio.c: + * gst-libs/gst/audio/audio.h: + remove some deprecated functions + 2005-11-22 Andy Wingo * Update for gst_tag_setter API changes. diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c index 20e9f91..3d67d11 100644 --- a/gst-libs/gst/audio/audio.c +++ b/gst-libs/gst/audio/audio.c @@ -78,75 +78,6 @@ gst_audio_frame_length (GstPad * pad, GstBuffer * buf) return GST_BUFFER_SIZE (buf) / frame_byte_size; } -long -gst_audio_frame_rate (GstPad * pad) -/* - * calculate frame rate (based on caps of pad) - * returns 0 if failed, rate if success - */ -{ - const GstCaps *caps = NULL; - gint rate; - GstStructure *structure; - - /* get caps of pad */ - caps = GST_PAD_CAPS (pad); - - if (caps == NULL) { - /* ERROR: could not get caps of pad */ - g_warning ("gstaudio: could not get caps of pad %s:%s\n", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); - return 0; - } else { - structure = gst_caps_get_structure (caps, 0); - gst_structure_get_int (structure, "rate", &rate); - return rate; - } -} - -double -gst_audio_length (GstPad * pad, GstBuffer * buf) -{ -/* calculate length in seconds - * of audio buffer buf - * based on capabilities of pad - */ - - long bytes = 0; - int width = 0; - int channels = 0; - int rate = 0; - - double length; - - const GstCaps *caps = NULL; - GstStructure *structure; - - g_assert (GST_IS_BUFFER (buf)); - /* get caps of pad */ - caps = GST_PAD_CAPS (pad); - if (caps == NULL) { - /* ERROR: could not get caps of pad */ - g_warning ("gstaudio: could not get caps of pad %s:%s\n", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); - length = 0.0; - } else { - structure = gst_caps_get_structure (caps, 0); - bytes = GST_BUFFER_SIZE (buf); - gst_structure_get_int (structure, "width", &width); - gst_structure_get_int (structure, "channels", &channels); - gst_structure_get_int (structure, "rate", &rate); - - g_assert (bytes != 0); - g_assert (width != 0); - g_assert (channels != 0); - g_assert (rate != 0); - length = (bytes * 8.0) / (double) (rate * channels * width); - } - /* g_print ("DEBUG: audio: returning length of %f\n", length); */ - return length; -} - GstClockTime gst_audio_duration_from_pad_buffer (GstPad * pad, GstBuffer * buf) { @@ -189,33 +120,6 @@ gst_audio_duration_from_pad_buffer (GstPad * pad, GstBuffer * buf) return length; } -long -gst_audio_highest_sample_value (GstPad * pad) -/* calculate highest possible sample value - * based on capabilities of pad - */ -{ - gboolean is_signed = FALSE; - gint width = 0; - const GstCaps *caps = NULL; - GstStructure *structure; - - caps = GST_PAD_CAPS (pad); - if (caps == NULL) { - g_warning ("gstaudio: could not get caps of pad %s:%s\n", - GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); - } - - structure = gst_caps_get_structure (caps, 0); - gst_structure_get_int (structure, "width", &width); - gst_structure_get_boolean (structure, "signed", &is_signed); - - if (is_signed) - --width; - /* example : 16 bit, signed : samples between -32768 and 32767 */ - return ((long) (1 << width)); -} - gboolean gst_audio_is_buffer_framed (GstPad * pad, GstBuffer * buf) /* check if the buffer size is a whole multiple of the frame size */ diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index 94035af..b9a12a3 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -104,17 +104,8 @@ int gst_audio_frame_byte_size (GstPad* pad); /* get length in frames of buffer */ long gst_audio_frame_length (GstPad* pad, GstBuffer* buf); -/* get frame rate based on caps */ -long gst_audio_frame_rate (GstPad *pad); - -/* calculate length in seconds of audio buffer buf based on caps of pad */ -double gst_audio_length (GstPad* pad, GstBuffer* buf); - GstClockTime gst_audio_duration_from_pad_buffer (GstPad * pad, GstBuffer * buf); -/* calculate highest possible sample value based on capabilities of pad */ -long gst_audio_highest_sample_value (GstPad* pad); - /* check if the buffer size is a whole multiple of the frame size */ gboolean gst_audio_is_buffer_framed (GstPad* pad, GstBuffer* buf);