summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gst-libs/gst/audio/audio.h152
-rw-r--r--gst/volume/gstvolume.c6
-rw-r--r--gst/volume/gstvolume.h1
-rw-r--r--tests/old/testsuite/alsa/formats.c6
-rw-r--r--tests/old/testsuite/alsa/sinesrc.c26
-rw-r--r--testsuite/alsa/formats.c6
-rw-r--r--testsuite/alsa/sinesrc.c26
7 files changed, 99 insertions, 124 deletions
diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h
index a737e4680..c22052f5d 100644
--- a/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@ -22,78 +22,97 @@
#include <gst/audio/audioclock.h>
+G_BEGIN_DECLS
+
/* For people that are looking at this source: the purpose of these defines is
* to make GstCaps a bit easier, in that you don't have to know all of the
* properties that need to be defined. you can just use these macros. currently
* (8/01) the only plugins that use these are the passthrough, speed, volume,
- * adder, and [de]interleave plugins.
- * These are for convenience only, and do not specify the 'limits' of
- * GStreamer. you might also use these definitions as a
+ * adder, and [de]interleave plugins. These are for convenience only, and do not
+ * specify the 'limits' of GStreamer. you might also use these definitions as a
* base for making your own caps, if need be.
*
- * For example, to make a source pad that can output mono streams of either
- * float or int:
-
- template = gst_pad_template_new
- ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
- gst_caps_append(gst_caps_new ("sink_int", "audio/raw",
- GST_AUDIO_INT_PAD_TEMPLATE_PROPS),
- gst_caps_new ("sink_float", "audio/raw",
- GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS)),
- NULL);
-
- srcpad = gst_pad_new_from_template(template,"src");
-
- * Andy Wingo, 18 August 2001
+ * For example, to make a source pad that can output streams of either mono
+ * float or any channel int:
+ *
+ * template = gst_pad_template_new
+ * ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+ * gst_caps_append(gst_caps_new ("sink_int", "audio/x-raw-int",
+ * GST_AUDIO_INT_PAD_TEMPLATE_PROPS),
+ * gst_caps_new ("sink_float", "audio/x-raw-float",
+ * GST_AUDIO_FLOAT_PAD_TEMPLATE_PROPS)),
+ * NULL);
+ *
+ * sinkpad = gst_pad_new_from_template(template, "sink");
+ *
+ * Andy Wingo, 18 August 2001
* Thomas, 6 September 2002 */
-/* a few useful defines for arbitrary limits */
-#define GST_AUDIO_MIN_RATE 4000
-#define GST_AUDIO_MAX_RATE 96000
-#define GST_AUDIO_DEF_RATE 44100
+#define GST_AUDIO_DEF_RATE 44100
#define GST_AUDIO_INT_PAD_TEMPLATE_PROPS \
- gst_props_new (\
- "endianness", GST_PROPS_INT (G_BYTE_ORDER),\
- "signed", GST_PROPS_LIST (\
- GST_PROPS_BOOLEAN (TRUE),\
- GST_PROPS_BOOLEAN (FALSE)\
- ),\
- "width", GST_PROPS_LIST (GST_PROPS_INT (8), \
- GST_PROPS_INT (16)), \
- "depth", GST_PROPS_LIST (GST_PROPS_INT (8), \
- GST_PROPS_INT (16)),\
- "rate", GST_PROPS_INT_RANGE (GST_AUDIO_MIN_RATE, \
- GST_AUDIO_MAX_RATE),\
- "channels", GST_PROPS_INT_RANGE (1, G_MAXINT),\
- NULL)
+ gst_props_new (\
+ "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ "channels", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ "endianness", GST_PROPS_LIST (\
+ GST_PROPS_INT (G_LITTLE_ENDIAN),\
+ GST_PROPS_INT (G_BIG_ENDIAN)\
+ ),\
+ "width", GST_PROPS_LIST (\
+ GST_PROPS_INT (8),\
+ GST_PROPS_INT (16),\
+ GST_PROPS_INT (32)\
+ ),\
+ "depth", GST_PROPS_INT_RANGE (1, 32),\
+ "signed", GST_PROPS_LIST (\
+ GST_PROPS_BOOLEAN (TRUE),\
+ GST_PROPS_BOOLEAN (FALSE)\
+ ),\
+ NULL)
#define GST_AUDIO_INT_MONO_PAD_TEMPLATE_PROPS \
- gst_props_new (\
- "endianness", GST_PROPS_INT (G_BYTE_ORDER),\
- "signed", GST_PROPS_LIST (\
- GST_PROPS_BOOLEAN (TRUE),\
- GST_PROPS_BOOLEAN (FALSE)\
- ),\
- "width", GST_PROPS_LIST (GST_PROPS_INT (8), \
- GST_PROPS_INT (16)),\
- "depth", GST_PROPS_LIST (GST_PROPS_INT (8), \
- GST_PROPS_INT (16)),\
- "rate", GST_PROPS_INT_RANGE (GST_AUDIO_MIN_RATE, \
- GST_AUDIO_MAX_RATE),\
- "channels", GST_PROPS_INT (1),\
- NULL)
-
-#define GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS \
- gst_props_new (\
- "depth", GST_PROPS_INT (32),\
- "endianness", GST_PROPS_INT (G_BYTE_ORDER),\
- "intercept", GST_PROPS_FLOAT (0.0),\
- "slope", GST_PROPS_FLOAT (1.0),\
- "rate", GST_PROPS_INT_RANGE (GST_AUDIO_MIN_RATE, \
- GST_AUDIO_MAX_RATE),\
- "channels", GST_PROPS_INT (1),\
- NULL)
+ gst_props_new (\
+ "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ "channels", GST_PROPS_INT (1),\
+ "endianness", GST_PROPS_LIST (\
+ GST_PROPS_INT (G_LITTLE_ENDIAN),\
+ GST_PROPS_INT (G_BIG_ENDIAN)\
+ ),\
+ "width", GST_PROPS_LIST (\
+ GST_PROPS_INT (8),\
+ GST_PROPS_INT (16),\
+ GST_PROPS_INT (32)\
+ ),\
+ "depth", GST_PROPS_INT_RANGE (1, 32),\
+ "signed", GST_PROPS_LIST (\
+ GST_PROPS_BOOLEAN (TRUE),\
+ GST_PROPS_BOOLEAN (FALSE)\
+ ),\
+ NULL)
+
+#define GST_AUDIO_FLOAT_PAD_TEMPLATE_PROPS \
+ gst_props_new (\
+ "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ "channels", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ "endianness", GST_PROPS_LIST (\
+ GST_PROPS_INT (G_LITTLE_ENDIAN),\
+ GST_PROPS_INT (G_BIG_ENDIAN)\
+ ),\
+ "width", GST_PROPS_LIST (\
+ GST_PROPS_INT (32),\
+ GST_PROPS_INT (64)\
+ ),\
+ "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ NULL)
+
+#define GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS \
+ gst_props_new (\
+ "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ "channels", GST_PROPS_INT (1),\
+ "endianness", GST_PROPS_INT (G_BYTE_ORDER),\
+ "width", GST_PROPS_INT (32),\
+ "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),\
+ NULL)
/*
* this library defines and implements some helper functions for audio
@@ -101,21 +120,22 @@
*/
/* get byte size of audio frame (based on caps of pad */
-int gst_audio_frame_byte_size (GstPad* pad);
+int gst_audio_frame_byte_size (GstPad* pad);
/* get length in frames of buffer */
-long gst_audio_frame_length (GstPad* pad, GstBuffer* buf);
+long gst_audio_frame_length (GstPad* pad, GstBuffer* buf);
/* get frame rate based on caps */
-long gst_audio_frame_rate (GstPad *pad);
+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);
+double gst_audio_length (GstPad* pad, GstBuffer* buf);
/* calculate highest possible sample value based on capabilities of pad */
-long gst_audio_highest_sample_value (GstPad* 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);
+gboolean gst_audio_is_buffer_framed (GstPad* pad, GstBuffer* buf);
+G_END_DECLS
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 13c3fc7b1..1de1a5921 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -60,7 +60,7 @@ GST_PAD_TEMPLATE_FACTORY (volume_sink_factory,
gst_caps_new (
"volume_float_sink",
"audio/x-raw-float",
- GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS
+ GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
),
GST_CAPS_NEW (
"volume_int_sink",
@@ -81,8 +81,8 @@ GST_PAD_TEMPLATE_FACTORY (volume_src_factory,
gst_caps_new (
"volume_float_src",
"audio/x-raw-float",
- GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS
- ),
+ GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS
+ ),
GST_CAPS_NEW (
"volume_int_src",
"audio/x-raw-int",
diff --git a/gst/volume/gstvolume.h b/gst/volume/gstvolume.h
index 13d33af33..769d8ad42 100644
--- a/gst/volume/gstvolume.h
+++ b/gst/volume/gstvolume.h
@@ -62,7 +62,6 @@ struct _GstVolume {
gboolean mute;
gint volume_i, real_vol_i;
gfloat volume_f, real_vol_f;
-
};
struct _GstVolumeClass {
diff --git a/tests/old/testsuite/alsa/formats.c b/tests/old/testsuite/alsa/formats.c
index 93ed4e295..1a2bc0b82 100644
--- a/tests/old/testsuite/alsa/formats.c
+++ b/tests/old/testsuite/alsa/formats.c
@@ -124,11 +124,7 @@ create_pipeline (void)
default:
g_assert_not_reached ();
}
- g_print ("Setting format to: format: \"float\"\n"
- " layout: \"%s\"\n"
- " intercept: 0\n"
- " slope: 1\n",
- sinesrc->width == 32 ? "gfloat" : "gdouble");
+ g_print ("Setting format to float width %d\n", sinesrc->width);
} else if (last < NUMBER_OF_INT_TESTS + NUMBER_OF_FLOAT_TESTS + NUMBER_OF_LAW_TESTS) {
gint temp = last - NUMBER_OF_INT_TESTS - NUMBER_OF_FLOAT_TESTS;
GstElement *law;
diff --git a/tests/old/testsuite/alsa/sinesrc.c b/tests/old/testsuite/alsa/sinesrc.c
index 7e2cf3a01..26199fa3d 100644
--- a/tests/old/testsuite/alsa/sinesrc.c
+++ b/tests/old/testsuite/alsa/sinesrc.c
@@ -31,7 +31,6 @@ GST_PAD_TEMPLATE_FACTORY (sinesrc_src_factory,
GST_CAPS_NEW (
"sinesrc_int_src",
"audio/raw",
- "format", GST_PROPS_STRING ("int"),
"law", GST_PROPS_INT (0),
"endianness", GST_PROPS_LIST (GST_PROPS_INT (G_LITTLE_ENDIAN), GST_PROPS_INT (G_BIG_ENDIAN)),
"signed", GST_PROPS_LIST (GST_PROPS_BOOLEAN (FALSE), GST_PROPS_BOOLEAN (TRUE)),
@@ -43,12 +42,8 @@ GST_PAD_TEMPLATE_FACTORY (sinesrc_src_factory,
GST_CAPS_NEW (
"sinesrc_float_src",
"audio/raw",
- "format", GST_PROPS_STRING ("float"),
- "layout", GST_PROPS_LIST (GST_PROPS_STRING ("gfloat"), GST_PROPS_STRING ("gdouble")),
- "intercept", GST_PROPS_FLOAT (0),
- "slope", GST_PROPS_FLOAT (1),
"channels", GST_PROPS_INT_RANGE (1, 16)
- )
+ )
);
static GstElementClass *parent_class = NULL;
@@ -123,10 +118,8 @@ sinesrc_force_caps (SineSrc *src) {
caps = GST_CAPS_NEW (
"sinesrc_src_caps",
"audio/raw",
- "format", GST_PROPS_STRING ("int"),
"law", GST_PROPS_INT (0),
"signed", GST_PROPS_BOOLEAN (src->sign),
- "width", GST_PROPS_INT (src->width),
"depth", GST_PROPS_INT (src->depth)
);
if (src->width > 8)
@@ -139,26 +132,15 @@ sinesrc_force_caps (SineSrc *src) {
caps = GST_CAPS_NEW (
"sinesrc_src_caps",
"audio/raw",
- "format", GST_PROPS_STRING ("float"),
- "intercept", GST_PROPS_FLOAT (0),
- "slope", GST_PROPS_FLOAT (1)
+ "endianness", GST_PROPS_INT(src->endianness)
);
- if (src->width == 32) {
- gst_props_add_entry (gst_caps_get_props (caps),
- gst_props_entry_new ("layout",
- GST_PROPS_STRING ("gfloat")));
- } else if (src->width == 64) {
- gst_props_add_entry (gst_caps_get_props (caps),
- gst_props_entry_new ("layout",
- GST_PROPS_STRING ("gdouble")));
- } else {
- g_assert_not_reached ();
- }
break;
default:
g_assert_not_reached();
}
gst_props_add_entry (gst_caps_get_props (caps),
+ gst_props_entry_new ("width", GST_PROPS_INT (src->width)));
+ gst_props_add_entry (gst_caps_get_props (caps),
gst_props_entry_new ("rate", GST_PROPS_INT (src->rate)));
gst_props_add_entry (gst_caps_get_props (caps),
gst_props_entry_new ("channels", GST_PROPS_INT (src->channels)));
diff --git a/testsuite/alsa/formats.c b/testsuite/alsa/formats.c
index 93ed4e295..1a2bc0b82 100644
--- a/testsuite/alsa/formats.c
+++ b/testsuite/alsa/formats.c
@@ -124,11 +124,7 @@ create_pipeline (void)
default:
g_assert_not_reached ();
}
- g_print ("Setting format to: format: \"float\"\n"
- " layout: \"%s\"\n"
- " intercept: 0\n"
- " slope: 1\n",
- sinesrc->width == 32 ? "gfloat" : "gdouble");
+ g_print ("Setting format to float width %d\n", sinesrc->width);
} else if (last < NUMBER_OF_INT_TESTS + NUMBER_OF_FLOAT_TESTS + NUMBER_OF_LAW_TESTS) {
gint temp = last - NUMBER_OF_INT_TESTS - NUMBER_OF_FLOAT_TESTS;
GstElement *law;
diff --git a/testsuite/alsa/sinesrc.c b/testsuite/alsa/sinesrc.c
index 7e2cf3a01..26199fa3d 100644
--- a/testsuite/alsa/sinesrc.c
+++ b/testsuite/alsa/sinesrc.c
@@ -31,7 +31,6 @@ GST_PAD_TEMPLATE_FACTORY (sinesrc_src_factory,
GST_CAPS_NEW (
"sinesrc_int_src",
"audio/raw",
- "format", GST_PROPS_STRING ("int"),
"law", GST_PROPS_INT (0),
"endianness", GST_PROPS_LIST (GST_PROPS_INT (G_LITTLE_ENDIAN), GST_PROPS_INT (G_BIG_ENDIAN)),
"signed", GST_PROPS_LIST (GST_PROPS_BOOLEAN (FALSE), GST_PROPS_BOOLEAN (TRUE)),
@@ -43,12 +42,8 @@ GST_PAD_TEMPLATE_FACTORY (sinesrc_src_factory,
GST_CAPS_NEW (
"sinesrc_float_src",
"audio/raw",
- "format", GST_PROPS_STRING ("float"),
- "layout", GST_PROPS_LIST (GST_PROPS_STRING ("gfloat"), GST_PROPS_STRING ("gdouble")),
- "intercept", GST_PROPS_FLOAT (0),
- "slope", GST_PROPS_FLOAT (1),
"channels", GST_PROPS_INT_RANGE (1, 16)
- )
+ )
);
static GstElementClass *parent_class = NULL;
@@ -123,10 +118,8 @@ sinesrc_force_caps (SineSrc *src) {
caps = GST_CAPS_NEW (
"sinesrc_src_caps",
"audio/raw",
- "format", GST_PROPS_STRING ("int"),
"law", GST_PROPS_INT (0),
"signed", GST_PROPS_BOOLEAN (src->sign),
- "width", GST_PROPS_INT (src->width),
"depth", GST_PROPS_INT (src->depth)
);
if (src->width > 8)
@@ -139,26 +132,15 @@ sinesrc_force_caps (SineSrc *src) {
caps = GST_CAPS_NEW (
"sinesrc_src_caps",
"audio/raw",
- "format", GST_PROPS_STRING ("float"),
- "intercept", GST_PROPS_FLOAT (0),
- "slope", GST_PROPS_FLOAT (1)
+ "endianness", GST_PROPS_INT(src->endianness)
);
- if (src->width == 32) {
- gst_props_add_entry (gst_caps_get_props (caps),
- gst_props_entry_new ("layout",
- GST_PROPS_STRING ("gfloat")));
- } else if (src->width == 64) {
- gst_props_add_entry (gst_caps_get_props (caps),
- gst_props_entry_new ("layout",
- GST_PROPS_STRING ("gdouble")));
- } else {
- g_assert_not_reached ();
- }
break;
default:
g_assert_not_reached();
}
gst_props_add_entry (gst_caps_get_props (caps),
+ gst_props_entry_new ("width", GST_PROPS_INT (src->width)));
+ gst_props_add_entry (gst_caps_get_props (caps),
gst_props_entry_new ("rate", GST_PROPS_INT (src->rate)));
gst_props_add_entry (gst_caps_get_props (caps),
gst_props_entry_new ("channels", GST_PROPS_INT (src->channels)));
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 13:31:33 +0000