mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

Removed properties that can be retrived from pad caps and query functions

Browse source 
Original commit message from CVS:
Removed properties that can be retrived from pad caps and query
functions
This commit is contained in:
Wim Taymans 2002-11-02 13:35:45 +00:00
parent f536ba32e8
commit e630a05347
1 changed files with 17 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
ext/mad/gstmad.c
View file

@ -98,10 +98,6 @@ enum {
ARG_LAYER, ARG_LAYER,
ARG_MODE, ARG_MODE,
ARG_EMPHASIS, ARG_EMPHASIS,
ARG_BITRATE,
ARG_SAMPLERATE,
ARG_CHANNELS,
ARG_AVERAGE_BITRATE,
ARG_METADATA, ARG_METADATA,
/* FILL ME */ /* FILL ME */
}; };
@ -207,22 +203,6 @@ gst_mad_layer_get_type(void) {
return mad_layer_type; return mad_layer_type;
} }
#define GST_TYPE_MAD_CHANNELS (gst_mad_channels_get_type())
static GType
gst_mad_channels_get_type(void) {
static GType mad_channels_type = 0;
static GEnumValue mad_channels[] = {
{0, "0", "Unknown"},
{1, "1", "Mono"},
{2, "2", "Stereo"},
{ 0, NULL, NULL},
};
if (!mad_channels_type) {
mad_channels_type = g_enum_register_static("GstMadChannels", mad_channels);
}
return mad_channels_type;
}
#define GST_TYPE_MAD_MODE (gst_mad_mode_get_type()) #define GST_TYPE_MAD_MODE (gst_mad_mode_get_type())
static GType static GType
gst_mad_mode_get_type(void) { gst_mad_mode_get_type(void) {
@ -287,18 +267,6 @@ gst_mad_class_init (GstMadClass *klass)
g_object_class_install_property (gobject_class, ARG_EMPHASIS, g_object_class_install_property (gobject_class, ARG_EMPHASIS,
g_param_spec_enum ("emphasis", "Emphasis", "Emphasis", g_param_spec_enum ("emphasis", "Emphasis", "Emphasis",
GST_TYPE_MAD_EMPHASIS, -1, G_PARAM_READABLE)); GST_TYPE_MAD_EMPHASIS, -1, G_PARAM_READABLE));
g_object_class_install_property (gobject_class, ARG_BITRATE,
g_param_spec_int ("bitrate", "Bitrate", "current bitrate of the stream",
0, G_MAXINT, 0, G_PARAM_READABLE));
g_object_class_install_property (gobject_class, ARG_AVERAGE_BITRATE,
g_param_spec_int ("average-bitrate", "average bitrate", "average bitrate of the stream",
0, G_MAXINT, 0, G_PARAM_READABLE));
g_object_class_install_property (gobject_class, ARG_SAMPLERATE,
g_param_spec_int ("samplerate", "Samplerate", "current samplerate of the stream",
0, G_MAXINT, 0, G_PARAM_READABLE));
g_object_class_install_property (gobject_class, ARG_CHANNELS,
g_param_spec_enum ("channels", "Channels", "number of channels",
GST_TYPE_MAD_CHANNELS, 0, G_PARAM_READABLE));
g_object_class_install_property (gobject_class, ARG_METADATA, g_object_class_install_property (gobject_class, ARG_METADATA,
g_param_spec_boxed ("metadata", "Metadata", "Metadata", g_param_spec_boxed ("metadata", "Metadata", "Metadata",
GST_TYPE_CAPS, G_PARAM_READABLE)); GST_TYPE_CAPS, G_PARAM_READABLE));
@ -601,6 +569,13 @@ gst_mad_src_event (GstPad *pad, GstEvent *event)
mad = GST_MAD (gst_pad_get_parent (pad)); mad = GST_MAD (gst_pad_get_parent (pad));
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEEK_SEGMENT:
gst_event_ref (event);
if (gst_pad_send_event (GST_PAD_PEER (mad->sinkpad), event)) {
/* seek worked, we're done, loop will exit */
res = TRUE;
}
break;
/* the all-formats seek logic */ /* the all-formats seek logic */
case GST_EVENT_SEEK: case GST_EVENT_SEEK:
{ {
@ -719,18 +694,6 @@ gst_mad_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
case ARG_EMPHASIS: case ARG_EMPHASIS:
g_value_set_enum (value, mad->header.emphasis); g_value_set_enum (value, mad->header.emphasis);
break; break;
case ARG_BITRATE:
g_value_set_int (value, mad->header.bitrate);
break;
case ARG_AVERAGE_BITRATE:
g_value_set_int (value, mad->vbr_average);
break;
case ARG_SAMPLERATE:
g_value_set_int (value, mad->header.samplerate);
break;
case ARG_CHANNELS:
g_value_set_enum (value, mad->channels);
break;
case ARG_METADATA: case ARG_METADATA:
g_value_set_boxed (value, mad->metadata); g_value_set_boxed (value, mad->metadata);
break; break;
@ -766,18 +729,16 @@ G_STMT_START{ \
mad->vbr_rate += header->bitrate; mad->vbr_rate += header->bitrate;
} }
mad->vbr_average = (gint) (mad->vbr_rate / mad->framecount); mad->vbr_average = (gint) (mad->vbr_rate / mad->framecount);
if (abr != mad->vbr_average) {
g_object_notify (G_OBJECT (mad), "average_bitrate");
}
CHECK_HEADER (layer, "layer"); CHECK_HEADER (layer, "layer");
CHECK_HEADER (mode, "mode"); CHECK_HEADER (mode, "mode");
CHECK_HEADER (emphasis, "emphasis"); CHECK_HEADER (emphasis, "emphasis");
CHECK_HEADER (bitrate, "bitrate");
CHECK_HEADER (samplerate, "samplerate"); if (header->bitrate != mad->header.bitrate || mad->new_header) {
mad->header.bitrate = header->bitrate;
}
if (mad->channels != MAD_NCHANNELS (header) || mad->new_header) { if (mad->channels != MAD_NCHANNELS (header) || mad->new_header) {
mad->channels = MAD_NCHANNELS (header); mad->channels = MAD_NCHANNELS (header);
g_object_notify (G_OBJECT (mad), "channels");
} }
mad->new_header = FALSE; mad->new_header = FALSE;
@ -1121,11 +1082,15 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
#if MAD_VERSION_MINOR <= 12 #if MAD_VERSION_MINOR <= 12
"rate", GST_PROPS_INT (mad->header.sfreq), "rate", GST_PROPS_INT (mad->header.sfreq),
#else #else
"rate", GST_PROPS_INT (mad->header.samplerate), "rate", GST_PROPS_INT (mad->frame.header.samplerate),
#endif #endif
"channels", GST_PROPS_INT (nchannels), "channels", GST_PROPS_INT (nchannels),
NULL))) <= 0) { NULL))) <= 0)
{
gst_buffer_unref (outbuffer);
gst_buffer_unref (buffer);
gst_element_error (GST_ELEMENT (mad), "could not set caps on source pad, aborting..."); gst_element_error (GST_ELEMENT (mad), "could not set caps on source pad, aborting...");
return;
} }
mad->caps_set = TRUE; mad->caps_set = TRUE;
} }