diff --git a/ChangeLog b/ChangeLog index 0ce37837af..3c3080416e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,20 @@ 2005-10-19 Wim Taymans - reviewed by: + * check/elements/audioconvert.c: + * docs/libs/tmpl/gstaudio.sgml: + * docs/libs/tmpl/gstcolorbalance.sgml: + * ext/vorbis/vorbisdec.c: (vorbis_dec_sink_event), + (vorbis_handle_identification_packet), (vorbis_handle_data_packet): + * ext/vorbis/vorbisenc.c: (raw_caps_factory): + * gst-libs/gst/audio/audio.c: (gst_audio_structure_set_int): + * gst-libs/gst/audio/audio.h: + * gst/audioconvert/audioconvert.h: + * gst/audioconvert/gstaudioconvert.c: + (gst_audio_convert_parse_caps): + * gst/volume/gstvolume.c: + Bye bye buffer-frames. + +2005-10-19 Wim Taymans * examples/seeking/seek.c: (make_avi_msmpeg4v3_mp3_pipeline), (query_positions_elems), (query_positions_pads), (update_scale), @@ -20,9 +34,7 @@ (dump_element_stats), (main): * gst/playback/test6.c: (main): * gst/sine/gstsinesrc.c: (gst_sinesrc_src_query): - * gst/videotestsrc/gstvideotestsrc.c: - (gst_videotestsrc_class_init), (gst_videotestsrc_negotiate), - (gst_videotestsrc_newsegment): + Query API update. 2005-10-19 Tim-Philipp Müller diff --git a/check/elements/audioconvert.c b/check/elements/audioconvert.c index 96569361ba..36ee2b4080 100644 --- a/check/elements/audioconvert.c +++ b/check/elements/audioconvert.c @@ -37,8 +37,7 @@ GstPad *mysrcpad, *mysinkpad; "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, 8 ], " \ "endianness = (int) BYTE_ORDER, " \ - "width = (int) 32, " \ - "buffer-frames = (int) [ 0, MAX ];" \ + "width = (int) 32;" \ "audio/x-raw-int, " \ "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, 8 ], " \ diff --git a/docs/libs/tmpl/gstaudio.sgml b/docs/libs/tmpl/gstaudio.sgml index 4b91883e4e..33cf785014 100644 --- a/docs/libs/tmpl/gstaudio.sgml +++ b/docs/libs/tmpl/gstaudio.sgml @@ -28,7 +28,6 @@ a support library for audio elements @GST_AUDIO_FIELD_WIDTH: @GST_AUDIO_FIELD_DEPTH: @GST_AUDIO_FIELD_SIGNED: -@GST_AUDIO_FIELD_BUFFER_FRAMES: diff --git a/docs/libs/tmpl/gstcolorbalance.sgml b/docs/libs/tmpl/gstcolorbalance.sgml index 59fb98aa53..6190e66544 100644 --- a/docs/libs/tmpl/gstcolorbalance.sgml +++ b/docs/libs/tmpl/gstcolorbalance.sgml @@ -23,15 +23,6 @@ interface for elements that provide color balance operations - - - - - -@gstcolorbalance: the object which received the signal. -@arg1: -@arg2: - diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c index 8559cda713..9f9651d0ce 100644 --- a/ext/vorbis/vorbisdec.c +++ b/ext/vorbis/vorbisdec.c @@ -60,7 +60,7 @@ GST_STATIC_PAD_TEMPLATE ("src", "layout = \"sequential\", " #endif */ - "width = (int) 32, " "buffer-frames = (int) 0") + "width = (int) 32") ); static GstStaticPadTemplate vorbis_dec_sink_factory = @@ -492,8 +492,7 @@ vorbis_handle_identification_packet (GstVorbisDec * vd) caps = gst_caps_new_simple ("audio/x-raw-float", "rate", G_TYPE_INT, vd->vi.rate, "channels", G_TYPE_INT, vd->vi.channels, - "endianness", G_TYPE_INT, G_BYTE_ORDER, - "width", G_TYPE_INT, 32, "buffer-frames", G_TYPE_INT, 0, NULL); + "endianness", G_TYPE_INT, G_BYTE_ORDER, "width", G_TYPE_INT, 32, NULL); switch (vd->vi.channels) { case 1: diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c index 7850c6b93f..bd0e1cd74b 100644 --- a/ext/vorbis/vorbisenc.c +++ b/ext/vorbis/vorbisenc.c @@ -205,8 +205,7 @@ raw_caps_factory (void) gst_caps_new_simple ("audio/x-raw-float", "rate", GST_TYPE_INT_RANGE, 8000, 50000, "channels", GST_TYPE_INT_RANGE, 1, 2, - "endianness", G_TYPE_INT, G_BYTE_ORDER, - "width", G_TYPE_INT, 32, "buffer-frames", G_TYPE_INT, 0, NULL); + "endianness", G_TYPE_INT, G_BYTE_ORDER, "width", G_TYPE_INT, 32, NULL); } static void diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c index e86992556a..f82337a5da 100644 --- a/gst-libs/gst/audio/audio.c +++ b/gst-libs/gst/audio/audio.c @@ -260,7 +260,4 @@ gst_audio_structure_set_int (GstStructure * structure, GstAudioFieldFlag flag) if (flag & GST_AUDIO_FIELD_SIGNED) _gst_audio_structure_set_list (structure, "signed", G_TYPE_BOOLEAN, 2, TRUE, FALSE, NULL); - if (flag & GST_AUDIO_FIELD_BUFFER_FRAMES) - gst_structure_set (structure, "buffer-frames", GST_TYPE_INT_RANGE, 1, - G_MAXINT, NULL); } diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index 4ec9320728..3821c82e5c 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -83,8 +83,7 @@ G_BEGIN_DECLS "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, MAX ], " \ "endianness = (int) { LITTLE_ENDIAN , BIG_ENDIAN }, " \ - "width = (int) { 32, 64 }, " \ - "buffer-frames = (int) [ 1, MAX]" + "width = (int) { 32, 64 }" /* "standard" float audio is native order, 32 bit mono. */ #define GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS \ @@ -92,8 +91,7 @@ G_BEGIN_DECLS "width = (int) 32, " \ "rate = (int) [ 1, MAX ], " \ "channels = (int) 1, " \ - "endianness = (int) BYTE_ORDER, " \ - "buffer-frames = (int) [ 1, MAX]" + "endianness = (int) BYTE_ORDER" /* * this library defines and implements some helper functions for audio @@ -126,7 +124,6 @@ typedef enum { GST_AUDIO_FIELD_WIDTH = (1 << 3), GST_AUDIO_FIELD_DEPTH = (1 << 4), GST_AUDIO_FIELD_SIGNED = (1 << 5), - GST_AUDIO_FIELD_BUFFER_FRAMES = (1 << 6) } GstAudioFieldFlag; void gst_audio_structure_set_int (GstStructure *structure, GstAudioFieldFlag flag); diff --git a/gst/audioconvert/audioconvert.h b/gst/audioconvert/audioconvert.h index a2bd9dc52a..6768c40235 100644 --- a/gst/audioconvert/audioconvert.h +++ b/gst/audioconvert/audioconvert.h @@ -42,9 +42,6 @@ struct _AudioConvertFmt gboolean sign; gint depth; - /* float audio caps */ - gint buffer_frames; - gint unit_size; }; diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 2ae77c9add..4bf7a72695 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -123,8 +123,7 @@ GST_STATIC_CAPS ( \ "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, 8 ], " \ "endianness = (int) BYTE_ORDER, " \ - "width = (int) 32, " \ - "buffer-frames = (int) [ 0, MAX ];" \ + "width = (int) 32;" \ "audio/x-raw-int, " \ "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, 8 ], " \ @@ -273,11 +272,6 @@ gst_audio_convert_parse_caps (const GstCaps * caps, AudioConvertFmt * fmt) /* depth cannot be bigger than the width */ if (fmt->depth > fmt->width) goto not_allowed; - } else { - /* float specific fields */ - if (!gst_structure_get_int (structure, "buffer-frames", - &fmt->buffer_frames)) - goto no_values; } fmt->unit_size = (fmt->width * fmt->channels) / 8; diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c index fb06b4f29d..c137fca75e 100644 --- a/gst/volume/gstvolume.c +++ b/gst/volume/gstvolume.c @@ -93,8 +93,7 @@ static GstStaticPadTemplate volume_sink_template = "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ], " "endianness = (int) BYTE_ORDER, " - "width = (int) 32, " - "buffer-frames = (int) [ 0, MAX]; " + "width = (int) 32; " "audio/x-raw-int, " "channels = (int) [ 1, MAX ], " "rate = (int) [ 1, MAX ], " @@ -110,8 +109,7 @@ static GstStaticPadTemplate volume_src_template = GST_STATIC_PAD_TEMPLATE "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ], " "endianness = (int) BYTE_ORDER, " - "width = (int) 32, " - "buffer-frames = (int) [ 0, MAX]; " + "width = (int) 32; " "audio/x-raw-int, " "channels = (int) [ 1, MAX ], " "rate = (int) [ 1, MAX ], " diff --git a/tests/check/elements/audioconvert.c b/tests/check/elements/audioconvert.c index 96569361ba..36ee2b4080 100644 --- a/tests/check/elements/audioconvert.c +++ b/tests/check/elements/audioconvert.c @@ -37,8 +37,7 @@ GstPad *mysrcpad, *mysinkpad; "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, 8 ], " \ "endianness = (int) BYTE_ORDER, " \ - "width = (int) 32, " \ - "buffer-frames = (int) [ 0, MAX ];" \ + "width = (int) 32;" \ "audio/x-raw-int, " \ "rate = (int) [ 1, MAX ], " \ "channels = (int) [ 1, 8 ], " \