audioparse: Small cleanups

This commit is contained in:
Sebastian Dröge 2009-08-08 08:27:24 +02:00
parent 8433f7a9c6
commit 60a5d37683

View file

@ -56,22 +56,16 @@ static void gst_audio_parse_update_frame_size (GstAudioParse * ap);
GST_DEBUG_CATEGORY_STATIC (gst_audio_parse_debug); GST_DEBUG_CATEGORY_STATIC (gst_audio_parse_debug);
#define GST_CAT_DEFAULT gst_audio_parse_debug #define GST_CAT_DEFAULT gst_audio_parse_debug
static const GstElementDetails gst_audio_parse_details =
GST_ELEMENT_DETAILS ("Audio Parse",
"Filter/Audio",
"Converts stream into audio frames",
"Sebastian Dröge <slomo@circular-chaos.org>");
enum enum
{ {
ARG_0, PROP_0,
ARG_FORMAT, PROP_FORMAT,
ARG_RATE, PROP_RATE,
ARG_CHANNELS, PROP_CHANNELS,
ARG_ENDIANNESS, PROP_ENDIANNESS,
ARG_WIDTH, PROP_WIDTH,
ARG_DEPTH, PROP_DEPTH,
ARG_SIGNED PROP_SIGNED
}; };
@ -128,7 +122,10 @@ gst_audio_parse_base_init (gpointer g_class)
GST_DEBUG_CATEGORY_INIT (gst_audio_parse_debug, "audioparse", 0, GST_DEBUG_CATEGORY_INIT (gst_audio_parse_debug, "audioparse", 0,
"audioparse element"); "audioparse element");
gst_element_class_set_details (gstelement_class, &gst_audio_parse_details); gst_element_class_set_details_simple (gstelement_class, "Audio Parse",
"Filter/Audio",
"Converts stream into audio frames",
"Sebastian Dröge <sebastian.droege@collabora.co.uk>");
caps = caps =
gst_caps_from_string ("audio/x-raw-int," gst_caps_from_string ("audio/x-raw-int,"
@ -161,38 +158,41 @@ gst_audio_parse_class_init (GstAudioParseClass * klass)
rp_class->get_caps = gst_audio_parse_get_caps; rp_class->get_caps = gst_audio_parse_get_caps;
g_object_class_install_property (gobject_class, ARG_FORMAT, g_object_class_install_property (gobject_class, PROP_FORMAT,
g_param_spec_enum ("format", "Format", g_param_spec_enum ("format", "Format",
"Format of audio samples in raw stream", GST_AUDIO_PARSE_FORMAT, "Format of audio samples in raw stream", GST_AUDIO_PARSE_FORMAT,
GST_AUDIO_PARSE_FORMAT_INT, G_PARAM_READWRITE)); GST_AUDIO_PARSE_FORMAT_INT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_RATE, g_object_class_install_property (gobject_class, PROP_RATE,
g_param_spec_int ("rate", "Rate", "Rate of audio samples in raw stream", g_param_spec_int ("rate", "Rate", "Rate of audio samples in raw stream",
1, INT_MAX, 44100, G_PARAM_READWRITE)); 1, INT_MAX, 44100, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_CHANNELS, g_object_class_install_property (gobject_class, PROP_CHANNELS,
g_param_spec_int ("channels", "Channels", g_param_spec_int ("channels", "Channels",
"Number of channels in raw stream", 1, INT_MAX, 2, "Number of channels in raw stream", 1, INT_MAX, 2,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_WIDTH, g_object_class_install_property (gobject_class, PROP_WIDTH,
g_param_spec_int ("width", "Width", g_param_spec_int ("width", "Width",
"Width of audio samples in raw stream", 1, INT_MAX, 16, "Width of audio samples in raw stream", 1, INT_MAX, 16,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_DEPTH, g_object_class_install_property (gobject_class, PROP_DEPTH,
g_param_spec_int ("depth", "Depth", g_param_spec_int ("depth", "Depth",
"Depth of audio samples in raw stream", 1, INT_MAX, 16, "Depth of audio samples in raw stream", 1, INT_MAX, 16,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_SIGNED, g_object_class_install_property (gobject_class, PROP_SIGNED,
g_param_spec_boolean ("signed", "signed", g_param_spec_boolean ("signed", "signed",
"Sign of audio samples in raw stream", TRUE, G_PARAM_READWRITE)); "Sign of audio samples in raw stream", TRUE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_ENDIANNESS, g_object_class_install_property (gobject_class, PROP_ENDIANNESS,
g_param_spec_enum ("endianness", "Endianness", g_param_spec_enum ("endianness", "Endianness",
"Endianness of audio samples in raw stream", "Endianness of audio samples in raw stream",
GST_AUDIO_PARSE_ENDIANNESS, G_BYTE_ORDER, G_PARAM_READWRITE)); GST_AUDIO_PARSE_ENDIANNESS, G_BYTE_ORDER,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }
static void static void
@ -218,25 +218,25 @@ gst_audio_parse_set_property (GObject * object, guint prop_id,
g_return_if_fail (!gst_raw_parse_is_negotiated (GST_RAW_PARSE (ap))); g_return_if_fail (!gst_raw_parse_is_negotiated (GST_RAW_PARSE (ap)));
switch (prop_id) { switch (prop_id) {
case ARG_FORMAT: case PROP_FORMAT:
ap->format = g_value_get_enum (value); ap->format = g_value_get_enum (value);
break; break;
case ARG_RATE: case PROP_RATE:
gst_raw_parse_set_fps (GST_RAW_PARSE (ap), g_value_get_int (value), 1); gst_raw_parse_set_fps (GST_RAW_PARSE (ap), g_value_get_int (value), 1);
break; break;
case ARG_CHANNELS: case PROP_CHANNELS:
ap->channels = g_value_get_int (value); ap->channels = g_value_get_int (value);
break; break;
case ARG_WIDTH: case PROP_WIDTH:
ap->width = g_value_get_int (value); ap->width = g_value_get_int (value);
break; break;
case ARG_DEPTH: case PROP_DEPTH:
ap->depth = g_value_get_int (value); ap->depth = g_value_get_int (value);
break; break;
case ARG_SIGNED: case PROP_SIGNED:
ap->signedness = g_value_get_boolean (value); ap->signedness = g_value_get_boolean (value);
break; break;
case ARG_ENDIANNESS: case PROP_ENDIANNESS:
ap->endianness = g_value_get_enum (value); ap->endianness = g_value_get_enum (value);
break; break;
default: default:
@ -254,29 +254,29 @@ gst_audio_parse_get_property (GObject * object, guint prop_id, GValue * value,
GstAudioParse *ap = GST_AUDIO_PARSE (object); GstAudioParse *ap = GST_AUDIO_PARSE (object);
switch (prop_id) { switch (prop_id) {
case ARG_FORMAT: case PROP_FORMAT:
g_value_set_enum (value, ap->format); g_value_set_enum (value, ap->format);
break; break;
case ARG_RATE:{ case PROP_RATE:{
gint fps_n, fps_d; gint fps_n, fps_d;
gst_raw_parse_get_fps (GST_RAW_PARSE (ap), &fps_n, &fps_d); gst_raw_parse_get_fps (GST_RAW_PARSE (ap), &fps_n, &fps_d);
g_value_set_int (value, fps_n); g_value_set_int (value, fps_n);
break; break;
} }
case ARG_CHANNELS: case PROP_CHANNELS:
g_value_set_int (value, ap->channels); g_value_set_int (value, ap->channels);
break; break;
case ARG_WIDTH: case PROP_WIDTH:
g_value_set_int (value, ap->width); g_value_set_int (value, ap->width);
break; break;
case ARG_DEPTH: case PROP_DEPTH:
g_value_set_int (value, ap->depth); g_value_set_int (value, ap->depth);
break; break;
case ARG_SIGNED: case PROP_SIGNED:
g_value_set_boolean (value, ap->signedness); g_value_set_boolean (value, ap->signedness);
break; break;
case ARG_ENDIANNESS: case PROP_ENDIANNESS:
g_value_set_enum (value, ap->endianness); g_value_set_enum (value, ap->endianness);
break; break;
default: default: