mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 23:58:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/audiofxgood/audiopanorama.*: Added float support (thanks cymax)

Browse source 
Original commit message from CVS:
* gst/audiofxgood/audiopanorama.c: (gst_audio_panorama_set_caps),
(gst_audio_panorama_transform_m2s_int),
(gst_audio_panorama_transform_s2s_int),
(gst_audio_panorama_transform_m2s_float),
(gst_audio_panorama_transform_s2s_float),
(gst_audio_panorama_transform):
* gst/audiofxgood/audiopanorama.h:
Added float support (thanks cymax)
This commit is contained in:
Stefan Kost 2006-08-24 18:17:20 +00:00
parent bd5e70ea40
commit 3473ecd7af
5 changed files with 217 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2006-08-24 Stefan Kost <ensonic@users.sf.net>
* gst/audiofxgood/audiopanorama.c: (gst_audio_panorama_set_caps),
(gst_audio_panorama_transform_m2s_int),
(gst_audio_panorama_transform_s2s_int),
(gst_audio_panorama_transform_m2s_float),
(gst_audio_panorama_transform_s2s_float),
(gst_audio_panorama_transform):
* gst/audiofxgood/audiopanorama.h:
Added float support (thanks cymax)
2006-08-24 Stefan Kost <ensonic@users.sf.net> 2006-08-24 Stefan Kost <ensonic@users.sf.net>
* gst/audiofxgood/audiopanorama.c: * gst/audiofxgood/audiopanorama.c:

112
gst/audiofx/audiopanorama.c
View file

@ -29,6 +29,7 @@
* <programlisting> * <programlisting>
* gst-launch audiotestsrc wave=saw ! audiopanorama panorama=-100 ! alsasink * gst-launch audiotestsrc wave=saw ! audiopanorama panorama=-100 ! alsasink
* gst-launch filesrc location="melo1.ogg" ! oggdemux ! vorbisdec ! audioconvert ! audiopanorama panorama=-100 ! alsasink * gst-launch filesrc location="melo1.ogg" ! oggdemux ! vorbisdec ! audioconvert ! audiopanorama panorama=-100 ! alsasink
* gst-launch audiotestsrc wave=saw ! audioconvert ! audiopanorama panorama=-100 ! audioconvert ! alsasink
* </programlisting> * </programlisting>
* </para> * </para>
* </refsect2> * </refsect2>
@ -71,7 +72,12 @@ enum
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, " GST_STATIC_CAPS ("audio/x-raw-float, "
"rate = (int) [ 1, MAX ], "
"channels = (int) [ 1, 2 ], "
"endianness = (int) BYTE_ORDER, "
"width = (int) 32, " "signed = (boolean) true; "
"audio/x-raw-int, "
"rate = (int) [ 1, MAX ], " "rate = (int) [ 1, MAX ], "
"channels = (int) [ 1, 2 ], " "channels = (int) [ 1, 2 ], "
"endianness = (int) BYTE_ORDER, " "endianness = (int) BYTE_ORDER, "
@ -81,7 +87,12 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, " GST_STATIC_CAPS ("audio/x-raw-float, "
"rate = (int) [ 1, MAX ], "
"channels = (int) 2, "
"endianness = (int) BYTE_ORDER, "
"width = (int) 32, " "signed = (boolean) true; "
"audio/x-raw-int, "
"rate = (int) [ 1, MAX ], " "rate = (int) [ 1, MAX ], "
"channels = (int) 2, " "channels = (int) 2, "
"endianness = (int) BYTE_ORDER, " "endianness = (int) BYTE_ORDER, "
@ -106,10 +117,14 @@ static GstCaps *gst_audio_panorama_transform_caps (GstBaseTransform * base,
static gboolean gst_audio_panorama_set_caps (GstBaseTransform * base, static gboolean gst_audio_panorama_set_caps (GstBaseTransform * base,
GstCaps * incaps, GstCaps * outcaps); GstCaps * incaps, GstCaps * outcaps);
static void gst_audio_panorama_transform_m2s (GstAudioPanorama * filter, static void gst_audio_panorama_transform_m2s_int (GstAudioPanorama * filter,
gint16 * idata, gint16 * odata, guint num_samples); gint16 * idata, gint16 * odata, guint num_samples);
static void gst_audio_panorama_transform_s2s (GstAudioPanorama * filter, static void gst_audio_panorama_transform_s2s_int (GstAudioPanorama * filter,
gint16 * idata, gint16 * odata, guint num_samples); gint16 * idata, gint16 * odata, guint num_samples);
static void gst_audio_panorama_transform_m2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples);
static void gst_audio_panorama_transform_s2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples);
static GstFlowReturn gst_audio_panorama_transform (GstBaseTransform * base, static GstFlowReturn gst_audio_panorama_transform (GstBaseTransform * base,
GstBuffer * inbuf, GstBuffer * outbuf); GstBuffer * inbuf, GstBuffer * outbuf);
@ -243,6 +258,7 @@ gst_audio_panorama_set_caps (GstBaseTransform * base, GstCaps * incaps,
const GstStructure *structure; const GstStructure *structure;
gboolean ret; gboolean ret;
gint channels; gint channels;
const gchar *fmt;
/*GST_INFO ("incaps are %" GST_PTR_FORMAT, incaps); */ /*GST_INFO ("incaps are %" GST_PTR_FORMAT, incaps); */
@ -250,18 +266,29 @@ gst_audio_panorama_set_caps (GstBaseTransform * base, GstCaps * incaps,
ret = gst_structure_get_int (structure, "channels", &channels); ret = gst_structure_get_int (structure, "channels", &channels);
if (!ret) if (!ret)
goto no_channels; goto no_channels;
/* FIXME: also check width and gst_structure_get_name()?int/float */
GST_DEBUG ("try to process input with %d channels", channels); fmt = gst_structure_get_name (structure);
GST_DEBUG ("try to process %s input with %d channels", fmt, channels);
/* set processing function */ /* set processing function */
switch (channels) { switch (channels) {
case 1: case 1:
filter->process = gst_audio_panorama_transform_m2s; if (!strcmp (fmt, "audio/x-raw-int"))
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_m2s_int;
else
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_m2s_float;
ret = TRUE; ret = TRUE;
break; break;
case 2: case 2:
filter->process = gst_audio_panorama_transform_s2s; if (!strcmp (fmt, "audio/x-raw-int"))
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_s2s_int;
else
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_s2s_float;
ret = TRUE; ret = TRUE;
break; break;
default: default:
@ -269,6 +296,7 @@ gst_audio_panorama_set_caps (GstBaseTransform * base, GstCaps * incaps,
ret = FALSE; ret = FALSE;
GST_WARNING ("can't process input with %d channels", channels); GST_WARNING ("can't process input with %d channels", channels);
} }
return ret;
no_channels: no_channels:
GST_DEBUG ("no channels in caps"); GST_DEBUG ("no channels in caps");
@ -276,7 +304,7 @@ no_channels:
} }
static void static void
gst_audio_panorama_transform_m2s (GstAudioPanorama * filter, gint16 * idata, gst_audio_panorama_transform_m2s_int (GstAudioPanorama * filter, gint16 * idata,
gint16 * odata, guint num_samples) gint16 * odata, guint num_samples)
{ {
guint i; guint i;
@ -305,7 +333,7 @@ gst_audio_panorama_transform_m2s (GstAudioPanorama * filter, gint16 * idata,
} }
static void static void
gst_audio_panorama_transform_s2s (GstAudioPanorama * filter, gint16 * idata, gst_audio_panorama_transform_s2s_int (GstAudioPanorama * filter, gint16 * idata,
gint16 * odata, guint num_samples) gint16 * odata, guint num_samples)
{ {
guint i; guint i;
@ -343,6 +371,66 @@ gst_audio_panorama_transform_s2s (GstAudioPanorama * filter, gint16 * idata,
} }
} }
static void
gst_audio_panorama_transform_m2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples)
{
guint i;
gfloat val;
gdouble rpan, lpan;
/* pan: -100 0 100
* lpan: 1.0 0.5 0.0
* rpan: 0.0 0.5 1.0
*
* FIXME: we should use -3db (1/sqtr(2)) for 50:50
*/
rpan = (gdouble) (filter->panorama + 100) / 200.0;
lpan = 1.0 - rpan;
for (i = 0; i < num_samples; i++) {
val = *idata++;
*odata++ = val * lpan;
*odata++ = val * rpan;
}
}
static void
gst_audio_panorama_transform_s2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples)
{
guint i;
gfloat lival, rival;
gdouble lrpan, llpan, rrpan, rlpan;
/* pan: -100 0 100
* llpan: 1.0 1.0 0.0
* lrpan: 1.0 0.0 0.0
* rrpan: 0.0 1.0 1.0
* rlpan: 0.0 0.0 1.0
*/
if (filter->panorama > 0) {
rlpan = (gdouble) filter->panorama / 100.0;
llpan = 1.0 - rlpan;
lrpan = 0.0;
rrpan = 1.0;
} else {
rrpan = (gdouble) (100 + filter->panorama) / 100.0;
lrpan = 1.0 - rrpan;
rlpan = 0.0;
llpan = 1.0;
}
for (i = 0; i < num_samples; i++) {
lival = *idata++;
rival = *idata++;
*odata++ = lival * llpan + rival * lrpan;
*odata++ = lival * rlpan + rival * rrpan;
}
}
/* this function does the actual processing /* this function does the actual processing
*/ */
static GstFlowReturn static GstFlowReturn
@ -358,8 +446,8 @@ gst_audio_panorama_transform (GstBaseTransform * base, GstBuffer * inbuf,
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf))) if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf)))
gst_object_sync_values (G_OBJECT (filter), GST_BUFFER_TIMESTAMP (outbuf)); gst_object_sync_values (G_OBJECT (filter), GST_BUFFER_TIMESTAMP (outbuf));
filter->process (filter, (gint16 *) GST_BUFFER_DATA (inbuf), filter->process (filter, GST_BUFFER_DATA (inbuf),
(gint16 *) GST_BUFFER_DATA (outbuf), num_samples); GST_BUFFER_DATA (outbuf), num_samples);
return GST_FLOW_OK; return GST_FLOW_OK;
} }

4
gst/audiofx/audiopanorama.h
View file

@ -36,13 +36,15 @@ G_BEGIN_DECLS
typedef struct _GstAudioPanorama GstAudioPanorama; typedef struct _GstAudioPanorama GstAudioPanorama;
typedef struct _GstAudioPanoramaClass GstAudioPanoramaClass; typedef struct _GstAudioPanoramaClass GstAudioPanoramaClass;
typedef void (*GstAudioPanoramaProcessFunc)(GstAudioPanorama*, guint8*, guint8*, guint);
struct _GstAudioPanorama { struct _GstAudioPanorama {
GstBaseTransform element; GstBaseTransform element;
gint panorama; gint panorama;
/* < private > */ /* < private > */
void (*process)(GstAudioPanorama*, gint16*, gint16*, guint); GstAudioPanoramaProcessFunc process;
}; };
struct _GstAudioPanoramaClass { struct _GstAudioPanoramaClass {

112
gst/audiofxgood/audiopanorama.c
View file

@ -29,6 +29,7 @@
* <programlisting> * <programlisting>
* gst-launch audiotestsrc wave=saw ! audiopanorama panorama=-100 ! alsasink * gst-launch audiotestsrc wave=saw ! audiopanorama panorama=-100 ! alsasink
* gst-launch filesrc location="melo1.ogg" ! oggdemux ! vorbisdec ! audioconvert ! audiopanorama panorama=-100 ! alsasink * gst-launch filesrc location="melo1.ogg" ! oggdemux ! vorbisdec ! audioconvert ! audiopanorama panorama=-100 ! alsasink
* gst-launch audiotestsrc wave=saw ! audioconvert ! audiopanorama panorama=-100 ! audioconvert ! alsasink
* </programlisting> * </programlisting>
* </para> * </para>
* </refsect2> * </refsect2>
@ -71,7 +72,12 @@ enum
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, " GST_STATIC_CAPS ("audio/x-raw-float, "
"rate = (int) [ 1, MAX ], "
"channels = (int) [ 1, 2 ], "
"endianness = (int) BYTE_ORDER, "
"width = (int) 32, " "signed = (boolean) true; "
"audio/x-raw-int, "
"rate = (int) [ 1, MAX ], " "rate = (int) [ 1, MAX ], "
"channels = (int) [ 1, 2 ], " "channels = (int) [ 1, 2 ], "
"endianness = (int) BYTE_ORDER, " "endianness = (int) BYTE_ORDER, "
@ -81,7 +87,12 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, " GST_STATIC_CAPS ("audio/x-raw-float, "
"rate = (int) [ 1, MAX ], "
"channels = (int) 2, "
"endianness = (int) BYTE_ORDER, "
"width = (int) 32, " "signed = (boolean) true; "
"audio/x-raw-int, "
"rate = (int) [ 1, MAX ], " "rate = (int) [ 1, MAX ], "
"channels = (int) 2, " "channels = (int) 2, "
"endianness = (int) BYTE_ORDER, " "endianness = (int) BYTE_ORDER, "
@ -106,10 +117,14 @@ static GstCaps *gst_audio_panorama_transform_caps (GstBaseTransform * base,
static gboolean gst_audio_panorama_set_caps (GstBaseTransform * base, static gboolean gst_audio_panorama_set_caps (GstBaseTransform * base,
GstCaps * incaps, GstCaps * outcaps); GstCaps * incaps, GstCaps * outcaps);
static void gst_audio_panorama_transform_m2s (GstAudioPanorama * filter, static void gst_audio_panorama_transform_m2s_int (GstAudioPanorama * filter,
gint16 * idata, gint16 * odata, guint num_samples); gint16 * idata, gint16 * odata, guint num_samples);
static void gst_audio_panorama_transform_s2s (GstAudioPanorama * filter, static void gst_audio_panorama_transform_s2s_int (GstAudioPanorama * filter,
gint16 * idata, gint16 * odata, guint num_samples); gint16 * idata, gint16 * odata, guint num_samples);
static void gst_audio_panorama_transform_m2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples);
static void gst_audio_panorama_transform_s2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples);
static GstFlowReturn gst_audio_panorama_transform (GstBaseTransform * base, static GstFlowReturn gst_audio_panorama_transform (GstBaseTransform * base,
GstBuffer * inbuf, GstBuffer * outbuf); GstBuffer * inbuf, GstBuffer * outbuf);
@ -243,6 +258,7 @@ gst_audio_panorama_set_caps (GstBaseTransform * base, GstCaps * incaps,
const GstStructure *structure; const GstStructure *structure;
gboolean ret; gboolean ret;
gint channels; gint channels;
const gchar *fmt;
/*GST_INFO ("incaps are %" GST_PTR_FORMAT, incaps); */ /*GST_INFO ("incaps are %" GST_PTR_FORMAT, incaps); */
@ -250,18 +266,29 @@ gst_audio_panorama_set_caps (GstBaseTransform * base, GstCaps * incaps,
ret = gst_structure_get_int (structure, "channels", &channels); ret = gst_structure_get_int (structure, "channels", &channels);
if (!ret) if (!ret)
goto no_channels; goto no_channels;
/* FIXME: also check width and gst_structure_get_name()?int/float */
GST_DEBUG ("try to process input with %d channels", channels); fmt = gst_structure_get_name (structure);
GST_DEBUG ("try to process %s input with %d channels", fmt, channels);
/* set processing function */ /* set processing function */
switch (channels) { switch (channels) {
case 1: case 1:
filter->process = gst_audio_panorama_transform_m2s; if (!strcmp (fmt, "audio/x-raw-int"))
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_m2s_int;
else
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_m2s_float;
ret = TRUE; ret = TRUE;
break; break;
case 2: case 2:
filter->process = gst_audio_panorama_transform_s2s; if (!strcmp (fmt, "audio/x-raw-int"))
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_s2s_int;
else
filter->process = (GstAudioPanoramaProcessFunc)
gst_audio_panorama_transform_s2s_float;
ret = TRUE; ret = TRUE;
break; break;
default: default:
@ -269,6 +296,7 @@ gst_audio_panorama_set_caps (GstBaseTransform * base, GstCaps * incaps,
ret = FALSE; ret = FALSE;
GST_WARNING ("can't process input with %d channels", channels); GST_WARNING ("can't process input with %d channels", channels);
} }
return ret;
no_channels: no_channels:
GST_DEBUG ("no channels in caps"); GST_DEBUG ("no channels in caps");
@ -276,7 +304,7 @@ no_channels:
} }
static void static void
gst_audio_panorama_transform_m2s (GstAudioPanorama * filter, gint16 * idata, gst_audio_panorama_transform_m2s_int (GstAudioPanorama * filter, gint16 * idata,
gint16 * odata, guint num_samples) gint16 * odata, guint num_samples)
{ {
guint i; guint i;
@ -305,7 +333,7 @@ gst_audio_panorama_transform_m2s (GstAudioPanorama * filter, gint16 * idata,
} }
static void static void
gst_audio_panorama_transform_s2s (GstAudioPanorama * filter, gint16 * idata, gst_audio_panorama_transform_s2s_int (GstAudioPanorama * filter, gint16 * idata,
gint16 * odata, guint num_samples) gint16 * odata, guint num_samples)
{ {
guint i; guint i;
@ -343,6 +371,66 @@ gst_audio_panorama_transform_s2s (GstAudioPanorama * filter, gint16 * idata,
} }
} }
static void
gst_audio_panorama_transform_m2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples)
{
guint i;
gfloat val;
gdouble rpan, lpan;
/* pan: -100 0 100
* lpan: 1.0 0.5 0.0
* rpan: 0.0 0.5 1.0
*
* FIXME: we should use -3db (1/sqtr(2)) for 50:50
*/
rpan = (gdouble) (filter->panorama + 100) / 200.0;
lpan = 1.0 - rpan;
for (i = 0; i < num_samples; i++) {
val = *idata++;
*odata++ = val * lpan;
*odata++ = val * rpan;
}
}
static void
gst_audio_panorama_transform_s2s_float (GstAudioPanorama * filter,
gfloat * idata, gfloat * odata, guint num_samples)
{
guint i;
gfloat lival, rival;
gdouble lrpan, llpan, rrpan, rlpan;
/* pan: -100 0 100
* llpan: 1.0 1.0 0.0
* lrpan: 1.0 0.0 0.0
* rrpan: 0.0 1.0 1.0
* rlpan: 0.0 0.0 1.0
*/
if (filter->panorama > 0) {
rlpan = (gdouble) filter->panorama / 100.0;
llpan = 1.0 - rlpan;
lrpan = 0.0;
rrpan = 1.0;
} else {
rrpan = (gdouble) (100 + filter->panorama) / 100.0;
lrpan = 1.0 - rrpan;
rlpan = 0.0;
llpan = 1.0;
}
for (i = 0; i < num_samples; i++) {
lival = *idata++;
rival = *idata++;
*odata++ = lival * llpan + rival * lrpan;
*odata++ = lival * rlpan + rival * rrpan;
}
}
/* this function does the actual processing /* this function does the actual processing
*/ */
static GstFlowReturn static GstFlowReturn
@ -358,8 +446,8 @@ gst_audio_panorama_transform (GstBaseTransform * base, GstBuffer * inbuf,
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf))) if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf)))
gst_object_sync_values (G_OBJECT (filter), GST_BUFFER_TIMESTAMP (outbuf)); gst_object_sync_values (G_OBJECT (filter), GST_BUFFER_TIMESTAMP (outbuf));
filter->process (filter, (gint16 *) GST_BUFFER_DATA (inbuf), filter->process (filter, GST_BUFFER_DATA (inbuf),
(gint16 *) GST_BUFFER_DATA (outbuf), num_samples); GST_BUFFER_DATA (outbuf), num_samples);
return GST_FLOW_OK; return GST_FLOW_OK;
} }

4
gst/audiofxgood/audiopanorama.h
View file

@ -36,13 +36,15 @@ G_BEGIN_DECLS
typedef struct _GstAudioPanorama GstAudioPanorama; typedef struct _GstAudioPanorama GstAudioPanorama;
typedef struct _GstAudioPanoramaClass GstAudioPanoramaClass; typedef struct _GstAudioPanoramaClass GstAudioPanoramaClass;
typedef void (*GstAudioPanoramaProcessFunc)(GstAudioPanorama*, guint8*, guint8*, guint);
struct _GstAudioPanorama { struct _GstAudioPanorama {
GstBaseTransform element; GstBaseTransform element;
gint panorama; gint panorama;
/* < private > */ /* < private > */
void (*process)(GstAudioPanorama*, gint16*, gint16*, guint); GstAudioPanoramaProcessFunc process;
}; };
struct _GstAudioPanoramaClass { struct _GstAudioPanoramaClass {