diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-15 19:32:27 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-15 19:32:27 +0000 |
commit | 6cc1c73d2baa95c46edc04f57cbe9ed690dc2f21 (patch) | |
tree | 82b5546809a42a56a7bc18bacf8ed6e209ad006e /ext | |
parent | d07ec45fa47fbd0e36224e11bcd8ba2faee1a78c (diff) |
don't mix tabs and spaces
Original commit message from CVS:
don't mix tabs and spaces
Diffstat (limited to 'ext')
30 files changed, 1198 insertions, 1171 deletions
diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index e34bcf03..2713eb93 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -100,8 +100,9 @@ gst_aasink_get_type (void) 0, (GInstanceInitFunc) gst_aasink_init, }; + aasink_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstAASink", &aasink_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstAASink", &aasink_info, 0); } return aasink_type; } @@ -191,17 +192,17 @@ gst_aasink_class_init (GstAASinkClass * klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_WIDTH, g_param_spec_int ("width", "width", "width", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HEIGHT, g_param_spec_int ("height", "height", "height", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DRIVER, g_param_spec_enum ("driver", "driver", "driver", GST_TYPE_AADRIVERS, 0, G_PARAM_READWRITE)); /* CHECKME! */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DITHER, g_param_spec_enum ("dither", "dither", "dither", GST_TYPE_AADITHER, 0, G_PARAM_READWRITE)); /* CHECKME! */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BRIGHTNESS, g_param_spec_int ("brightness", "brightness", "brightness", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CONTRAST, g_param_spec_int ("contrast", "contrast", "contrast", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GAMMA, g_param_spec_float ("gamma", "gamma", "gamma", 0.0, 5.0, 1.0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_INVERSION, g_param_spec_boolean ("inversion", "inversion", "inversion", TRUE, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_RANDOMVAL, g_param_spec_int ("randomval", "randomval", "randomval", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FRAMES_DISPLAYED, g_param_spec_int ("frames_displayed", "frames_displayed", "frames_displayed", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FRAME_TIME, g_param_spec_int ("frame_time", "frame_time", "frame_time", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_WIDTH, g_param_spec_int ("width", "width", "width", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HEIGHT, g_param_spec_int ("height", "height", "height", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DRIVER, g_param_spec_enum ("driver", "driver", "driver", GST_TYPE_AADRIVERS, 0, G_PARAM_READWRITE)); /* CHECKME! */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DITHER, g_param_spec_enum ("dither", "dither", "dither", GST_TYPE_AADITHER, 0, G_PARAM_READWRITE)); /* CHECKME! */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BRIGHTNESS, g_param_spec_int ("brightness", "brightness", "brightness", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CONTRAST, g_param_spec_int ("contrast", "contrast", "contrast", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GAMMA, g_param_spec_float ("gamma", "gamma", "gamma", 0.0, 5.0, 1.0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_INVERSION, g_param_spec_boolean ("inversion", "inversion", "inversion", TRUE, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_RANDOMVAL, g_param_spec_int ("randomval", "randomval", "randomval", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FRAMES_DISPLAYED, g_param_spec_int ("frames_displayed", "frames_displayed", "frames_displayed", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FRAME_TIME, g_param_spec_int ("frame_time", "frame_time", "frame_time", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ gobject_class->set_property = gst_aasink_set_property; gobject_class->get_property = gst_aasink_get_property; @@ -238,7 +239,7 @@ gst_aasink_fixate (GstPad * pad, const GstCaps * caps) return newcaps; } if (gst_caps_structure_fixate_field_nearest_double (structure, "framerate", - 30.0)) { + 30.0)) { return newcaps; } @@ -282,7 +283,7 @@ gst_aasink_init (GstAASink * aasink) { aasink->sinkpad = gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT - (aasink), "sink"), "sink"); + (aasink), "sink"), "sink"); gst_element_add_pad (GST_ELEMENT (aasink), aasink->sinkpad); gst_pad_set_chain_function (aasink->sinkpad, gst_aasink_chain); gst_pad_set_link_function (aasink->sinkpad, gst_aasink_sinkconnect); @@ -330,12 +331,12 @@ gst_aasink_scale (GstAASink * aasink, gchar * src, gchar * dest, guchar *srcp = src; for (x = dw; x; x--) { - while (xpos >= 0x10000L) { - srcp++; - xpos -= 0x10000L; - } - *destp++ = *srcp; - xpos += xinc; + while (xpos >= 0x10000L) { + srcp++; + xpos -= 0x10000L; + } + *destp++ = *srcp; + xpos += xinc; } } dest += dw; @@ -355,12 +356,12 @@ gst_aasink_chain (GstPad * pad, GstData * _data) aasink = GST_AASINK (gst_pad_get_parent (pad)); - gst_aasink_scale (aasink, GST_BUFFER_DATA (buf), /* src */ - aa_image (aasink->context), /* dest */ - aasink->width, /* sw */ - aasink->height, /* sh */ - aa_imgwidth (aasink->context), /* dw */ - aa_imgheight (aasink->context)); /* dh */ + gst_aasink_scale (aasink, GST_BUFFER_DATA (buf), /* src */ + aa_image (aasink->context), /* dest */ + aasink->width, /* sw */ + aasink->height, /* sh */ + aa_imgwidth (aasink->context), /* dw */ + aa_imgheight (aasink->context)); /* dh */ GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (buf)); @@ -503,7 +504,7 @@ gst_aasink_open (GstAASink * aasink) aasink->context = aa_autoinit (&aasink->ascii_surf); if (aasink->context == NULL) { GST_ELEMENT_ERROR (GST_ELEMENT (aasink), LIBRARY, TOO_LAZY, (NULL), - ("error opening aalib context")); + ("error opening aalib context")); return FALSE; } aa_autoinitkbd (aasink->context, 0); @@ -535,7 +536,7 @@ gst_aasink_change_state (GstElement * element) } else { if (!GST_FLAG_IS_SET (element, GST_AASINK_OPEN)) { if (!gst_aasink_open (GST_AASINK (element))) - return GST_STATE_FAILURE; + return GST_STATE_FAILURE; } } diff --git a/ext/dv/demo-play.c b/ext/dv/demo-play.c index 7fb427a0..cf27283e 100644 --- a/ext/dv/demo-play.c +++ b/ext/dv/demo-play.c @@ -38,7 +38,7 @@ main (int argc, char *argv[]) } else { src = gst_element_factory_make ("filesrc", "src"); g_object_set (G_OBJECT (src), "location", argv[1], "bytesperread", 480, - NULL); + NULL); } dvdec = gst_element_factory_make ("dvdec", "decoder"); if (!dvdec) diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index 17dc45e2..5625237d 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -81,54 +81,54 @@ static GstStaticPadTemplate video_src_temp = GST_STATIC_PAD_TEMPLATE ("video", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-yuv, " - "format = (fourcc) YUY2, " - "width = (int) 720, " - "height = (int) { " - G_STRINGIFY (NTSC_HEIGHT) ", " G_STRINGIFY (PAL_HEIGHT) - " }, " - "framerate = (double) { " - G_STRINGIFY (PAL_FRAMERATE) ", " G_STRINGIFY (NTSC_FRAMERATE) - " }; " - "video/x-raw-rgb, " - "bpp = (int) 32, " - "depth = (int) 32, " - "endianness = (int) " G_STRINGIFY (G_BIG_ENDIAN) ", " - "red_mask = (int) 0x000000ff, " - "green_mask = (int) 0x0000ff00, " - "blue_mask = (int) 0x00ff0000, " - "width = (int) 720, " - "height = (int) { " - G_STRINGIFY (NTSC_HEIGHT) ", " G_STRINGIFY (PAL_HEIGHT) - " }, " - "framerate = (double) { " - G_STRINGIFY (PAL_FRAMERATE) ", " G_STRINGIFY (NTSC_FRAMERATE) - " }; " - "video/x-raw-rgb, " - "bpp = (int) 24, " - "depth = (int) 24, " - "endianness = (int) " G_STRINGIFY (G_BIG_ENDIAN) ", " - "red_mask = (int) 0x000000ff, " - "green_mask = (int) 0x0000ff00, " - "blue_mask = (int) 0x00ff0000, " - "width = (int) 720, " - "height = (int) { " - G_STRINGIFY (NTSC_HEIGHT) ", " G_STRINGIFY (PAL_HEIGHT) - " }, " - "framerate = (double) { " - G_STRINGIFY (PAL_FRAMERATE) ", " G_STRINGIFY (NTSC_FRAMERATE) - " }") + "format = (fourcc) YUY2, " + "width = (int) 720, " + "height = (int) { " + G_STRINGIFY (NTSC_HEIGHT) ", " G_STRINGIFY (PAL_HEIGHT) + " }, " + "framerate = (double) { " + G_STRINGIFY (PAL_FRAMERATE) ", " G_STRINGIFY (NTSC_FRAMERATE) + " }; " + "video/x-raw-rgb, " + "bpp = (int) 32, " + "depth = (int) 32, " + "endianness = (int) " G_STRINGIFY (G_BIG_ENDIAN) ", " + "red_mask = (int) 0x000000ff, " + "green_mask = (int) 0x0000ff00, " + "blue_mask = (int) 0x00ff0000, " + "width = (int) 720, " + "height = (int) { " + G_STRINGIFY (NTSC_HEIGHT) ", " G_STRINGIFY (PAL_HEIGHT) + " }, " + "framerate = (double) { " + G_STRINGIFY (PAL_FRAMERATE) ", " G_STRINGIFY (NTSC_FRAMERATE) + " }; " + "video/x-raw-rgb, " + "bpp = (int) 24, " + "depth = (int) 24, " + "endianness = (int) " G_STRINGIFY (G_BIG_ENDIAN) ", " + "red_mask = (int) 0x000000ff, " + "green_mask = (int) 0x0000ff00, " + "blue_mask = (int) 0x00ff0000, " + "width = (int) 720, " + "height = (int) { " + G_STRINGIFY (NTSC_HEIGHT) ", " G_STRINGIFY (PAL_HEIGHT) + " }, " + "framerate = (double) { " + G_STRINGIFY (PAL_FRAMERATE) ", " G_STRINGIFY (NTSC_FRAMERATE) + " }") ); static GstStaticPadTemplate audio_src_temp = GST_STATIC_PAD_TEMPLATE ("audio", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " - "depth = (int) 16, " - "width = (int) 16, " - "signed = (boolean) TRUE, " - "channels = (int) 2, " - "endianness = (int) " G_STRINGIFY (G_LITTLE_ENDIAN) ", " - "rate = (int) [ 4000, 48000 ]") + "depth = (int) 16, " + "width = (int) 16, " + "signed = (boolean) TRUE, " + "channels = (int) 2, " + "endianness = (int) " G_STRINGIFY (G_LITTLE_ENDIAN) ", " + "rate = (int) [ 4000, 48000 ]") ); #define GST_TYPE_DVDEC_QUALITY (gst_dvdec_quality_get_type()) @@ -144,6 +144,7 @@ gst_dvdec_quality_get_type (void) {DV_QUALITY_AC_2, "DV_QUALITY_AC_2", "AC 2 something"}, {0, NULL, NULL} }; + qtype = g_flags_register_static ("GstDVDecQualityFlags", values); } return qtype; @@ -211,8 +212,9 @@ gst_dvdec_get_type (void) 0, (GInstanceInitFunc) gst_dvdec_init, }; + dvdec_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstDVDec", &dvdec_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstDVDec", &dvdec_info, 0); } return dvdec_type; } @@ -261,13 +263,13 @@ gst_dvdec_class_init (GstDVDecClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CLAMP_LUMA, g_param_spec_boolean ("clamp_luma", "Clamp luma", "Clamp luma", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CLAMP_CHROMA, g_param_spec_boolean ("clamp_chroma", "Clamp chroma", "Clamp chroma", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUALITY, g_param_spec_flags ("quality", "Quality", "Decoding quality", - GST_TYPE_DVDEC_QUALITY, DV_QUALITY_BEST, G_PARAM_READWRITE)); + GST_TYPE_DVDEC_QUALITY, DV_QUALITY_BEST, G_PARAM_READWRITE)); gobject_class->set_property = gst_dvdec_set_property; gobject_class->get_property = gst_dvdec_get_property; @@ -355,7 +357,7 @@ gst_dvdec_init (GstDVDec * dvdec) for (i = 0; i < 4; i++) { dvdec->audio_buffers[i] = - (gint16 *) g_malloc (DV_AUDIO_MAX_SAMPLES * sizeof (gint16)); + (gint16 *) g_malloc (DV_AUDIO_MAX_SAMPLES * sizeof (gint16)); } } @@ -396,29 +398,29 @@ gst_dvdec_src_convert (GstPad * pad, GstFormat src_format, gint64 src_value, switch (src_format) { case GST_FORMAT_BYTES: switch (*dest_format) { - case GST_FORMAT_TIME: - default: - res = FALSE; + case GST_FORMAT_TIME: + default: + res = FALSE; } break; case GST_FORMAT_TIME: switch (*dest_format) { - case GST_FORMAT_BYTES: - if (pad == dvdec->videosrcpad) - scale = 720 * dvdec->height * dvdec->bpp; - else if (pad == dvdec->audiosrcpad) - scale = dvdec->decoder->audio->num_channels * 2; - /* fallthrough */ - case GST_FORMAT_DEFAULT: - if (pad == dvdec->videosrcpad) - *dest_value = src_value * dvdec->framerate * scale / GST_SECOND; - else if (pad == dvdec->audiosrcpad) - *dest_value = - src_value * dvdec->decoder->audio->frequency * scale / - GST_SECOND; - break; - default: - res = FALSE; + case GST_FORMAT_BYTES: + if (pad == dvdec->videosrcpad) + scale = 720 * dvdec->height * dvdec->bpp; + else if (pad == dvdec->audiosrcpad) + scale = dvdec->decoder->audio->num_channels * 2; + /* fallthrough */ + case GST_FORMAT_DEFAULT: + if (pad == dvdec->videosrcpad) + *dest_value = src_value * dvdec->framerate * scale / GST_SECOND; + else if (pad == dvdec->audiosrcpad) + *dest_value = + src_value * dvdec->decoder->audio->frequency * scale / + GST_SECOND; + break; + default: + res = FALSE; } break; default: @@ -442,34 +444,34 @@ gst_dvdec_sink_convert (GstPad * pad, GstFormat src_format, gint64 src_value, switch (src_format) { case GST_FORMAT_BYTES: switch (*dest_format) { - case GST_FORMAT_TIME: - { - guint64 frame; - - /* get frame number */ - frame = src_value / dvdec->length; - - *dest_value = (frame * GST_SECOND) / dvdec->framerate; - break; - } - default: - res = FALSE; + case GST_FORMAT_TIME: + { + guint64 frame; + + /* get frame number */ + frame = src_value / dvdec->length; + + *dest_value = (frame * GST_SECOND) / dvdec->framerate; + break; + } + default: + res = FALSE; } break; case GST_FORMAT_TIME: switch (*dest_format) { - case GST_FORMAT_BYTES: - { - guint64 frame; - - /* calculate the frame */ - frame = src_value * dvdec->framerate / GST_SECOND; - /* calculate the offset */ - *dest_value = frame * dvdec->length; - break; - } - default: - res = FALSE; + case GST_FORMAT_BYTES: + { + guint64 frame; + + /* calculate the frame */ + frame = src_value * dvdec->framerate / GST_SECOND; + /* calculate the offset */ + *dest_value = frame * dvdec->length; + break; + } + default: + res = FALSE; } break; default: @@ -486,6 +488,7 @@ gst_dvdec_get_src_query_types (GstPad * pad) GST_QUERY_POSITION, 0 }; + return src_query_types; } @@ -501,31 +504,31 @@ gst_dvdec_src_query (GstPad * pad, GstQueryType type, switch (type) { case GST_QUERY_TOTAL: switch (*format) { - default: - { - guint64 len; - GstFormat tmp_format; - - len = gst_bytestream_length (dvdec->bs); - tmp_format = GST_FORMAT_TIME; - if (len == -1 || !gst_pad_convert (dvdec->sinkpad, - GST_FORMAT_BYTES, len, &tmp_format, value)) { - return FALSE; - } - if (!gst_pad_convert (pad, GST_FORMAT_TIME, *value, format, value)) { - return FALSE; - } - break; - } + default: + { + guint64 len; + GstFormat tmp_format; + + len = gst_bytestream_length (dvdec->bs); + tmp_format = GST_FORMAT_TIME; + if (len == -1 || !gst_pad_convert (dvdec->sinkpad, + GST_FORMAT_BYTES, len, &tmp_format, value)) { + return FALSE; + } + if (!gst_pad_convert (pad, GST_FORMAT_TIME, *value, format, value)) { + return FALSE; + } + break; + } } break; case GST_QUERY_POSITION: switch (*format) { - default: - res = - gst_pad_convert (pad, GST_FORMAT_TIME, dvdec->next_ts, format, - value); - break; + default: + res = + gst_pad_convert (pad, GST_FORMAT_TIME, dvdec->next_ts, format, + value); + break; } break; default: @@ -575,17 +578,17 @@ gst_dvdec_handle_sink_event (GstDVDec * dvdec) format = GST_FORMAT_TIME; /* try to get a timestamp from the discont formats */ for (i = 0; i < GST_EVENT_DISCONT_OFFSET_LEN (event); i++) { - if (gst_pad_convert (dvdec->sinkpad, - GST_EVENT_DISCONT_OFFSET (event, i).format, - GST_EVENT_DISCONT_OFFSET (event, i).value, - &format, &dvdec->next_ts)) { - found = TRUE; - break; - } + if (gst_pad_convert (dvdec->sinkpad, + GST_EVENT_DISCONT_OFFSET (event, i).format, + GST_EVENT_DISCONT_OFFSET (event, i).value, + &format, &dvdec->next_ts)) { + found = TRUE; + break; + } } /* assume 0 then */ if (!found) { - dvdec->next_ts = 0LL; + dvdec->next_ts = 0LL; } dvdec->need_discont = TRUE; break; @@ -615,11 +618,11 @@ gst_dvdec_handle_src_event (GstPad * pad, GstEvent * event) /* first bring the format to time */ format = GST_FORMAT_TIME; if (!gst_pad_convert (pad, - GST_EVENT_SEEK_FORMAT (event), - GST_EVENT_SEEK_ENDOFFSET (event), &format, &position)) { - /* could not convert seek format to time offset */ - res = FALSE; - break; + GST_EVENT_SEEK_FORMAT (event), + GST_EVENT_SEEK_ENDOFFSET (event), &format, &position)) { + /* could not convert seek format to time offset */ + res = FALSE; + break; } dvdec->end_position = position; @@ -633,27 +636,27 @@ gst_dvdec_handle_src_event (GstPad * pad, GstEvent * event) /* first bring the format to time */ format = GST_FORMAT_TIME; if (!gst_pad_convert (pad, - GST_EVENT_SEEK_FORMAT (event), - GST_EVENT_SEEK_OFFSET (event), &format, &position)) { - /* could not convert seek format to time offset */ - res = FALSE; - break; + GST_EVENT_SEEK_FORMAT (event), + GST_EVENT_SEEK_OFFSET (event), &format, &position)) { + /* could not convert seek format to time offset */ + res = FALSE; + break; } dvdec->next_ts = position; /* then try to figure out the byteoffset for this time */ format = GST_FORMAT_BYTES; if (!gst_pad_convert (dvdec->sinkpad, GST_FORMAT_TIME, position, - &format, &position)) { - /* could not convert seek format to byte offset */ - res = FALSE; - break; + &format, &position)) { + /* could not convert seek format to byte offset */ + res = FALSE; + break; } /* seek to offset */ if (!gst_bytestream_seek (dvdec->bs, position, GST_SEEK_METHOD_SET)) { - res = FALSE; + res = FALSE; } if (GST_EVENT_TYPE (event) != GST_EVENT_SEEK_SEGMENT) - dvdec->end_position = -1; + dvdec->end_position = -1; break; } default: @@ -683,8 +686,8 @@ gst_dvdec_video_getcaps (GstPad * pad) GstStructure *structure = gst_caps_get_structure (caps, i); gst_structure_set (structure, - "height", G_TYPE_INT, dvdec->height, - "framerate", G_TYPE_DOUBLE, dvdec->framerate, NULL); + "height", G_TYPE_INT, dvdec->height, + "framerate", G_TYPE_DOUBLE, dvdec->framerate, NULL); } } @@ -827,21 +830,21 @@ gst_dvdec_loop (GstElement * element) gint i, j; dv_decode_full_audio (dvdec->decoder, GST_BUFFER_DATA (buf), - dvdec->audio_buffers); + dvdec->audio_buffers); if ((dvdec->decoder->audio->frequency != dvdec->frequency) || - (dvdec->decoder->audio->num_channels != dvdec->channels)) { + (dvdec->decoder->audio->num_channels != dvdec->channels)) { if (!gst_pad_set_explicit_caps (dvdec->audiosrcpad, - gst_caps_new_simple ("audio/x-raw-int", - "rate", G_TYPE_INT, dvdec->decoder->audio->frequency, - "depth", G_TYPE_INT, 16, - "width", G_TYPE_INT, 16, - "signed", G_TYPE_BOOLEAN, TRUE, - "channels", G_TYPE_INT, dvdec->decoder->audio->num_channels, - "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, NULL))) { - gst_buffer_unref (buf); - GST_ELEMENT_ERROR (dvdec, CORE, NEGOTIATION, (NULL), (NULL)); - return; + gst_caps_new_simple ("audio/x-raw-int", + "rate", G_TYPE_INT, dvdec->decoder->audio->frequency, + "depth", G_TYPE_INT, 16, + "width", G_TYPE_INT, 16, + "signed", G_TYPE_BOOLEAN, TRUE, + "channels", G_TYPE_INT, dvdec->decoder->audio->num_channels, + "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, NULL))) { + gst_buffer_unref (buf); + GST_ELEMENT_ERROR (dvdec, CORE, NEGOTIATION, (NULL), (NULL)); + return; } dvdec->frequency = dvdec->decoder->audio->frequency; @@ -850,14 +853,14 @@ gst_dvdec_loop (GstElement * element) outbuf = gst_buffer_new (); GST_BUFFER_SIZE (outbuf) = dvdec->decoder->audio->samples_this_frame * - sizeof (gint16) * dvdec->decoder->audio->num_channels; + sizeof (gint16) * dvdec->decoder->audio->num_channels; GST_BUFFER_DATA (outbuf) = g_malloc (GST_BUFFER_SIZE (outbuf)); a_ptr = (gint16 *) GST_BUFFER_DATA (outbuf); for (i = 0; i < dvdec->decoder->audio->samples_this_frame; i++) { for (j = 0; j < dvdec->decoder->audio->num_channels; j++) { - *(a_ptr++) = dvdec->audio_buffers[j][i]; + *(a_ptr++) = dvdec->audio_buffers[j][i]; } } gst_dvdec_push (dvdec, outbuf, dvdec->audiosrcpad, ts); @@ -885,7 +888,7 @@ gst_dvdec_loop (GstElement * element) } dv_decode_full_frame (dvdec->decoder, GST_BUFFER_DATA (buf), - dvdec->space, outframe_ptrs, outframe_pitches); + dvdec->space, outframe_ptrs, outframe_pitches); gst_dvdec_push (dvdec, outbuf, dvdec->videosrcpad, ts); } @@ -913,7 +916,7 @@ gst_dvdec_change_state (GstElement * element) case GST_STATE_READY_TO_PAUSED: dvdec->bs = gst_bytestream_new (dvdec->sinkpad); dvdec->decoder = - dv_decoder_new (0, dvdec->clamp_luma, dvdec->clamp_chroma); + dv_decoder_new (0, dvdec->clamp_luma, dvdec->clamp_chroma); dvdec->decoder->quality = dvdec->quality; break; case GST_STATE_PAUSED_TO_PLAYING: @@ -1006,7 +1009,7 @@ plugin_init (GstPlugin * plugin) return FALSE; if (!gst_element_register (plugin, "dvdec", GST_RANK_PRIMARY, - gst_dvdec_get_type ())) + gst_dvdec_get_type ())) return FALSE; return TRUE; diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c index 4a7f4ca1..d06af758 100644 --- a/ext/esd/esdmon.c +++ b/ext/esd/esdmon.c @@ -58,16 +58,16 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " - "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " - "signed = (boolean) TRUE, " - "width = (int) 16, " - "depth = (int) 16, " - "rate = [ 8000, 96000 ], " - "channels = [ 1, 2 ]; " - "audio/x-raw-int, " - "signed = (boolean) FALSE, " - "width = (int) 8, " - "depth = (int) 8, " "rate = [ 8000, 96000 ], " "channels = [ 1, 2 ]") + "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " + "signed = (boolean) TRUE, " + "width = (int) 16, " + "depth = (int) 16, " + "rate = [ 8000, 96000 ], " + "channels = [ 1, 2 ]; " + "audio/x-raw-int, " + "signed = (boolean) FALSE, " + "width = (int) 8, " + "depth = (int) 8, " "rate = [ 8000, 96000 ], " "channels = [ 1, 2 ]") ); static void gst_esdmon_base_init (gpointer g_class); @@ -96,9 +96,10 @@ gst_esdmon_depths_get_type (void) {16, "16", "16 Bits"}, {0, NULL, NULL}, }; + if (!esdmon_depths_type) { esdmon_depths_type = - g_enum_register_static ("GstEsdmonDepths", esdmon_depths); + g_enum_register_static ("GstEsdmonDepths", esdmon_depths); } return esdmon_depths_type; } @@ -113,9 +114,10 @@ gst_esdmon_channels_get_type (void) {2, "2", "Stereo"}, {0, NULL, NULL}, }; + if (!esdmon_channels_type) { esdmon_channels_type = - g_enum_register_static ("GstEsdmonChannels", esdmon_channels); + g_enum_register_static ("GstEsdmonChannels", esdmon_channels); } return esdmon_channels_type; } @@ -142,8 +144,9 @@ gst_esdmon_get_type (void) 0, gst_esdmon_init, }; + esdmon_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstEsdmon", &esdmon_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstEsdmon", &esdmon_info, 0); } return esdmon_type; } @@ -166,12 +169,12 @@ gst_esdmon_class_init (gpointer g_class, gpointer class_data) parent_class = g_type_class_peek_parent (g_class); - g_object_class_install_property (gobject_class, ARG_BYTESPERREAD, g_param_spec_ulong ("bytes_per_read", "bytes_per_read", "bytes_per_read", 0, G_MAXULONG, 0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (gobject_class, ARG_CUROFFSET, g_param_spec_ulong ("curoffset", "curoffset", "curoffset", 0, G_MAXULONG, 0, G_PARAM_READABLE)); /* CHECKME */ - g_object_class_install_property (gobject_class, ARG_DEPTH, g_param_spec_enum ("depth", "depth", "depth", GST_TYPE_ESDMON_DEPTHS, 16, G_PARAM_READWRITE)); /* CHECKME! */ - g_object_class_install_property (gobject_class, ARG_CHANNELS, g_param_spec_enum ("channels", "channels", "channels", GST_TYPE_ESDMON_CHANNELS, 2, G_PARAM_READWRITE)); /* CHECKME! */ - g_object_class_install_property (gobject_class, ARG_RATE, g_param_spec_int ("frequency", "frequency", "frequency", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (gobject_class, ARG_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (gobject_class, ARG_BYTESPERREAD, g_param_spec_ulong ("bytes_per_read", "bytes_per_read", "bytes_per_read", 0, G_MAXULONG, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (gobject_class, ARG_CUROFFSET, g_param_spec_ulong ("curoffset", "curoffset", "curoffset", 0, G_MAXULONG, 0, G_PARAM_READABLE)); /* CHECKME */ + g_object_class_install_property (gobject_class, ARG_DEPTH, g_param_spec_enum ("depth", "depth", "depth", GST_TYPE_ESDMON_DEPTHS, 16, G_PARAM_READWRITE)); /* CHECKME! */ + g_object_class_install_property (gobject_class, ARG_CHANNELS, g_param_spec_enum ("channels", "channels", "channels", GST_TYPE_ESDMON_CHANNELS, 2, G_PARAM_READWRITE)); /* CHECKME! */ + g_object_class_install_property (gobject_class, ARG_RATE, g_param_spec_int ("frequency", "frequency", "frequency", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (gobject_class, ARG_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_READWRITE)); /* CHECKME */ gobject_class->set_property = gst_esdmon_set_property; gobject_class->get_property = gst_esdmon_get_property; @@ -246,13 +249,13 @@ gst_esdmon_get (GstPad * pad) /* set caps on src pad */ if (gst_pad_set_explicit_caps (esdmon->srcpad, - gst_caps_new_simple ("audio/x-raw-int", - "endianness", G_TYPE_INT, G_BYTE_ORDER, - "signed", G_TYPE_BOOLEAN, sign, - "width", G_TYPE_INT, esdmon->depth, - "depth", G_TYPE_INT, esdmon->depth, - "rate", G_TYPE_INT, esdmon->frequency, - "channels", G_TYPE_INT, esdmon->channels)) <= 0) { + gst_caps_new_simple ("audio/x-raw-int", + "endianness", G_TYPE_INT, G_BYTE_ORDER, + "signed", G_TYPE_BOOLEAN, sign, + "width", G_TYPE_INT, esdmon->depth, + "depth", G_TYPE_INT, esdmon->depth, + "rate", G_TYPE_INT, esdmon->frequency, + "channels", G_TYPE_INT, esdmon->channels)) <= 0) { GST_ELEMENT_ERROR (esdmon, CORE, NEGOTIATION, (NULL), (NULL)); return NULL; } @@ -300,7 +303,7 @@ gst_esdmon_set_property (GObject * object, guint prop_id, const GValue * value, case ARG_RATE: /* Preserve the timestamps */ esdmon->basetime = - esdmon->samples_since_basetime * GST_SECOND / esdmon->frequency; + esdmon->samples_since_basetime * GST_SECOND / esdmon->frequency; esdmon->samples_since_basetime = 0; /* Set the new frequency */ @@ -309,11 +312,11 @@ gst_esdmon_set_property (GObject * object, guint prop_id, const GValue * value, break; case ARG_HOST: if (esdmon->host != NULL) - g_free (esdmon->host); + g_free (esdmon->host); if (g_value_get_string (value) == NULL) - esdmon->host = NULL; + esdmon->host = NULL; else - esdmon->host = g_strdup (g_value_get_string (value)); + esdmon->host = g_strdup (g_value_get_string (value)); break; default: break; @@ -432,7 +435,7 @@ gst_esdmon_change_state (GstElement * element) } else { if (!GST_FLAG_IS_SET (element, GST_ESDMON_OPEN)) { if (!gst_esdmon_open_audio (GST_ESDMON (element))) - return GST_STATE_FAILURE; + return GST_STATE_FAILURE; } } diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c index ce7045e7..c6c5be4d 100644 --- a/ext/esd/esdsink.c +++ b/ext/esd/esdsink.c @@ -59,10 +59,10 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " - "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " - "signed = (boolean) TRUE, " - "width = (int) 16, " - "depth = (int) 16, " "rate = 44100, " "channels = 2") + "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " + "signed = (boolean) TRUE, " + "width = (int) 16, " + "depth = (int) 16, " "rate = 44100, " "channels = 2") ); static void gst_esdsink_base_init (gpointer g_class); @@ -104,9 +104,10 @@ gst_esdsink_get_type (void) 0, gst_esdsink_init, }; + esdsink_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstEsdsink", &esdsink_info, - 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstEsdsink", &esdsink_info, + 0); } return esdsink_type; } @@ -129,17 +130,17 @@ gst_esdsink_class_init (gpointer g_class, gpointer class_data) parent_class = g_type_class_peek_parent (g_class); - g_object_class_install_property (gobject_class, ARG_MUTE, g_param_spec_boolean ("mute", "mute", "mute", TRUE, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (gobject_class, ARG_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (gobject_class, ARG_MUTE, g_param_spec_boolean ("mute", "mute", "mute", TRUE, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (gobject_class, ARG_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property (gobject_class, ARG_SYNC, g_param_spec_boolean ("sync", "sync", "Synchronize output to clock", - TRUE, G_PARAM_READWRITE)); + TRUE, G_PARAM_READWRITE)); #if 0 /* This option is disabled because it is dumb in GStreamer's architecture. */ g_object_class_install_property (gobject_class, ARG_FALLBACK, g_param_spec_boolean ("fallback", "fallback", - "Fall back to using OSS if Esound daemon is not present", FALSE, - G_PARAM_READWRITE)); + "Fall back to using OSS if Esound daemon is not present", FALSE, + G_PARAM_READWRITE)); #endif gobject_class->set_property = gst_esdsink_set_property; @@ -255,7 +256,7 @@ gst_esdsink_chain (GstPad * pad, GstData * _data) if (!esdsink->negotiated) { GST_ELEMENT_ERROR (esdsink, CORE, NEGOTIATION, (NULL), - ("element wasn't negotiated before chain function")); + ("element wasn't negotiated before chain function")); goto done; } @@ -264,13 +265,13 @@ gst_esdsink_chain (GstPad * pad, GstData * _data) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: - gst_audio_clock_set_active (GST_AUDIO_CLOCK (esdsink->provided_clock), - FALSE); - gst_pad_event_default (pad, event); - return; + gst_audio_clock_set_active (GST_AUDIO_CLOCK (esdsink->provided_clock), + FALSE); + gst_pad_event_default (pad, event); + return; default: - gst_pad_event_default (pad, event); - return; + gst_pad_event_default (pad, event); + return; } gst_event_unref (event); return; @@ -285,22 +286,22 @@ gst_esdsink_chain (GstPad * pad, GstData * _data) to_write = size; GST_LOG ("fd=%d data=%p size=%d", - esdsink->fd, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); + esdsink->fd, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); while (to_write > 0) { - int done; + int done; - done = write (esdsink->fd, data, to_write); + done = write (esdsink->fd, data, to_write); - if (done < 0) { - if (errno == EINTR) { - goto done; - } - g_assert_not_reached (); - } + if (done < 0) { + if (errno == EINTR) { + goto done; + } + g_assert_not_reached (); + } - to_write -= done; - data += done; - esdsink->handled += done / esdsink->bytes_per_sample; + to_write -= done; + data += done; + esdsink->handled += done / esdsink->bytes_per_sample; } } @@ -330,9 +331,9 @@ gst_esdsink_set_property (GObject * object, guint prop_id, const GValue * value, case ARG_HOST: g_free (esdsink->host); if (g_value_get_string (value) == NULL) - esdsink->host = NULL; + esdsink->host = NULL; else - esdsink->host = g_strdup (g_value_get_string (value)); + esdsink->host = g_strdup (g_value_get_string (value)); break; case ARG_SYNC: esdsink->sync = g_value_get_boolean (value); @@ -376,7 +377,7 @@ gboolean gst_esdsink_factory_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "esdsink", GST_RANK_NONE, - GST_TYPE_ESDSINK)) + GST_TYPE_ESDSINK)) return FALSE; return TRUE; @@ -399,7 +400,7 @@ gst_esdsink_open_audio (GstEsdsink * sink) esdformat |= ESD_BITS8; else { GST_ELEMENT_ERROR (sink, STREAM, FORMAT, (NULL), - ("invalid bit depth (%d)", sink->depth)); + ("invalid bit depth (%d)", sink->depth)); return FALSE; } @@ -409,22 +410,22 @@ gst_esdsink_open_audio (GstEsdsink * sink) esdformat |= ESD_MONO; else { GST_ELEMENT_ERROR (sink, STREAM, FORMAT, (NULL), - ("invalid number of channels (%d)", sink->channels)); + ("invalid number of channels (%d)", sink->channels)); return FALSE; } GST_INFO ("attempting to open connection to esound server"); if (sink->fallback) { sink->fd = - esd_play_stream_fallback (esdformat, sink->frequency, sink->host, - connname); + esd_play_stream_fallback (esdformat, sink->frequency, sink->host, + connname); } else { sink->fd = - esd_play_stream (esdformat, sink->frequency, sink->host, connname); + esd_play_stream (esdformat, sink->frequency, sink->host, connname); } if (sink->fd < 0) { GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL), - ("can't open connection to esound server")); + ("can't open connection to esound server")); return FALSE; } GST_INFO ("successfully opened connection to esound server"); @@ -454,18 +455,18 @@ gst_esdsink_change_state (GstElement * element) switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: if (!gst_esdsink_open_audio (GST_ESDSINK (element))) { - return GST_STATE_FAILURE; + return GST_STATE_FAILURE; } break; case GST_STATE_READY_TO_PAUSED: break; case GST_STATE_PAUSED_TO_PLAYING: gst_audio_clock_set_active (GST_AUDIO_CLOCK (esdsink->provided_clock), - TRUE); + TRUE); break; case GST_STATE_PLAYING_TO_PAUSED: gst_audio_clock_set_active (GST_AUDIO_CLOCK (esdsink->provided_clock), - FALSE); + FALSE); esdsink->resync = TRUE; break; case GST_STATE_PAUSED_TO_READY: diff --git a/ext/flac/gstflac.c b/ext/flac/gstflac.c index c1dba934..9432713f 100644 --- a/ext/flac/gstflac.c +++ b/ext/flac/gstflac.c @@ -38,15 +38,15 @@ plugin_init (GstPlugin * plugin) return FALSE; if (!gst_element_register (plugin, "flacenc", GST_RANK_NONE, - GST_TYPE_FLACENC)) + GST_TYPE_FLACENC)) return FALSE; if (!gst_element_register (plugin, "flacdec", GST_RANK_PRIMARY, - GST_TYPE_FLACDEC)) + GST_TYPE_FLACDEC)) return FALSE; if (!gst_element_register (plugin, "flactag", GST_RANK_PRIMARY, - gst_flac_tag_get_type ())) + gst_flac_tag_get_type ())) return FALSE; return TRUE; diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 3882df1a..af5e8b97 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -112,8 +112,9 @@ flacdec_get_type (void) 0, (GInstanceInitFunc) gst_flacdec_init, }; + flacdec_type = - g_type_register_static (GST_TYPE_ELEMENT, "FlacDec", &flacdec_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "FlacDec", &flacdec_info, 0); } return flacdec_type; } @@ -212,9 +213,9 @@ gst_flacdec_init (FlacDec * flacdec) #else FLAC__seekable_stream_decoder_set_write_callback (flacdec->decoder, (FLAC__StreamDecoderWriteStatus (*) - (const FLAC__SeekableStreamDecoder * decoder, - const FLAC__Frame * frame, - const FLAC__int32 * buffer[], void *client_data)) + (const FLAC__SeekableStreamDecoder * decoder, + const FLAC__Frame * frame, + const FLAC__int32 * buffer[], void *client_data)) (gst_flacdec_write)); #endif FLAC__seekable_stream_decoder_set_metadata_respond (flacdec->decoder, @@ -394,29 +395,29 @@ gst_flacdec_read (const FLAC__SeekableStreamDecoder * decoder, gst_bytestream_get_status (flacdec->bs, &avail, &event); switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_EOS: - GST_DEBUG ("eos"); - flacdec->eos = TRUE; - gst_event_unref (event); - if (avail == 0) { - return 0; - } - break; - case GST_EVENT_DISCONTINUOUS: - GST_DEBUG ("discont"); - - /* we are not yet sending the discont, we'll do that in the next write operation */ - flacdec->need_discont = TRUE; - gst_event_unref (event); - break; - default: - gst_pad_event_default (flacdec->sinkpad, event); - break; + case GST_EVENT_EOS: + GST_DEBUG ("eos"); + flacdec->eos = TRUE; + gst_event_unref (event); + if (avail == 0) { + return 0; + } + break; + case GST_EVENT_DISCONTINUOUS: + GST_DEBUG ("discont"); + + /* we are not yet sending the discont, we'll do that in the next write operation */ + flacdec->need_discont = TRUE; + gst_event_unref (event); + break; + default: + gst_pad_event_default (flacdec->sinkpad, event); + break; } if (avail > 0) - insize = gst_bytestream_peek_bytes (flacdec->bs, &indata, avail); + insize = gst_bytestream_peek_bytes (flacdec->bs, &indata, avail); else - insize = 0; + insize = 0; } } @@ -450,36 +451,36 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, if (!GST_PAD_CAPS (flacdec->srcpad)) { if (flacdec->seek_pending) { - flacdec->total_samples = flacdec->seek_value; + flacdec->total_samples = flacdec->seek_value; } if (GST_PAD_IS_USABLE (flacdec->srcpad)) { - GST_DEBUG ("send discont"); - - format = GST_FORMAT_TIME; - gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT, - flacdec->total_samples, &format, &time); - format = GST_FORMAT_BYTES; - gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT, - flacdec->total_samples, &format, &bytes); - discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, - GST_FORMAT_BYTES, bytes, - GST_FORMAT_DEFAULT, flacdec->total_samples, NULL); - - gst_pad_push (flacdec->srcpad, GST_DATA (discont)); + GST_DEBUG ("send discont"); + + format = GST_FORMAT_TIME; + gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT, + flacdec->total_samples, &format, &time); + format = GST_FORMAT_BYTES; + gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT, + flacdec->total_samples, &format, &bytes); + discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, + GST_FORMAT_BYTES, bytes, + GST_FORMAT_DEFAULT, flacdec->total_samples, NULL); + + gst_pad_push (flacdec->srcpad, GST_DATA (discont)); } } } if (!GST_PAD_CAPS (flacdec->srcpad)) { gst_pad_set_explicit_caps (flacdec->srcpad, - gst_caps_new_simple ("audio/x-raw-int", - "endianness", G_TYPE_INT, G_BYTE_ORDER, - "signed", G_TYPE_BOOLEAN, TRUE, - "width", G_TYPE_INT, depth, - "depth", G_TYPE_INT, depth, - "rate", G_TYPE_INT, frame->header.sample_rate, - "channels", G_TYPE_INT, channels, NULL)); + gst_caps_new_simple ("audio/x-raw-int", + "endianness", G_TYPE_INT, G_BYTE_ORDER, + "signed", G_TYPE_BOOLEAN, TRUE, + "width", G_TYPE_INT, depth, + "depth", G_TYPE_INT, depth, + "rate", G_TYPE_INT, frame->header.sample_rate, + "channels", G_TYPE_INT, channels, NULL)); flacdec->depth = depth; flacdec->channels = channels; @@ -491,23 +492,23 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, GST_BUFFER_SIZE (outbuf) = samples * channels * ((depth + 7) >> 3); GST_BUFFER_DATA (outbuf) = g_malloc (GST_BUFFER_SIZE (outbuf)); GST_BUFFER_TIMESTAMP (outbuf) = - flacdec->total_samples * GST_SECOND / frame->header.sample_rate; + flacdec->total_samples * GST_SECOND / frame->header.sample_rate; if (depth == 8) { guint8 *outbuffer = (guint8 *) GST_BUFFER_DATA (outbuf); for (i = 0; i < samples; i++) { - for (j = 0; j < channels; j++) { - *outbuffer++ = (guint8) buffer[j][i]; - } + for (j = 0; j < channels; j++) { + *outbuffer++ = (guint8) buffer[j][i]; + } } } else if (depth == 16) { guint16 *outbuffer = (guint16 *) GST_BUFFER_DATA (outbuf); for (i = 0; i < samples; i++) { - for (j = 0; j < channels; j++) { - *outbuffer++ = (guint16) buffer[j][i]; - } + for (j = 0; j < channels; j++) { + *outbuffer++ = (guint16) buffer[j][i]; + } } } else { g_warning ("flacdec: invalid depth %d found\n", depth); @@ -536,7 +537,7 @@ gst_flacdec_loop (GstElement * element) res = FLAC__seekable_stream_decoder_init (flacdec->decoder); if (res != FLAC__SEEKABLE_STREAM_DECODER_OK) { GST_ELEMENT_ERROR (flacdec, LIBRARY, INIT, (NULL), - (FLAC__SeekableStreamDecoderStateString[res])); + (FLAC__SeekableStreamDecoderStateString[res])); return; } /* FLAC__seekable_stream_decoder_process_metadata (flacdec->decoder); */ @@ -547,7 +548,7 @@ gst_flacdec_loop (GstElement * element) GST_DEBUG ("perform seek to sample %" G_GINT64_FORMAT, flacdec->seek_value); if (FLAC__seekable_stream_decoder_seek_absolute (flacdec->decoder, - flacdec->seek_value)) { + flacdec->seek_value)) { flacdec->total_samples = flacdec->seek_value; GST_DEBUG ("seek done"); } else { @@ -585,6 +586,7 @@ gst_flacdec_get_src_formats (GstPad * pad) GST_FORMAT_TIME, 0, }; + return formats; } @@ -602,47 +604,47 @@ gst_flacdec_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value, switch (src_format) { case GST_FORMAT_BYTES: switch (*dest_format) { - case GST_FORMAT_DEFAULT: - if (bytes_per_sample == 0) - return FALSE; - *dest_value = src_value / bytes_per_sample; - break; - case GST_FORMAT_TIME: - { - gint byterate = bytes_per_sample * flacdec->frequency; - - if (byterate == 0) - return FALSE; - *dest_value = src_value * GST_SECOND / byterate; - break; - } - default: - res = FALSE; + case GST_FORMAT_DEFAULT: + if (bytes_per_sample == 0) + return FALSE; + *dest_value = src_value / bytes_per_sample; + break; + case GST_FORMAT_TIME: + { + gint byterate = bytes_per_sample * flacdec->frequency; + + if (byterate == 0) + return FALSE; + *dest_value = src_value * GST_SECOND / byterate; + break; + } + default: + res = FALSE; } break; case GST_FORMAT_DEFAULT: switch (*dest_format) { - case GST_FORMAT_BYTES: - *dest_value = src_value * bytes_per_sample; - break; - case GST_FORMAT_TIME: - if (flacdec->frequency == 0) - return FALSE; - *dest_value = src_value * GST_SECOND / flacdec->frequency; - break; - default: - res = FALSE; + case GST_FORMAT_BYTES: + *dest_value = src_value * bytes_per_sample; + break; + case GST_FORMAT_TIME: + if (flacdec->frequency == 0) + return FALSE; + *dest_value = src_value * GST_SECOND / flacdec->frequency; + break; + default: + res = FALSE; } break; case GST_FORMAT_TIME: switch (*dest_format) { - case GST_FORMAT_BYTES: - scale = bytes_per_sample; - case GST_FORMAT_DEFAULT: - *dest_value = src_value * scale * flacdec->frequency / GST_SECOND; - break; - default: - res = FALSE; + case GST_FORMAT_BYTES: + scale = bytes_per_sample; + case GST_FORMAT_DEFAULT: + *dest_value = src_value * scale * flacdec->frequency / GST_SECOND; + break; + default: + res = FALSE; } break; default: @@ -659,6 +661,7 @@ gst_flacdec_get_src_query_types (GstPad * pad) GST_QUERY_POSITION, 0, }; + return types; } @@ -675,17 +678,17 @@ gst_flacdec_src_query (GstPad * pad, GstQueryType type, guint64 samples; if (flacdec->stream_samples == 0) - samples = flacdec->total_samples; + samples = flacdec->total_samples; else - samples = flacdec->stream_samples; + samples = flacdec->stream_samples; gst_pad_convert (flacdec->srcpad, - GST_FORMAT_DEFAULT, samples, format, value); + GST_FORMAT_DEFAULT, samples, format, value); break; } case GST_QUERY_POSITION: gst_pad_convert (flacdec->srcpad, - GST_FORMAT_DEFAULT, flacdec->total_samples, format, value); + GST_FORMAT_DEFAULT, flacdec->total_samples, format, value); break; default: res = FALSE; @@ -702,6 +705,7 @@ gst_flacdec_get_src_event_masks (GstPad * pad) {GST_EVENT_SEEK, GST_SEEK_FLAG_ACCURATE}, {0, 0}, }; + return masks; } @@ -717,11 +721,11 @@ gst_flacdec_src_event (GstPad * pad, GstEvent * event) format = GST_FORMAT_DEFAULT; if (gst_pad_convert (flacdec->srcpad, - GST_EVENT_SEEK_FORMAT (event), - GST_EVENT_SEEK_OFFSET (event), &format, &flacdec->seek_value)) - flacdec->seek_pending = TRUE; + GST_EVENT_SEEK_FORMAT (event), + GST_EVENT_SEEK_OFFSET (event), &format, &flacdec->seek_value)) + flacdec->seek_pending = TRUE; else - res = FALSE; + res = FALSE; break; default: res = FALSE; @@ -744,7 +748,7 @@ gst_flacdec_change_state (GstElement * element) flacdec->total_samples = 0; flacdec->eos = FALSE; if (flacdec->init == FALSE) { - FLAC__seekable_stream_decoder_reset (flacdec->decoder); + FLAC__seekable_stream_decoder_reset (flacdec->decoder); } break; case GST_STATE_PAUSED_TO_PLAYING: diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index 7e658047..1463a1fa 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -117,9 +117,9 @@ flacenc_get_type (void) }; flacenc_type = - g_type_register_static (GST_TYPE_ELEMENT, "FlacEnc", &flacenc_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "FlacEnc", &flacenc_info, 0); g_type_add_interface_static (flacenc_type, GST_TYPE_TAG_SETTER, - &tag_setter_info); + &tag_setter_info); } return flacenc_type; } @@ -137,7 +137,8 @@ typedef struct guint rice_parameter_search_dist; guint max_lpc_order; guint blocksize; -} FlacEncParams; +} +FlacEncParams; static const FlacEncParams flacenc_params[] = { {FALSE, FALSE, FALSE, FALSE, 0, FALSE, 2, 2, 0, 0, 1152}, @@ -174,6 +175,7 @@ gst_flacenc_quality_get_type (void) {9, "9", "9 - Insane"}, {0, NULL, NULL} }; + qtype = g_enum_register_static ("FlacEncQuality", values); } return qtype; @@ -235,78 +237,78 @@ gst_flacenc_class_init (FlacEncClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUALITY, g_param_spec_enum ("quality", - "Quality", - "Speed versus compression tradeoff", - GST_TYPE_FLACENC_QUALITY, DEFAULT_QUALITY, G_PARAM_READWRITE)); + "Quality", + "Speed versus compression tradeoff", + GST_TYPE_FLACENC_QUALITY, DEFAULT_QUALITY, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_STREAMABLE_SUBSET, g_param_spec_boolean ("streamable_subset", - "Streamable subset", - "true to limit encoder to generating a Subset stream, else false", - TRUE, G_PARAM_READWRITE)); + "Streamable subset", + "true to limit encoder to generating a Subset stream, else false", + TRUE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MID_SIDE_STEREO, g_param_spec_boolean ("mid_side_stereo", "Do mid side stereo", - "Do mid side stereo (only for stereo input)", - flacenc_params[DEFAULT_QUALITY].mid_side, G_PARAM_READWRITE)); + "Do mid side stereo (only for stereo input)", + flacenc_params[DEFAULT_QUALITY].mid_side, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOOSE_MID_SIDE_STEREO, g_param_spec_boolean ("loose_mid_side_stereo", - "Loose mid side stereo", "Loose mid side stereo", - flacenc_params[DEFAULT_QUALITY].loose_mid_side, G_PARAM_READWRITE)); + "Loose mid side stereo", "Loose mid side stereo", + flacenc_params[DEFAULT_QUALITY].loose_mid_side, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BLOCKSIZE, g_param_spec_uint ("blocksize", "Blocksize", "Blocksize in samples", - FLAC__MIN_BLOCK_SIZE, FLAC__MAX_BLOCK_SIZE, - flacenc_params[DEFAULT_QUALITY].blocksize, G_PARAM_READWRITE)); + FLAC__MIN_BLOCK_SIZE, FLAC__MAX_BLOCK_SIZE, + flacenc_params[DEFAULT_QUALITY].blocksize, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MAX_LPC_ORDER, g_param_spec_uint ("max_lpc_order", "Max LPC order", - "Max LPC order; 0 => use only fixed predictors", 0, - FLAC__MAX_LPC_ORDER, flacenc_params[DEFAULT_QUALITY].max_lpc_order, - G_PARAM_READWRITE)); + "Max LPC order; 0 => use only fixed predictors", 0, + FLAC__MAX_LPC_ORDER, flacenc_params[DEFAULT_QUALITY].max_lpc_order, + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QLP_COEFF_PRECISION, g_param_spec_uint ("qlp_coeff_precision", - "QLP coefficients precision", - "Precision in bits of quantized linear-predictor coefficients; 0 = automatic", - 0, 32, flacenc_params[DEFAULT_QUALITY].qlp_coeff_precision, - G_PARAM_READWRITE)); + "QLP coefficients precision", + "Precision in bits of quantized linear-predictor coefficients; 0 = automatic", + 0, 32, flacenc_params[DEFAULT_QUALITY].qlp_coeff_precision, + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QLP_COEFF_PREC_SEARCH, g_param_spec_boolean ("qlp_coeff_prec_search", - "Do QLP coefficients precision search", - "false = use qlp_coeff_precision, " - "true = search around qlp_coeff_precision, take best", - flacenc_params[DEFAULT_QUALITY].qlp_coeff_prec_search, - G_PARAM_READWRITE)); + "Do QLP coefficients precision search", + "false = use qlp_coeff_precision, " + "true = search around qlp_coeff_precision, take best", + flacenc_params[DEFAULT_QUALITY].qlp_coeff_prec_search, + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ESCAPE_CODING, g_param_spec_boolean ("escape_coding", "Do Escape coding", - "search for escape codes in the entropy coding stage " - "for slightly better compression", - flacenc_params[DEFAULT_QUALITY].escape_coding, G_PARAM_READWRITE)); + "search for escape codes in the entropy coding stage " + "for slightly better compression", + flacenc_params[DEFAULT_QUALITY].escape_coding, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_EXHAUSTIVE_MODEL_SEARCH, g_param_spec_boolean ("exhaustive_model_search", - "Do exhaustive model search", - "do exhaustive search of LP coefficient quantization (expensive!)", - flacenc_params[DEFAULT_QUALITY].exhaustive_model_search, - G_PARAM_READWRITE)); + "Do exhaustive model search", + "do exhaustive search of LP coefficient quantization (expensive!)", + flacenc_params[DEFAULT_QUALITY].exhaustive_model_search, + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MIN_RESIDUAL_PARTITION_ORDER, g_param_spec_uint ("min_residual_partition_order", - "Min residual partition order", - "Min residual partition order (above 4 doesn't usually help much)", 0, - 16, flacenc_params[DEFAULT_QUALITY].min_residual_partition_order, - G_PARAM_READWRITE)); + "Min residual partition order", + "Min residual partition order (above 4 doesn't usually help much)", 0, + 16, flacenc_params[DEFAULT_QUALITY].min_residual_partition_order, + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MAX_RESIDUAL_PARTITION_ORDER, g_param_spec_uint ("max_residual_partition_order", - "Max residual partition order", - "Max residual partition order (above 4 doesn't usually help much)", 0, - 16, flacenc_params[DEFAULT_QUALITY].max_residual_partition_order, - G_PARAM_READWRITE)); + "Max residual partition order", + "Max residual partition order (above 4 doesn't usually help much)", 0, + 16, flacenc_params[DEFAULT_QUALITY].max_residual_partition_order, + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_RICE_PARAMETER_SEARCH_DIST, g_param_spec_uint ("rice_parameter_search_dist", - "rice_parameter_search_dist", - "0 = try only calc'd parameter k; else try all [k-dist..k+dist] " - "parameters, use best", 0, FLAC__MAX_RICE_PARTITION_ORDER, - flacenc_params[DEFAULT_QUALITY].rice_parameter_search_dist, - G_PARAM_READWRITE)); + "rice_parameter_search_dist", + "0 = try only calc'd parameter k; else try all [k-dist..k+dist] " + "parameters, use best", 0, FLAC__MAX_RICE_PARTITION_ORDER, + flacenc_params[DEFAULT_QUALITY].rice_parameter_search_dist, + G_PARAM_READWRITE)); gstelement_class->change_state = gst_flacenc_change_state; } @@ -434,7 +436,7 @@ gst_flacenc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, event = gst_event_new_seek ((GstSeekType) (int) (GST_FORMAT_BYTES | - GST_SEEK_METHOD_SET), absolute_byte_offset); + GST_SEEK_METHOD_SET), absolute_byte_offset); if (event) gst_pad_push (flacenc->srcpad, GST_DATA (event)); @@ -484,8 +486,8 @@ add_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data) commment_entry.length = strlen (it->data); commment_entry.entry = it->data; FLAC__metadata_object_vorbiscomment_insert_comment (flacenc->meta[0], - flacenc->meta[0]->data.vorbis_comment.num_comments, - commment_entry, TRUE); + flacenc->meta[0]->data.vorbis_comment.num_comments, + commment_entry, TRUE); g_free (it->data); } g_list_free (comments); @@ -511,7 +513,7 @@ gst_flacenc_set_metadata (FlacEnc * flacenc) gst_tag_list_foreach (copy, add_one_tag, flacenc); if (FLAC__seekable_stream_encoder_set_metadata (flacenc->encoder, - flacenc->meta, 1) != true) + flacenc->meta, 1) != true) g_warning ("Dude, i'm already initialized!"); gst_tag_list_free (copy); } @@ -537,18 +539,18 @@ gst_flacenc_chain (GstPad * pad, GstData * _data) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: - FLAC__seekable_stream_encoder_finish (flacenc->encoder); - break; + FLAC__seekable_stream_encoder_finish (flacenc->encoder); + break; case GST_EVENT_TAG: - if (flacenc->tags) { - gst_tag_list_insert (flacenc->tags, gst_event_tag_get_list (event), - GST_TAG_MERGE_REPLACE); - } else { - g_assert_not_reached (); - } - break; + if (flacenc->tags) { + gst_tag_list_insert (flacenc->tags, gst_event_tag_get_list (event), + GST_TAG_MERGE_REPLACE); + } else { + g_assert_not_reached (); + } + break; default: - break; + break; } gst_pad_event_default (pad, event); return; @@ -556,7 +558,7 @@ gst_flacenc_chain (GstPad * pad, GstData * _data) if (!flacenc->negotiated) { GST_ELEMENT_ERROR (flacenc, CORE, NEGOTIATION, (NULL), - ("format wasn't negotiated before chain function")); + ("format wasn't negotiated before chain function")); return; } @@ -570,9 +572,9 @@ gst_flacenc_chain (GstPad * pad, GstData * _data) FLAC__SeekableStreamEncoderState state; FLAC__seekable_stream_encoder_set_write_callback (flacenc->encoder, - gst_flacenc_write_callback); + gst_flacenc_write_callback); FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder, - gst_flacenc_seek_callback); + gst_flacenc_seek_callback); FLAC__seekable_stream_encoder_set_client_data (flacenc->encoder, flacenc); @@ -580,7 +582,7 @@ gst_flacenc_chain (GstPad * pad, GstData * _data) state = FLAC__seekable_stream_encoder_init (flacenc->encoder); if (state != FLAC__STREAM_ENCODER_OK) { GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, (NULL), - ("could not initialize encoder (wrong parameters?)")); + ("could not initialize encoder (wrong parameters?)")); return; } } @@ -630,51 +632,51 @@ gst_flacenc_set_property (GObject * object, guint prop_id, break; case ARG_STREAMABLE_SUBSET: FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder, - g_value_get_boolean (value)); + g_value_get_boolean (value)); break; case ARG_MID_SIDE_STEREO: FLAC__seekable_stream_encoder_set_do_mid_side_stereo (this->encoder, - g_value_get_boolean (value)); + g_value_get_boolean (value)); break; case ARG_LOOSE_MID_SIDE_STEREO: FLAC__seekable_stream_encoder_set_loose_mid_side_stereo (this->encoder, - g_value_get_boolean (value)); + g_value_get_boolean (value)); break; case ARG_BLOCKSIZE: FLAC__seekable_stream_encoder_set_blocksize (this->encoder, - g_value_get_uint (value)); + g_value_get_uint (value)); break; case ARG_MAX_LPC_ORDER: FLAC__seekable_stream_encoder_set_max_lpc_order (this->encoder, - g_value_get_uint (value)); + g_value_get_uint (value)); break; case ARG_QLP_COEFF_PRECISION: FLAC__seekable_stream_encoder_set_qlp_coeff_precision (this->encoder, - g_value_get_uint (value)); + g_value_get_uint (value)); break; case ARG_QLP_COEFF_PREC_SEARCH: FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search (this->encoder, - g_value_get_boolean (value)); + g_value_get_boolean (value)); break; case ARG_ESCAPE_CODING: FLAC__seekable_stream_encoder_set_do_escape_coding (this->encoder, - g_value_get_boolean (value)); + g_value_get_boolean (value)); break; case ARG_EXHAUSTIVE_MODEL_SEARCH: FLAC__seekable_stream_encoder_set_do_exhaustive_model_search (this-> - encoder, g_value_get_boolean (value)); + encoder, g_value_get_boolean (value)); break; case ARG_MIN_RESIDUAL_PARTITION_ORDER: FLAC__seekable_stream_encoder_set_min_residual_partition_order (this-> - encoder, g_value_get_uint (value)); + encoder, g_value_get_uint (value)); break; case ARG_MAX_RESIDUAL_PARTITION_ORDER: FLAC__seekable_stream_encoder_set_max_residual_partition_order (this-> - encoder, g_value_get_uint (value)); + encoder, g_value_get_uint (value)); break; case ARG_RICE_PARAMETER_SEARCH_DIST: FLAC__seekable_stream_encoder_set_rice_parameter_search_dist (this-> - encoder, g_value_get_uint (value)); + encoder, g_value_get_uint (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -696,58 +698,58 @@ gst_flacenc_get_property (GObject * object, guint prop_id, break; case ARG_STREAMABLE_SUBSET: g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_streamable_subset (this->encoder)); + FLAC__seekable_stream_encoder_get_streamable_subset (this->encoder)); break; case ARG_MID_SIDE_STEREO: g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_mid_side_stereo (this->encoder)); + FLAC__seekable_stream_encoder_get_do_mid_side_stereo (this->encoder)); break; case ARG_LOOSE_MID_SIDE_STEREO: g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_loose_mid_side_stereo (this-> - encoder)); + FLAC__seekable_stream_encoder_get_loose_mid_side_stereo (this-> + encoder)); break; case ARG_BLOCKSIZE: g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_blocksize (this->encoder)); + FLAC__seekable_stream_encoder_get_blocksize (this->encoder)); break; case ARG_MAX_LPC_ORDER: g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_max_lpc_order (this->encoder)); + FLAC__seekable_stream_encoder_get_max_lpc_order (this->encoder)); break; case ARG_QLP_COEFF_PRECISION: g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_qlp_coeff_precision (this-> - encoder)); + FLAC__seekable_stream_encoder_get_qlp_coeff_precision (this-> + encoder)); break; case ARG_QLP_COEFF_PREC_SEARCH: g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search (this-> - encoder)); + FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search (this-> + encoder)); break; case ARG_ESCAPE_CODING: g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_escape_coding (this->encoder)); + FLAC__seekable_stream_encoder_get_do_escape_coding (this->encoder)); break; case ARG_EXHAUSTIVE_MODEL_SEARCH: g_value_set_boolean (value, - FLAC__seekable_stream_encoder_get_do_exhaustive_model_search (this-> - encoder)); + FLAC__seekable_stream_encoder_get_do_exhaustive_model_search (this-> + encoder)); break; case ARG_MIN_RESIDUAL_PARTITION_ORDER: g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_min_residual_partition_order (this-> - encoder)); + FLAC__seekable_stream_encoder_get_min_residual_partition_order (this-> + encoder)); break; case ARG_MAX_RESIDUAL_PARTITION_ORDER: g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_max_residual_partition_order (this-> - encoder)); + FLAC__seekable_stream_encoder_get_max_residual_partition_order (this-> + encoder)); break; case ARG_RICE_PARAMETER_SEARCH_DIST: g_value_set_uint (value, - FLAC__seekable_stream_encoder_get_rice_parameter_search_dist (this-> - encoder)); + FLAC__seekable_stream_encoder_get_rice_parameter_search_dist (this-> + encoder)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -771,20 +773,20 @@ gst_flacenc_change_state (GstElement * element) break; case GST_STATE_PAUSED_TO_READY: if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != - FLAC__STREAM_ENCODER_UNINITIALIZED) { - flacenc->stopped = TRUE; - FLAC__seekable_stream_encoder_finish (flacenc->encoder); + FLAC__STREAM_ENCODER_UNINITIALIZED) { + flacenc->stopped = TRUE; + FLAC__seekable_stream_encoder_finish (flacenc->encoder); } flacenc->negotiated = FALSE; if (flacenc->first_buf) - gst_buffer_unref (flacenc->first_buf); + gst_buffer_unref (flacenc->first_buf); flacenc->first_buf = NULL; g_free (flacenc->data); flacenc->data = NULL; if (flacenc->meta) { - FLAC__metadata_object_delete (flacenc->meta[0]); - g_free (flacenc->meta); - flacenc->meta = NULL; + FLAC__metadata_object_delete (flacenc->meta[0]); + g_free (flacenc->meta); + flacenc->meta = NULL; } break; case GST_STATE_READY_TO_NULL: diff --git a/ext/flac/gstflactag.c b/ext/flac/gstflactag.c index c931f41c..50697b7b 100644 --- a/ext/flac/gstflactag.c +++ b/ext/flac/gstflactag.c @@ -56,7 +56,8 @@ typedef enum GST_FLAC_TAG_STATE_VC_METADATA_BLOCK, GST_FLAC_TAG_STATE_ADD_VORBIS_COMMENT, GST_FLAC_TAG_STATE_AUDIO_DATA -} GstFlacTagState; +} +GstFlacTagState; struct _GstFlacTag @@ -157,11 +158,11 @@ gst_flac_tag_get_type (void) }; flac_tag_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstFlacTag", &flac_tag_info, - 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstFlacTag", &flac_tag_info, + 0); g_type_add_interface_static (flac_tag_type, GST_TYPE_TAG_SETTER, - &tag_setter_info); + &tag_setter_info); } return flac_tag_type; @@ -189,8 +190,8 @@ send_eos (GstFlacTag * tag) gst_pad_push (tag->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS))); /* Seek to end of sink stream */ if (gst_pad_send_event (GST_PAD_PEER (tag->sinkpad), - gst_event_new_seek (GST_FORMAT_BYTES | GST_SEEK_METHOD_END | - GST_SEEK_FLAG_FLUSH, 0))) { + gst_event_new_seek (GST_FORMAT_BYTES | GST_SEEK_METHOD_END | + GST_SEEK_FLAG_FLUSH, 0))) { } else { g_warning ("Couldn't seek to eos on sinkpad\n"); } @@ -209,8 +210,8 @@ caps_nego (GstFlacTag * tag) GST_LOG_OBJECT (tag, "normal operation, using audio/x-flac output"); } else { if (gst_pad_try_set_caps (tag->srcpad, - gst_caps_new_simple ("application/x-gst-tags", NULL)) - != GST_PAD_LINK_REFUSED) { + gst_caps_new_simple ("application/x-gst-tags", NULL)) + != GST_PAD_LINK_REFUSED) { tag->only_output_tags = TRUE; GST_LOG_OBJECT (tag, "fast operation, just outputting tags"); printf ("output tags only\n"); @@ -295,7 +296,7 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) } if (strncmp (GST_BUFFER_DATA (tag->buffer), FLAC_MAGIC, - FLAC_MAGIC_SIZE) == 0) { + FLAC_MAGIC_SIZE) == 0) { GstBuffer *sub; tag->state = GST_FLAC_TAG_STATE_METADATA_BLOCKS; @@ -303,8 +304,8 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) gst_pad_push (tag->srcpad, GST_DATA (sub)); sub = - gst_buffer_create_sub (tag->buffer, FLAC_MAGIC_SIZE, - GST_BUFFER_SIZE (tag->buffer) - FLAC_MAGIC_SIZE); + gst_buffer_create_sub (tag->buffer, FLAC_MAGIC_SIZE, + GST_BUFFER_SIZE (tag->buffer) - FLAC_MAGIC_SIZE); gst_buffer_unref (tag->buffer); /* We do a copy because we need a writable buffer, and _create_sub * sets the buffer it uses to read-only @@ -347,8 +348,8 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) type = (GST_BUFFER_DATA (tag->buffer)[0]) & 0x7F; size = ((GST_BUFFER_DATA (tag->buffer)[1]) << 16) - | ((GST_BUFFER_DATA (tag->buffer)[2]) << 8) - | (GST_BUFFER_DATA (tag->buffer)[3]); + | ((GST_BUFFER_DATA (tag->buffer)[2]) << 8) + | (GST_BUFFER_DATA (tag->buffer)[3]); /* The 4 bytes long header isn't included in the metadata size */ tag->metadata_bytes_remaining = size + 4; @@ -372,7 +373,7 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) g_assert (tag->metadata_bytes_remaining != 0); bytes_to_push = min (tag->metadata_bytes_remaining, - GST_BUFFER_SIZE (tag->buffer)); + GST_BUFFER_SIZE (tag->buffer)); sub = gst_buffer_create_sub (tag->buffer, 0, bytes_to_push); @@ -380,14 +381,14 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) gst_pad_push (tag->srcpad, GST_DATA (sub)); } else { if (tag->vorbiscomment == NULL) { - tag->vorbiscomment = sub; + tag->vorbiscomment = sub; } else { - GstBuffer *merge; + GstBuffer *merge; - merge = gst_buffer_merge (tag->vorbiscomment, sub); - gst_buffer_unref (tag->vorbiscomment); - gst_buffer_unref (sub); - tag->vorbiscomment = merge; + merge = gst_buffer_merge (tag->vorbiscomment, sub); + gst_buffer_unref (tag->vorbiscomment); + gst_buffer_unref (sub); + tag->vorbiscomment = merge; } } @@ -397,7 +398,7 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) GstBuffer *sub; sub = gst_buffer_create_sub (tag->buffer, bytes_to_push, - GST_BUFFER_SIZE (tag->buffer) - bytes_to_push); + GST_BUFFER_SIZE (tag->buffer) - bytes_to_push); gst_buffer_unref (tag->buffer); /* We make a copy because we need a writable buffer, and _create_sub @@ -431,17 +432,17 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) * that we encoutered some tags */ tag->tags = gst_tag_list_from_vorbiscomment_buffer (tag->vorbiscomment, - GST_BUFFER_DATA (tag->vorbiscomment), 4, NULL); + GST_BUFFER_DATA (tag->vorbiscomment), 4, NULL); if (tag->tags != NULL) { - gst_element_found_tags (GST_ELEMENT (tag), tag->tags); + gst_element_found_tags (GST_ELEMENT (tag), tag->tags); } gst_buffer_unref (tag->vorbiscomment); tag->vorbiscomment = NULL; if (tag->only_output_tags) { - send_eos (tag); - return; + send_eos (tag); + return; } } @@ -450,13 +451,13 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) tag->state = GST_FLAC_TAG_STATE_METADATA_BLOCKS; } else { if (tag->only_output_tags) { - /* If we finished parsing the metadata blocks, we will never find any - * metadata, so just stop now - */ - send_eos (tag); - return; + /* If we finished parsing the metadata blocks, we will never find any + * metadata, so just stop now + */ + send_eos (tag); + return; } else { - tag->state = GST_FLAC_TAG_STATE_ADD_VORBIS_COMMENT; + tag->state = GST_FLAC_TAG_STATE_ADD_VORBIS_COMMENT; } } } @@ -475,7 +476,7 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) user_tags = gst_tag_setter_get_list (GST_TAG_SETTER (tag)); merged_tags = gst_tag_list_merge (tag->tags, user_tags, - gst_tag_setter_get_merge_mode (GST_TAG_SETTER (tag))); + gst_tag_setter_get_merge_mode (GST_TAG_SETTER (tag))); if (merged_tags == NULL) { /* If we get a NULL list of tags, we must generate a padding block @@ -485,37 +486,37 @@ gst_flac_tag_chain (GstPad * pad, GstData * data) g_warning ("No tags found\n"); buffer = gst_buffer_new_and_alloc (12); if (buffer == NULL) { - GST_ELEMENT_ERROR (tag, CORE, TOO_LAZY, (NULL), - ("Error creating 12-byte buffer for padding block")); + GST_ELEMENT_ERROR (tag, CORE, TOO_LAZY, (NULL), + ("Error creating 12-byte buffer for padding block")); } memset (GST_BUFFER_DATA (buffer), 0, GST_BUFFER_SIZE (buffer)); - GST_BUFFER_DATA (buffer)[0] = 0x81; /* 0x80 = Last metadata block, - * 0x01 = padding block - */ + GST_BUFFER_DATA (buffer)[0] = 0x81; /* 0x80 = Last metadata block, + * 0x01 = padding block + */ } else { guchar header[4]; memset (header, 0, sizeof (header)); - header[0] = 0x84; /* 0x80 = Last metadata block, - * 0x04 = vorbiscomment block - */ + header[0] = 0x84; /* 0x80 = Last metadata block, + * 0x04 = vorbiscomment block + */ buffer = gst_tag_list_to_vorbiscomment_buffer (merged_tags, header, - sizeof (header), NULL); + sizeof (header), NULL); gst_tag_list_free (merged_tags); if (buffer == NULL) { - GST_ELEMENT_ERROR (tag, CORE, TAG, (NULL), - ("Error converting tag list to vorbiscomment buffer")); - return; + GST_ELEMENT_ERROR (tag, CORE, TAG, (NULL), + ("Error converting tag list to vorbiscomment buffer")); + return; } size = GST_BUFFER_SIZE (buffer) - 4; if ((size > 0xFFFFFF) || (size < 0)) { - /* FLAC vorbis comment blocks are limited to 2^24 bytes, - * while the vorbis specs allow more than that. Shouldn't - * be a real world problem though - */ - GST_ELEMENT_ERROR (tag, CORE, TAG, (NULL), - ("Vorbis comment of size %d too long", size)); - return; + /* FLAC vorbis comment blocks are limited to 2^24 bytes, + * while the vorbis specs allow more than that. Shouldn't + * be a real world problem though + */ + GST_ELEMENT_ERROR (tag, CORE, TAG, (NULL), + ("Vorbis comment of size %d too long", size)); + return; } } @@ -559,15 +560,15 @@ gst_flac_tag_change_state (GstElement * element) break; case GST_STATE_PAUSED_TO_READY: if (tag->buffer) { - gst_buffer_unref (tag->buffer); - tag->buffer = NULL; + gst_buffer_unref (tag->buffer); + tag->buffer = NULL; } if (tag->vorbiscomment) { - gst_buffer_unref (tag->vorbiscomment); - tag->vorbiscomment = NULL; + gst_buffer_unref (tag->vorbiscomment); + tag->vorbiscomment = NULL; } if (tag->tags) { - gst_tag_list_free (tag->tags); + gst_tag_list_free (tag->tags); } tag->state = GST_FLAC_TAG_STATE_INIT; break; diff --git a/ext/gdk_pixbuf/gst_loader.c b/ext/gdk_pixbuf/gst_loader.c index 95fd5af7..f10c90b0 100644 --- a/ext/gdk_pixbuf/gst_loader.c +++ b/ext/gdk_pixbuf/gst_loader.c @@ -41,7 +41,8 @@ typedef struct /* our own stuff - we're much better at keeping fields small :p */ GstGdkAnimation *ani; gboolean initialized; -} GstLoaderContext; +} +GstLoaderContext; GST_DEBUG_CATEGORY_STATIC (gst_loader_debug); #define GST_CAT_DEFAULT gst_loader_debug @@ -56,13 +57,13 @@ gst_loader_init (GError ** error) if (!g_thread_supported ()) { g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, - "The GStreamer loader requires threading support."); + "The GStreamer loader requires threading support."); return FALSE; } if (!gst_init_check (0, NULL)) { g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, - "GStreamer could not be initialized."); + "GStreamer could not be initialized."); return FALSE; } @@ -119,15 +120,15 @@ gst_loader_load_increment (gpointer context_pointer, const guchar * buf, gst_gdk_animation_add_data (context->ani, buf, size); if (!context->initialized && (iter = - gdk_pixbuf_animation_get_iter (GDK_PIXBUF_ANIMATION (context->ani), - NULL)) != NULL) { + gdk_pixbuf_animation_get_iter (GDK_PIXBUF_ANIMATION (context->ani), + NULL)) != NULL) { int width = - gdk_pixbuf_animation_get_width (GDK_PIXBUF_ANIMATION (context->ani)); + gdk_pixbuf_animation_get_width (GDK_PIXBUF_ANIMATION (context->ani)); int height = - gdk_pixbuf_animation_get_height (GDK_PIXBUF_ANIMATION (context->ani)); + gdk_pixbuf_animation_get_height (GDK_PIXBUF_ANIMATION (context->ani)); GdkPixbuf *pixbuf = - gdk_pixbuf_animation_get_static_image (GDK_PIXBUF_ANIMATION (context-> - ani)); + gdk_pixbuf_animation_get_static_image (GDK_PIXBUF_ANIMATION (context-> + ani)); g_object_unref (iter); GST_LOG_OBJECT (context->ani, "initializing loader"); @@ -138,9 +139,9 @@ gst_loader_load_increment (gpointer context_pointer, const guchar * buf, if (context->prepared_func) { GST_LOG_OBJECT (context->ani, "calling prepared_func %p", - context->prepared_func); + context->prepared_func); context->prepared_func (pixbuf, GDK_PIXBUF_ANIMATION (context->ani), - context->user_data); + context->user_data); } context->initialized = TRUE; @@ -187,7 +188,7 @@ gst_loader_load_animation (FILE * f, GError ** error) g_free (filename); if (iter == NULL) { g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, - "could not create an image"); + "could not create an image"); g_object_unref (ani); GST_INFO ("could not create an image"); return NULL; @@ -211,7 +212,7 @@ gst_loader_load (FILE * f, GError ** error) GST_ERROR_OBJECT (ani, "Could not get an image in _pixbuf_load"); g_object_unref (ani); g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, - "Could not get an image from file."); + "Could not get an image from file."); return NULL; } @@ -250,7 +251,7 @@ fill_info (GdkPixbufFormat * info) {" free", "xxxx ", 80}, /* ASF */ {"\060\046\262\165\216\146\317\021\246\331 \252 \142\316\154", - " z z ", 100}, + " z z ", 100}, {NULL, NULL, 0} }; diff --git a/ext/gdk_pixbuf/gstgdkanimation.c b/ext/gdk_pixbuf/gstgdkanimation.c index df58c5be..202ead64 100644 --- a/ext/gdk_pixbuf/gstgdkanimation.c +++ b/ext/gdk_pixbuf/gstgdkanimation.c @@ -54,18 +54,18 @@ gst_gdk_animation_get_type (void) NULL, NULL, gst_gdk_animation_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ sizeof (GstGdkAnimation), - 0, /* n_preallocs */ + 0, /* n_preallocs */ NULL, }; object_type = g_type_register_static (GDK_TYPE_PIXBUF_ANIMATION, - "GstGdkAnimation", &object_info, 0); + "GstGdkAnimation", &object_info, 0); GST_DEBUG_CATEGORY_INIT (gst_gdk_animation_debug, "gstloader_animation", 0, - "GStreamer GdkPixbuf loader - GdkAnimation class"); + "GStreamer GdkPixbuf loader - GdkAnimation class"); } return object_type; @@ -179,15 +179,15 @@ gst_gdk_animation_iter_get_type (void) NULL, NULL, gst_gdk_animation_iter_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ sizeof (GstGdkAnimationIter), - 0, /* n_preallocs */ + 0, /* n_preallocs */ gst_gdk_animation_iter_init, }; object_type = g_type_register_static (GDK_TYPE_PIXBUF_ANIMATION_ITER, - "GdkPixbufAniAnimIter", &object_info, 0); + "GdkPixbufAniAnimIter", &object_info, 0); } return object_type; @@ -266,12 +266,12 @@ gst_gdk_animation_iter_create_pipeline (GstGdkAnimationIter * iter) ); gst_caps_append (caps, GST_CAPS_NEW ("pixbuf_filter24", - "video/x-raw-rgb", - "endianness", GST_PROPS_INT (G_BIG_ENDIAN), - "bpp", GST_PROPS_INT (24), - "red_mask", GST_PROPS_INT (0xFF0000), - "green_mask", GST_PROPS_INT (0x00FF00), - "blue_mask", GST_PROPS_INT (0x0000FF) + "video/x-raw-rgb", + "endianness", GST_PROPS_INT (G_BIG_ENDIAN), + "bpp", GST_PROPS_INT (24), + "red_mask", GST_PROPS_INT (0xFF0000), + "green_mask", GST_PROPS_INT (0x00FF00), + "blue_mask", GST_PROPS_INT (0x0000FF) )); iter->pipeline = gst_element_factory_make ("pipeline", "main_pipeline"); @@ -323,7 +323,7 @@ gst_gdk_animation_iter_create_pipeline (GstGdkAnimationIter * iter) if (!gst_element_link_filtered (colorspace, sink, caps)) goto error; if (gst_element_set_state (iter->pipeline, - GST_STATE_PLAYING) != GST_STATE_SUCCESS) + GST_STATE_PLAYING) != GST_STATE_SUCCESS) goto error; return TRUE; @@ -346,7 +346,7 @@ gst_gdk_animation_iter_may_advance (GstGdkAnimationIter * iter) data_amount = lseek (iter->ani->temp_fd, 0, SEEK_CUR); g_assert (data_amount >= 0); g_assert (gst_element_query (gst_bin_get_by_name (GST_BIN (iter->pipeline), - "source"), GST_QUERY_POSITION, &bytes, &offset)); + "source"), GST_QUERY_POSITION, &bytes, &offset)); if (data_amount - offset > GST_GDK_BUFFER_SIZE) return TRUE; @@ -394,7 +394,7 @@ gst_gdk_animation_iter_create_pixbuf (GstGdkAnimationIter * iter) GstPad *pad; GstCaps *caps; GstElement *fakesink = - gst_bin_get_by_name (GST_BIN (iter->pipeline), "sink"); + gst_bin_get_by_name (GST_BIN (iter->pipeline), "sink"); g_assert (fakesink); pad = gst_element_get_pad (fakesink, "sink"); g_assert (pad); @@ -402,13 +402,13 @@ gst_gdk_animation_iter_create_pixbuf (GstGdkAnimationIter * iter) g_assert (caps); g_assert (GST_CAPS_IS_FIXED (caps)); g_assert (gst_caps_has_fixed_property (caps, "bpp") && - gst_caps_has_fixed_property (caps, "width") && - gst_caps_has_fixed_property (caps, "height")); + gst_caps_has_fixed_property (caps, "width") && + gst_caps_has_fixed_property (caps, "height")); gst_caps_get_int (caps, "width", &ani->width); gst_caps_get_int (caps, "height", &ani->height); gst_caps_get_int (caps, "bpp", &ani->bpp); GST_DEBUG_OBJECT (ani, "found format (width %d, height %d, bpp %d)", - ani->width, ani->height, ani->bpp); + ani->width, ani->height, ani->bpp); } g_assert (GST_BUFFER_SIZE (buf) == ani->width * ani->height * ani->bpp / 8); if (ani->bpp == 32) { @@ -473,12 +473,12 @@ gst_gdk_animation_iter_advance (GdkPixbufAnimationIter * anim_iter, ((GstClockTime) current_time->tv_sec - iter->start.tv_sec) * GST_SECOND; if (iter->start.tv_usec > current_time->tv_usec) { offset -= - ((GstClockTime) iter->start.tv_usec - - current_time->tv_usec) * GST_SECOND / G_USEC_PER_SEC; + ((GstClockTime) iter->start.tv_usec - + current_time->tv_usec) * GST_SECOND / G_USEC_PER_SEC; } else { offset += - ((GstClockTime) current_time->tv_usec - - iter->start.tv_usec) * GST_SECOND / G_USEC_PER_SEC; + ((GstClockTime) current_time->tv_usec - + iter->start.tv_usec) * GST_SECOND / G_USEC_PER_SEC; } GST_DEBUG_OBJECT (iter, "advancing to %ld:%ld (started at %ld:%ld) need offset %" @@ -487,18 +487,18 @@ gst_gdk_animation_iter_advance (GdkPixbufAnimationIter * anim_iter, if (!iter->just_seeked && offset - iter->last_timestamp > GST_GDK_MAX_DELAY_TO_SEEK) { GST_INFO_OBJECT (iter, - "current pipeline timestamp is too old (%" G_GUINT64_FORMAT " vs %" - G_GUINT64_FORMAT "), seeking there", iter->last_timestamp, offset); + "current pipeline timestamp is too old (%" G_GUINT64_FORMAT " vs %" + G_GUINT64_FORMAT "), seeking there", iter->last_timestamp, offset); if (gst_element_send_event (gst_bin_get_by_name (GST_BIN (iter->pipeline), - "sink"), - gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET | - GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, offset))) { + "sink"), + gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET | + GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, offset))) { iter->last_timestamp = offset; iter->just_seeked = TRUE; } else { GST_WARNING_OBJECT (iter, - "seek to %" G_GUINT64_FORMAT " didn't work. Iterating there...", - offset); + "seek to %" G_GUINT64_FORMAT " didn't work. Iterating there...", + offset); } } else if (iter->just_seeked) { iter->just_seeked = FALSE; @@ -507,17 +507,17 @@ gst_gdk_animation_iter_advance (GdkPixbufAnimationIter * anim_iter, while (TRUE) { if (g_queue_is_empty (iter->buffers)) { if (iter->eos) - return FALSE; + return FALSE; if (gst_gdk_animation_get_more_buffers (iter)) - continue; + continue; break; } if (GST_BUFFER_TIMESTAMP (g_queue_peek_head (iter->buffers)) > offset) break; if (buffer) { GST_LOG_OBJECT (iter, "unreffing buffer %p, because timestamp too low (%" - G_GUINT64_FORMAT " vs %" G_GUINT64_FORMAT ")", - buffer, GST_BUFFER_TIMESTAMP (buffer), offset); + G_GUINT64_FORMAT " vs %" G_GUINT64_FORMAT ")", + buffer, GST_BUFFER_TIMESTAMP (buffer), offset); gst_data_unref (GST_DATA (buffer)); } buffer = GST_BUFFER (g_queue_pop_head (iter->buffers)); @@ -547,7 +547,7 @@ gst_gdk_animation_iter_get_delay_time (GdkPixbufAnimationIter * anim_iter) return -1; } if (!gst_gdk_animation_get_more_buffers (iter)) - return -1; /* FIXME? */ + return -1; /* FIXME? */ } delay = @@ -593,52 +593,52 @@ gst_gdk_animation_get_static_image (GdkPixbufAnimation * animation) GST_LOG_OBJECT (ani, "trying to create pixbuf"); g_get_current_time (&tv); iter = - GST_GDK_ANIMATION_ITER (gdk_pixbuf_animation_get_iter (animation, &tv)); + GST_GDK_ANIMATION_ITER (gdk_pixbuf_animation_get_iter (animation, &tv)); if (iter) { guint64 offset; GstBuffer *buf; GstFormat time = GST_FORMAT_TIME; if (!gst_element_query (gst_bin_get_by_name (GST_BIN (iter->pipeline), - "sink"), GST_QUERY_TOTAL, &time, &offset)) { - offset = 0; + "sink"), GST_QUERY_TOTAL, &time, &offset)) { + offset = 0; } if (offset > 120 * GST_SECOND) { - offset = 120 * GST_SECOND; + offset = 120 * GST_SECOND; } else if (offset < 120 * GST_SECOND && offset >= 10 * GST_SECOND) { - offset = offset / 2; + offset = offset / 2; } g_assert (time == GST_FORMAT_TIME); GST_LOG_OBJECT (ani, - "using time offset %" G_GUINT64_FORMAT " for creating static image", - offset); + "using time offset %" G_GUINT64_FORMAT " for creating static image", + offset); while ((buf = g_queue_pop_head (iter->buffers)) != NULL) { - gst_data_unref (GST_DATA (buf)); + gst_data_unref (GST_DATA (buf)); } /* now we do evil stuff, be sure to get rid of the iterator afterwards */ if (!gst_element_send_event (gst_bin_get_by_name (GST_BIN (iter-> - pipeline), "sink"), - gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET | - GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, offset))) { - GST_INFO_OBJECT (ani, "seeking didn't work. Using next image"); + pipeline), "sink"), + gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET | + GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, offset))) { + GST_INFO_OBJECT (ani, "seeking didn't work. Using next image"); } do { - if (g_queue_is_empty (iter->buffers)) { - if (iter->eos) - return FALSE; - if (gst_gdk_animation_get_more_buffers (iter)) - continue; - } + if (g_queue_is_empty (iter->buffers)) { + if (iter->eos) + return FALSE; + if (gst_gdk_animation_get_more_buffers (iter)) + continue; + } } while (FALSE); if (!g_queue_is_empty (iter->buffers)) { - gst_gdk_animation_iter_create_pixbuf (iter); - ani->pixbuf = - gst_gdk_animation_iter_get_pixbuf (GDK_PIXBUF_ANIMATION_ITER - (iter)); - g_object_ref (ani->pixbuf); + gst_gdk_animation_iter_create_pixbuf (iter); + ani->pixbuf = + gst_gdk_animation_iter_get_pixbuf (GDK_PIXBUF_ANIMATION_ITER + (iter)); + g_object_ref (ani->pixbuf); } else { - g_assert (ani->pixbuf == NULL); + g_assert (ani->pixbuf == NULL); } /* DiE iterator, DiE */ g_object_unref (iter); diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c index 9691782d..6670a368 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.c +++ b/ext/gdk_pixbuf/gstgdkpixbuf.c @@ -58,22 +58,22 @@ static GstStaticPadTemplate gst_gdk_pixbuf_sink_template = GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("image/png; " - "image/jpeg; " - "image/gif; " - "image/x-icon; " - "application/x-navi-animation; " - "image/x-cmu-raster; " - "image/x-sun-raster; " - "image/x-pixmap; " - "image/tiff; " - "image/x-portable-anymap; " - "image/x-portable-bitmap; " - "image/x-portable-graymap; " - "image/x-portable-pixmap; " - "image/bmp; " - "image/x-bmp; " - "image/x-MS-bmp; " - "image/vnd.wap.wbmp; " "image/x-bitmap; " "image/x-tga") + "image/jpeg; " + "image/gif; " + "image/x-icon; " + "application/x-navi-animation; " + "image/x-cmu-raster; " + "image/x-sun-raster; " + "image/x-pixmap; " + "image/tiff; " + "image/x-portable-anymap; " + "image/x-portable-bitmap; " + "image/x-portable-graymap; " + "image/x-portable-pixmap; " + "image/bmp; " + "image/x-bmp; " + "image/x-MS-bmp; " + "image/vnd.wap.wbmp; " "image/x-bitmap; " "image/x-tga") ); static GstStaticPadTemplate gst_gdk_pixbuf_src_template = @@ -125,7 +125,7 @@ static GstCaps * gst_gdk_pixbuf_get_capslist (void) { return gst_caps_copy (gst_static_caps_get (&gst_gdk_pixbuf_sink_template. - static_caps)); + static_caps)); } #else static GstCaps * @@ -184,8 +184,9 @@ gst_gdk_pixbuf_get_type (void) 0, (GInstanceInitFunc) gst_gdk_pixbuf_init, }; + plugin_type = g_type_register_static (GST_TYPE_ELEMENT, - "GstGdkPixbuf", &plugin_info, 0); + "GstGdkPixbuf", &plugin_info, 0); } return plugin_type; } @@ -216,7 +217,7 @@ gst_gdk_pixbuf_class_init (GstGdkPixbufClass * klass) g_object_class_install_property (gobject_class, ARG_SILENT, g_param_spec_boolean ("silent", "Silent", "Produce verbose output ?", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); gobject_class->set_property = gst_gdk_pixbuf_set_property; gobject_class->get_property = gst_gdk_pixbuf_get_property; @@ -266,15 +267,15 @@ gst_gdk_pixbuf_chain (GstPad * pad, GstData * _data) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: - push_buffer = TRUE; - got_eos = TRUE; - break; + push_buffer = TRUE; + got_eos = TRUE; + break; case GST_EVENT_DISCONTINUOUS: - dump_buffer = TRUE; - break; + dump_buffer = TRUE; + break; default: - gst_pad_event_default (pad, event); - return; + gst_pad_event_default (pad, event); + return; } } @@ -289,37 +290,37 @@ gst_gdk_pixbuf_chain (GstPad * pad, GstData * _data) GError *error = NULL; if (!gdk_pixbuf_loader_close (filter->pixbuf_loader, &error)) { - GST_ELEMENT_ERROR (filter, LIBRARY, SHUTDOWN, (NULL), (error->message)); - g_error_free (error); - return; + GST_ELEMENT_ERROR (filter, LIBRARY, SHUTDOWN, (NULL), (error->message)); + g_error_free (error); + return; } pixbuf = gdk_pixbuf_loader_get_pixbuf (filter->pixbuf_loader); if (filter->image_size == 0) { - GstCaps *caps; + GstCaps *caps; - filter->width = gdk_pixbuf_get_width (pixbuf); - filter->height = gdk_pixbuf_get_height (pixbuf); - filter->rowstride = gdk_pixbuf_get_rowstride (pixbuf); - filter->image_size = filter->rowstride * filter->height; + filter->width = gdk_pixbuf_get_width (pixbuf); + filter->height = gdk_pixbuf_get_height (pixbuf); + filter->rowstride = gdk_pixbuf_get_rowstride (pixbuf); + filter->image_size = filter->rowstride * filter->height; - caps = gst_caps_copy (gst_pad_get_pad_template_caps (filter->srcpad)); - gst_caps_set_simple (caps, - "width", G_TYPE_INT, filter->width, - "height", G_TYPE_INT, filter->height, - "framerate", G_TYPE_DOUBLE, filter->framerate, NULL); + caps = gst_caps_copy (gst_pad_get_pad_template_caps (filter->srcpad)); + gst_caps_set_simple (caps, + "width", G_TYPE_INT, filter->width, + "height", G_TYPE_INT, filter->height, + "framerate", G_TYPE_DOUBLE, filter->framerate, NULL); - gst_pad_set_explicit_caps (filter->srcpad, caps); + gst_pad_set_explicit_caps (filter->srcpad, caps); } outbuf = gst_pad_alloc_buffer (filter->srcpad, GST_BUFFER_OFFSET_NONE, - filter->image_size); + filter->image_size); GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf); GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf); memcpy (GST_BUFFER_DATA (outbuf), gdk_pixbuf_get_pixels (pixbuf), - filter->image_size); + filter->image_size); gst_pad_push (filter->srcpad, GST_DATA (outbuf)); @@ -344,7 +345,7 @@ gst_gdk_pixbuf_chain (GstPad * pad, GstData * _data) } gdk_pixbuf_loader_write (filter->pixbuf_loader, GST_BUFFER_DATA (buf), - GST_BUFFER_SIZE (buf), &error); + GST_BUFFER_SIZE (buf), &error); gst_buffer_unref (buf); } @@ -450,7 +451,7 @@ plugin_init (GstPlugin * plugin) "gdk pixbuf loader"); if (!gst_element_register (plugin, "gdkpixbufdec", GST_RANK_NONE, - GST_TYPE_GDK_PIXBUF)) + GST_TYPE_GDK_PIXBUF)) return FALSE; #ifdef enable_typefind diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c index add7435e..cf8af9fc 100644 --- a/ext/jpeg/gstjpeg.c +++ b/ext/jpeg/gstjpeg.c @@ -27,11 +27,11 @@ static gboolean plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "jpegenc", GST_RANK_NONE, - GST_TYPE_JPEGENC)) + GST_TYPE_JPEGENC)) return FALSE; if (!gst_element_register (plugin, "jpegdec", GST_RANK_PRIMARY, - GST_TYPE_JPEGDEC)) + GST_TYPE_JPEGDEC)) return FALSE; return TRUE; diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index 10156559..a7bdb8fa 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -76,9 +76,10 @@ gst_jpegdec_get_type (void) 0, (GInstanceInitFunc) gst_jpegdec_init, }; + jpegdec_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstJpegDec", &jpegdec_info, - 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstJpegDec", &jpegdec_info, + 0); } return jpegdec_type; } @@ -95,8 +96,8 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("image/jpeg, " - "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]") + "width = (int) [ 16, 4096 ], " + "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]") ); static void @@ -417,10 +418,10 @@ gst_jpegdec_chain (GstPad * pad, GstData * _data) jpegdec->height = height; caps = gst_caps_new_simple ("video/x-raw-yuv", - "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'), - "width", G_TYPE_INT, width, - "height", G_TYPE_INT, height, - "framerate", G_TYPE_DOUBLE, jpegdec->fps, NULL); + "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'), + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", G_TYPE_DOUBLE, jpegdec->fps, NULL); gst_pad_set_explicit_caps (jpegdec->srcpad, caps); gst_caps_free (caps); } @@ -439,14 +440,14 @@ gst_jpegdec_chain (GstPad * pad, GstData * _data) jpegdec->line[0][j] = base[0]; base[0] += width; if (r_v == 2) { - jpegdec->line[0][j + 1] = base[0]; - base[0] += width; + jpegdec->line[0][j + 1] = base[0]; + base[0] += width; } jpegdec->line[1][k] = base[1]; jpegdec->line[2][k] = base[2]; if (r_v == 2 || k & 1) { - base[1] += width2; - base[2] += width2; + base[1] += width2; + base[2] += width2; } } /*g_print ("%d\n", jpegdec->cinfo.output_scanline); */ diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 44941719..f8657013 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -84,9 +84,10 @@ gst_jpegenc_get_type (void) 0, (GInstanceInitFunc) gst_jpegenc_init, }; + jpegenc_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstJpegEnc", &jpegenc_info, - 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstJpegEnc", &jpegenc_info, + 0); } return jpegenc_type; } @@ -103,8 +104,8 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("image/jpeg, " - "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]") + "width = (int) [ 16, 4096 ], " + "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]") ); static void @@ -137,12 +138,12 @@ gst_jpegenc_class_init (GstJpegEnc * klass) g_object_class_install_property (gobject_class, ARG_QUALITY, g_param_spec_int ("quality", "Quality", "Quality of encoding", - 0, 100, 85, G_PARAM_READWRITE)); + 0, 100, 85, G_PARAM_READWRITE)); #if 0 /* disabled, since it doesn't seem to work */ g_object_class_install_property (gobject_class, ARG_SMOOTHING, g_param_spec_int ("smoothing", "Smoothing", "Smoothing factor", - 0, 100, 0, G_PARAM_READWRITE)); + 0, 100, 0, G_PARAM_READWRITE)); #endif gobject_class->set_property = gst_jpegenc_set_property; @@ -314,12 +315,12 @@ gst_jpegenc_resync (GstJpegEnc * jpegenc) jpegenc->cinfo.comp_info[2].v_samp_factor = 1; if (height != -1) { - jpegenc->line[0] = - g_realloc (jpegenc->line[0], height * sizeof (char *)); - jpegenc->line[1] = - g_realloc (jpegenc->line[1], height * sizeof (char *) / 2); - jpegenc->line[2] = - g_realloc (jpegenc->line[2], height * sizeof (char *) / 2); + jpegenc->line[0] = + g_realloc (jpegenc->line[0], height * sizeof (char *)); + jpegenc->line[1] = + g_realloc (jpegenc->line[1], height * sizeof (char *) / 2); + jpegenc->line[2] = + g_realloc (jpegenc->line[2], height * sizeof (char *) / 2); } GST_DEBUG ("gst_jpegenc_resync: setting format done"); diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 4f6c1f0c..37417fb6 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -28,8 +28,8 @@ #include <gst/audio/audio.h> #include "gstladspa.h" -#include <ladspa.h> /* main ladspa sdk include file */ -#include "utils.h" /* ladspa sdk utility functions */ +#include <ladspa.h> /* main ladspa sdk include file */ +#include "utils.h" /* ladspa sdk utility functions */ /* 1.0 and the 1.1 preliminary headers don't define a version, but 1.1 final does */ @@ -107,13 +107,13 @@ gst_ladspa_base_init (GstLADSPAClass * klass) /* the factories take ownership of the name */ if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[j])) { - templ = gst_pad_template_new (name, GST_PAD_SINK, GST_PAD_ALWAYS, - gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps))); - klass->numsinkpads++; + templ = gst_pad_template_new (name, GST_PAD_SINK, GST_PAD_ALWAYS, + gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps))); + klass->numsinkpads++; } else { - templ = gst_pad_template_new (name, GST_PAD_SRC, GST_PAD_ALWAYS, - gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps))); - klass->numsrcpads++; + templ = gst_pad_template_new (name, GST_PAD_SRC, GST_PAD_ALWAYS, + gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps))); + klass->numsrcpads++; } gst_element_class_add_pad_template (element_class, templ); @@ -132,7 +132,7 @@ gst_ladspa_base_init (GstLADSPAClass * klass) else if ((klass->numsinkpads > 0) && (klass->numsrcpads == 0)) details->klass = "Sink/Audio/LADSPA"; else - details->klass = "Filter/Effect/Audio/LADSPA"; /* whatever this is */ + details->klass = "Filter/Effect/Audio/LADSPA"; /* whatever this is */ gst_element_class_set_details (element_class, details); klass->srcpad_portnums = g_new0 (gint, klass->numsrcpads); @@ -144,9 +144,9 @@ gst_ladspa_base_init (GstLADSPAClass * klass) for (j = 0; j < desc->PortCount; j++) { if (LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[j])) { if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[j])) - klass->sinkpad_portnums[sinkcount++] = j; + klass->sinkpad_portnums[sinkcount++] = j; else - klass->srcpad_portnums[srccount++] = j; + klass->srcpad_portnums[srccount++] = j; } } @@ -185,7 +185,7 @@ gst_ladspa_class_init (GstLADSPAClass * klass) /* walk through the ports, count the input, output and control ports */ for (i = 0; i < desc->PortCount; i++) { if (!LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[i]) && - LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i])) + LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i])) klass->numcontrols++; } @@ -199,7 +199,7 @@ gst_ladspa_class_init (GstLADSPAClass * klass) /* walk through the ports, note the portnums for control params */ for (i = 0; i < desc->PortCount; i++) { if (!LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[i]) && - LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i])) + LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i])) klass->control_portnums[controlcount++] = i; } @@ -232,27 +232,27 @@ gst_ladspa_class_init (GstLADSPAClass * klass) if (LADSPA_IS_HINT_BOUNDED_BELOW (hintdesc)) { klass->control_info[i].lower = TRUE; klass->control_info[i].lowerbound = - desc->PortRangeHints[current_portnum].LowerBound; + desc->PortRangeHints[current_portnum].LowerBound; } else { if (argtype == G_TYPE_INT) - klass->control_info[i].lowerbound = (gfloat) G_MININT; + klass->control_info[i].lowerbound = (gfloat) G_MININT; if (argtype == G_TYPE_FLOAT) - klass->control_info[i].lowerbound = -G_MAXFLOAT; + klass->control_info[i].lowerbound = -G_MAXFLOAT; } if (LADSPA_IS_HINT_BOUNDED_ABOVE (hintdesc)) { klass->control_info[i].upper = TRUE; klass->control_info[i].upperbound = - desc->PortRangeHints[current_portnum].UpperBound; + desc->PortRangeHints[current_portnum].UpperBound; if (LADSPA_IS_HINT_SAMPLE_RATE (hintdesc)) { - klass->control_info[i].samplerate = TRUE; - klass->control_info[i].upperbound *= 44100; /* FIXME? */ + klass->control_info[i].samplerate = TRUE; + klass->control_info[i].upperbound *= 44100; /* FIXME? */ } } else { if (argtype == G_TYPE_INT) - klass->control_info[i].upperbound = (gfloat) G_MAXINT; + klass->control_info[i].upperbound = (gfloat) G_MAXINT; if (argtype == G_TYPE_FLOAT) - klass->control_info[i].upperbound = G_MAXFLOAT; + klass->control_info[i].upperbound = G_MAXFLOAT; } /* use the lowerbound as the default value */ @@ -262,49 +262,49 @@ gst_ladspa_class_init (GstLADSPAClass * klass) /* figure out the defaults */ if (LADSPA_IS_HINT_HAS_DEFAULT (hintdesc)) { if (LADSPA_IS_HINT_DEFAULT_MINIMUM (hintdesc)) - klass->control_info[i].def = klass->control_info[i].lowerbound; + klass->control_info[i].def = klass->control_info[i].lowerbound; else if (LADSPA_IS_HINT_DEFAULT_LOW (hintdesc)) - if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc)) - klass->control_info[i].def = - exp (0.75 * log (klass->control_info[i].lowerbound) + - 0.25 * log (klass->control_info[i].upperbound)); - else - klass->control_info[i].def = - (0.75 * klass->control_info[i].lowerbound + - 0.25 * klass->control_info[i].upperbound); + if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc)) + klass->control_info[i].def = + exp (0.75 * log (klass->control_info[i].lowerbound) + + 0.25 * log (klass->control_info[i].upperbound)); + else + klass->control_info[i].def = + (0.75 * klass->control_info[i].lowerbound + + 0.25 * klass->control_info[i].upperbound); else if (LADSPA_IS_HINT_DEFAULT_MIDDLE (hintdesc)) - if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc)) - klass->control_info[i].def = - exp (0.5 * log (klass->control_info[i].lowerbound) + - 0.5 * log (klass->control_info[i].upperbound)); - else - klass->control_info[i].def = - (0.5 * klass->control_info[i].lowerbound + - 0.5 * klass->control_info[i].upperbound); + if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc)) + klass->control_info[i].def = + exp (0.5 * log (klass->control_info[i].lowerbound) + + 0.5 * log (klass->control_info[i].upperbound)); + else + klass->control_info[i].def = + (0.5 * klass->control_info[i].lowerbound + + 0.5 * klass->control_info[i].upperbound); else if (LADSPA_IS_HINT_DEFAULT_HIGH (hintdesc)) - if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc)) - klass->control_info[i].def = - exp (0.25 * log (klass->control_info[i].lowerbound) + - 0.75 * log (klass->control_info[i].upperbound)); - else - klass->control_info[i].def = - (0.25 * klass->control_info[i].lowerbound + - 0.75 * klass->control_info[i].upperbound); + if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc)) + klass->control_info[i].def = + exp (0.25 * log (klass->control_info[i].lowerbound) + + 0.75 * log (klass->control_info[i].upperbound)); + else + klass->control_info[i].def = + (0.25 * klass->control_info[i].lowerbound + + 0.75 * klass->control_info[i].upperbound); else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM (hintdesc)) - klass->control_info[i].def = klass->control_info[i].upperbound; + klass->control_info[i].def = klass->control_info[i].upperbound; else if (LADSPA_IS_HINT_DEFAULT_0 (hintdesc)) - klass->control_info[i].def = 0.0; + klass->control_info[i].def = 0.0; else if (LADSPA_IS_HINT_DEFAULT_1 (hintdesc)) - klass->control_info[i].def = 1.0; + klass->control_info[i].def = 1.0; else if (LADSPA_IS_HINT_DEFAULT_100 (hintdesc)) - klass->control_info[i].def = 100.0; + klass->control_info[i].def = 100.0; else if (LADSPA_IS_HINT_DEFAULT_440 (hintdesc)) - klass->control_info[i].def = 440.0; + klass->control_info[i].def = 440.0; } #endif /* LADSPA_IS_HINT_HAS_DEFAULT */ klass->control_info[i].def = CLAMP (klass->control_info[i].def, - klass->control_info[i].lowerbound, klass->control_info[i].upperbound); + klass->control_info[i].lowerbound, klass->control_info[i].upperbound); if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[current_portnum])) { argperms = G_PARAM_READWRITE; @@ -326,7 +326,7 @@ gst_ladspa_class_init (GstLADSPAClass * klass) g_strcanon (argname, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-'); /* satisfy glib2 (argname[0] must be [A-Za-z]) */ if (!((argname[0] >= 'a' && argname[0] <= 'z') || (argname[0] >= 'A' - && argname[0] <= 'Z'))) { + && argname[0] <= 'Z'))) { tempstr = argname; argname = g_strconcat ("param-", argname, NULL); g_free (tempstr); @@ -338,9 +338,9 @@ gst_ladspa_class_init (GstLADSPAClass * klass) gchar *numargname = g_strdup_printf ("%s_%d", argname, numarg++); while (g_object_class_find_property (G_OBJECT_CLASS (klass), - numargname) != NULL) { - g_free (numargname); - numargname = g_strdup_printf ("%s_%d", argname, numarg++); + numargname) != NULL) { + g_free (numargname); + numargname = g_strdup_printf ("%s_%d", argname, numarg++); } argname = numargname; } @@ -351,19 +351,19 @@ gst_ladspa_class_init (GstLADSPAClass * klass) if (argtype == G_TYPE_BOOLEAN) { paramspec = - g_param_spec_boolean (argname, argname, argname, FALSE, argperms); + g_param_spec_boolean (argname, argname, argname, FALSE, argperms); } else if (argtype == G_TYPE_INT) { paramspec = g_param_spec_int (argname, argname, argname, - (gint) klass->control_info[i].lowerbound, - (gint) klass->control_info[i].upperbound, - (gint) klass->control_info[i].def, argperms); + (gint) klass->control_info[i].lowerbound, + (gint) klass->control_info[i].upperbound, + (gint) klass->control_info[i].def, argperms); } else if (klass->control_info[i].samplerate) { paramspec = g_param_spec_float (argname, argname, argname, - 0.0, G_MAXFLOAT, 0.0, argperms); + 0.0, G_MAXFLOAT, 0.0, argperms); } else { paramspec = g_param_spec_float (argname, argname, argname, - klass->control_info[i].lowerbound, klass->control_info[i].upperbound, - klass->control_info[i].def, argperms); + klass->control_info[i].lowerbound, klass->control_info[i].upperbound, + klass->control_info[i].def, argperms); } /* properties have an offset of 1 */ @@ -395,7 +395,7 @@ gst_ladspa_init (GstLADSPA * ladspa) srccount = 0; for (l = GST_ELEMENT_CLASS (oclass)->padtemplates; l; l = l->next) { GstPad *pad = gst_pad_new_from_template (GST_PAD_TEMPLATE (l->data), - GST_PAD_TEMPLATE_NAME_TEMPLATE (l->data)); + GST_PAD_TEMPLATE_NAME_TEMPLATE (l->data)); gst_pad_set_link_function (pad, gst_ladspa_link); gst_element_add_pad ((GstElement *) ladspa, pad); @@ -413,32 +413,32 @@ gst_ladspa_init (GstLADSPA * ladspa) ladspa->controls[i] = cinfo.def; if (cinfo.toggled) { - gst_dpman_add_required_dparam_callback (ladspa->dpman, - g_param_spec_int (cinfo.param_name, cinfo.name, cinfo.name, - 0, 1, (gint) (ladspa->controls[i]), G_PARAM_READWRITE), - "int", gst_ladspa_update_int, &(ladspa->controls[i]) - ); + gst_dpman_add_required_dparam_callback (ladspa->dpman, + g_param_spec_int (cinfo.param_name, cinfo.name, cinfo.name, + 0, 1, (gint) (ladspa->controls[i]), G_PARAM_READWRITE), + "int", gst_ladspa_update_int, &(ladspa->controls[i]) + ); } else if (cinfo.integer) { - gst_dpman_add_required_dparam_callback (ladspa->dpman, - g_param_spec_int (cinfo.param_name, cinfo.name, cinfo.name, - (gint) cinfo.lowerbound, (gint) cinfo.upperbound, - (gint) ladspa->controls[i], G_PARAM_READWRITE), - "int", gst_ladspa_update_int, &(ladspa->controls[i]) - ); + gst_dpman_add_required_dparam_callback (ladspa->dpman, + g_param_spec_int (cinfo.param_name, cinfo.name, cinfo.name, + (gint) cinfo.lowerbound, (gint) cinfo.upperbound, + (gint) ladspa->controls[i], G_PARAM_READWRITE), + "int", gst_ladspa_update_int, &(ladspa->controls[i]) + ); } else if (cinfo.samplerate) { - gst_dpman_add_required_dparam_direct (ladspa->dpman, - g_param_spec_float (cinfo.param_name, cinfo.name, cinfo.name, - cinfo.lowerbound, cinfo.upperbound, - ladspa->controls[i], G_PARAM_READWRITE), - "hertz-rate-bound", &(ladspa->controls[i]) - ); + gst_dpman_add_required_dparam_direct (ladspa->dpman, + g_param_spec_float (cinfo.param_name, cinfo.name, cinfo.name, + cinfo.lowerbound, cinfo.upperbound, + ladspa->controls[i], G_PARAM_READWRITE), + "hertz-rate-bound", &(ladspa->controls[i]) + ); } else { - gst_dpman_add_required_dparam_direct (ladspa->dpman, - g_param_spec_float (cinfo.param_name, cinfo.name, cinfo.name, - cinfo.lowerbound, cinfo.upperbound, - ladspa->controls[i], G_PARAM_READWRITE), - "float", &(ladspa->controls[i]) - ); + gst_dpman_add_required_dparam_direct (ladspa->dpman, + g_param_spec_float (cinfo.param_name, cinfo.name, cinfo.name, + cinfo.lowerbound, cinfo.upperbound, + ladspa->controls[i], G_PARAM_READWRITE), + "float", &(ladspa->controls[i]) + ); } } } @@ -446,7 +446,7 @@ gst_ladspa_init (GstLADSPA * ladspa) /* nonzero default needed to instantiate() some plugins */ ladspa->samplerate = 44100; - ladspa->buffer_frames = 0; /* should be set with caps */ + ladspa->buffer_frames = 0; /* should be set with caps */ ladspa->activated = FALSE; ladspa->inplace_broken = LADSPA_IS_INPLACE_BROKEN (ladspa->descriptor->Properties); @@ -464,7 +464,7 @@ gst_ladspa_init (GstLADSPA * ladspa) } else if (sinkcount > 1) { /* more than one sink pad needs loop mode */ DEBUG_OBJ (ladspa, "loop mode with %d sink pads and %d src pads", sinkcount, - srccount); + srccount); gst_element_set_loop_function (GST_ELEMENT (ladspa), gst_ladspa_loop); } else if (sinkcount == 0 && srccount == 0) { @@ -472,7 +472,7 @@ gst_ladspa_init (GstLADSPA * ladspa) * it for now */ } else { g_warning ("%d sink pads, %d src pads not yet supported", sinkcount, - srccount); + srccount); } gst_ladspa_instantiate (ladspa); @@ -500,7 +500,7 @@ gst_ladspa_link (GstPad * pad, const GstCaps * caps) for (l = gst_element_get_pad_list (element); l; l = l->next) if (pad != (GstPad *) l->data) if (gst_pad_try_set_caps ((GstPad *) l->data, caps) <= 0) - return GST_PAD_LINK_REFUSED; + return GST_PAD_LINK_REFUSED; /* we assume that the ladspa plugin can handle any sample rate, so this check gets put last */ @@ -523,7 +523,7 @@ static void gst_ladspa_force_src_caps (GstLADSPA * ladspa, GstPad * pad) { if (!ladspa->buffer_frames) { - ladspa->buffer_frames = 256; /* 5 ms at 44100 kHz (just a default...) */ + ladspa->buffer_frames = 256; /* 5 ms at 44100 kHz (just a default...) */ } DEBUG_OBJ (ladspa, "forcing caps with rate=%d, buffer-frames=%d", @@ -531,12 +531,12 @@ gst_ladspa_force_src_caps (GstLADSPA * ladspa, GstPad * pad) gst_pad_try_set_caps (pad, gst_caps_new ("ladspa_src_caps", - "audio/x-raw-float", - gst_props_new ("width", G_TYPE_INT (32), - "endianness", G_TYPE_INT (G_BYTE_ORDER), - "rate", G_TYPE_INT (ladspa->samplerate), - "buffer-frames", G_TYPE_INT (ladspa->buffer_frames), - "channels", G_TYPE_INT (1), NULL))); + "audio/x-raw-float", + gst_props_new ("width", G_TYPE_INT (32), + "endianness", G_TYPE_INT (G_BYTE_ORDER), + "rate", G_TYPE_INT (ladspa->samplerate), + "buffer-frames", G_TYPE_INT (ladspa->buffer_frames), + "channels", G_TYPE_INT (1), NULL))); } #endif @@ -629,7 +629,7 @@ gst_ladspa_instantiate (GstLADSPA * ladspa) /* connect the control ports */ for (i = 0; i < oclass->numcontrols; i++) desc->connect_port (ladspa->handle, - oclass->control_portnums[i], &(ladspa->controls[i])); + oclass->control_portnums[i], &(ladspa->controls[i])); /* reactivate if it was activated before the reinstantiation */ if (was_activated) @@ -731,13 +731,13 @@ gst_ladspa_loop (GstElement * element) /* push it out on all pads */ gst_data_ref_by_count ((GstData *) buffers_in[i], numsrcpads); for (j = 0; j < numsrcpads; j++) - gst_pad_push (ladspa->srcpads[j], GST_DATA (buffers_in[i])); + gst_pad_push (ladspa->srcpads[j], GST_DATA (buffers_in[i])); if (GST_EVENT_TYPE (buffers_in[i]) == GST_EVENT_EOS) { - /* shut down */ - gst_element_set_eos (element); - return; + /* shut down */ + gst_element_set_eos (element); + return; } else { - goto get_buffer; + goto get_buffer; } } @@ -745,8 +745,8 @@ gst_ladspa_loop (GstElement * element) largest_buffer = GST_BUFFER_SIZE (buffers_in[i]) / sizeof (gfloat); else largest_buffer = - MIN (GST_BUFFER_SIZE (buffers_in[i]) / sizeof (gfloat), - largest_buffer); + MIN (GST_BUFFER_SIZE (buffers_in[i]) / sizeof (gfloat), + largest_buffer); data_in[i] = (LADSPA_Data *) GST_BUFFER_DATA (buffers_in[i]); GST_BUFFER_TIMESTAMP (buffers_in[i]) = ladspa->timestamp; } @@ -761,7 +761,7 @@ gst_ladspa_loop (GstElement * element) } for (; i < numsrcpads; i++) { buffers_out[i] = - gst_buffer_new_and_alloc (ladspa->buffer_frames * sizeof (gfloat)); + gst_buffer_new_and_alloc (ladspa->buffer_frames * sizeof (gfloat)); GST_BUFFER_TIMESTAMP (buffers_out[i]) = ladspa->timestamp; data_out[i] = (LADSPA_Data *) GST_BUFFER_DATA (buffers_out[i]); } @@ -778,10 +778,10 @@ gst_ladspa_loop (GstElement * element) for (i = 0; i < numsinkpads; i++) desc->connect_port (ladspa->handle, oclass->sinkpad_portnums[i], - data_in[i]); + data_in[i]); for (i = 0; i < numsrcpads; i++) desc->connect_port (ladspa->handle, oclass->srcpad_portnums[i], - data_out[i]); + data_out[i]); desc->run (ladspa->handle, num_to_process); @@ -874,7 +874,7 @@ gst_ladspa_chain (GstPad * pad, GstData * _data) desc->connect_port (ladspa->handle, oclass->sinkpad_portnums[0], data_in); for (i = 0; i < numsrcpads; i++) desc->connect_port (ladspa->handle, oclass->srcpad_portnums[i], - data_out[i]); + data_out[i]); desc->run (ladspa->handle, num_to_process); @@ -891,7 +891,7 @@ gst_ladspa_chain (GstPad * pad, GstData * _data) if (numsrcpads) { for (i = 0; i < numsrcpads; i++) { DEBUG_OBJ (ladspa, "pushing buffer (%p, length %u bytes) on src pad %d", - buffers_out[i], GST_BUFFER_SIZE (buffers_out[i]), i); + buffers_out[i], GST_BUFFER_SIZE (buffers_out[i]), i); gst_pad_push (ladspa->srcpads[i], GST_DATA (buffers_out[i])); } @@ -979,7 +979,7 @@ ladspa_describe_plugin (const char *pcFullFilename, /* base-init temp alloc */ g_hash_table_insert (ladspa_descriptors, - GINT_TO_POINTER (0), (gpointer) desc); + GINT_TO_POINTER (0), (gpointer) desc); /* create the type now */ type = g_type_register_static (GST_TYPE_ELEMENT, type_name, &typeinfo, 0); @@ -988,7 +988,7 @@ ladspa_describe_plugin (const char *pcFullFilename, /* add this plugin to the hash */ g_hash_table_insert (ladspa_descriptors, - GINT_TO_POINTER (type), (gpointer) desc); + GINT_TO_POINTER (type), (gpointer) desc); } g_hash_table_remove (ladspa_descriptors, GINT_TO_POINTER (0)); diff --git a/ext/ladspa/load.c b/ext/ladspa/load.c index 98337f58..5ea3714b 100644 --- a/ext/ladspa/load.c +++ b/ext/ladspa/load.c @@ -63,36 +63,36 @@ dlopenLADSPA (const char *pcFilename, int iFlag) */ pcLADSPAPath = g_strdup_printf ("%s:/usr/lib/ladspa:/usr/local/lib/ladspa", - getenv ("LADSPA_PATH")); + getenv ("LADSPA_PATH")); if (pcLADSPAPath) { pcStart = pcLADSPAPath; while (*pcStart != '\0') { - pcEnd = pcStart; - while (*pcEnd != ':' && *pcEnd != '\0') - pcEnd++; - - pcBuffer = malloc (iFilenameLength + 2 + (pcEnd - pcStart)); - if (pcEnd > pcStart) - strncpy (pcBuffer, pcStart, pcEnd - pcStart); - iNeedSlash = 0; - if (pcEnd > pcStart) - if (*(pcEnd - 1) != '/') { - iNeedSlash = 1; - pcBuffer[pcEnd - pcStart] = '/'; - } - strcpy (pcBuffer + iNeedSlash + (pcEnd - pcStart), pcFilename); - - pvResult = dlopen (pcBuffer, iFlag); - - free (pcBuffer); - if (pvResult != NULL) - return pvResult; - - pcStart = pcEnd; - if (*pcStart == ':') - pcStart++; + pcEnd = pcStart; + while (*pcEnd != ':' && *pcEnd != '\0') + pcEnd++; + + pcBuffer = malloc (iFilenameLength + 2 + (pcEnd - pcStart)); + if (pcEnd > pcStart) + strncpy (pcBuffer, pcStart, pcEnd - pcStart); + iNeedSlash = 0; + if (pcEnd > pcStart) + if (*(pcEnd - 1) != '/') { + iNeedSlash = 1; + pcBuffer[pcEnd - pcStart] = '/'; + } + strcpy (pcBuffer + iNeedSlash + (pcEnd - pcStart), pcFilename); + + pvResult = dlopen (pcBuffer, iFlag); + + free (pcBuffer); + if (pvResult != NULL) + return pvResult; + + pcStart = pcEnd; + if (*pcStart == ':') + pcStart++; } } } @@ -134,7 +134,7 @@ loadLADSPAPluginLibrary (const char *pcPluginFilename) pvPluginHandle = dlopenLADSPA (pcPluginFilename, RTLD_NOW); if (!pvPluginHandle) { fprintf (stderr, - "Failed to load plugin \"%s\": %s\n", pcPluginFilename, dlerror ()); + "Failed to load plugin \"%s\": %s\n", pcPluginFilename, dlerror ()); exit (1); } @@ -169,10 +169,10 @@ findLADSPAPluginDescriptor (void *pvLADSPAPluginLibrary, if (pcError) { fprintf (stderr, - "Unable to find ladspa_descriptor() function in plugin " - "library file \"%s\": %s.\n" - "Are you sure this is a LADSPA plugin file?\n", - pcPluginLibraryFilename, pcError); + "Unable to find ladspa_descriptor() function in plugin " + "library file \"%s\": %s.\n" + "Are you sure this is a LADSPA plugin file?\n", + pcPluginLibraryFilename, pcError); exit (1); } } @@ -181,8 +181,8 @@ findLADSPAPluginDescriptor (void *pvLADSPAPluginLibrary, psDescriptor = pfDescriptorFunction (lPluginIndex); if (psDescriptor == NULL) { fprintf (stderr, - "Unable to find label \"%s\" in plugin library file \"%s\".\n", - pcPluginLabel, pcPluginLibraryFilename); + "Unable to find label \"%s\" in plugin library file \"%s\".\n", + pcPluginLabel, pcPluginLibraryFilename); exit (1); } if (strcmp (psDescriptor->Label, pcPluginLabel) == 0) diff --git a/ext/ladspa/search.c b/ext/ladspa/search.c index 0f690275..0e481a36 100644 --- a/ext/ladspa/search.c +++ b/ext/ladspa/search.c @@ -61,7 +61,7 @@ static void } pcFilename = malloc (lDirLength + strlen (psDirectoryEntry->d_name) - + 1 + iNeedSlash); + + 1 + iNeedSlash); strcpy (pcFilename, pcDirectory); if (iNeedSlash) strcat (pcFilename, "/"); @@ -73,15 +73,15 @@ static void dlerror (); fDescriptorFunction - = (LADSPA_Descriptor_Function) dlsym (pvPluginHandle, - "ladspa_descriptor"); + = (LADSPA_Descriptor_Function) dlsym (pvPluginHandle, + "ladspa_descriptor"); if (dlerror () == NULL && fDescriptorFunction) { - /* We've successfully found a ladspa_descriptor function. Pass - it to the callback function. */ - fCallbackFunction (pcFilename, pvPluginHandle, fDescriptorFunction); + /* We've successfully found a ladspa_descriptor function. Pass + it to the callback function. */ + fCallbackFunction (pcFilename, pvPluginHandle, fDescriptorFunction); } else { - /* It was a library, but not a LADSPA one. Unload it. */ - dlclose (pcFilename); + /* It was a library, but not a LADSPA one. Unload it. */ + dlclose (pcFilename); } } free (pcFilename); diff --git a/ext/libcaca/gstcacasink.c b/ext/libcaca/gstcacasink.c index 4cb64e4b..f8448ab3 100644 --- a/ext/libcaca/gstcacasink.c +++ b/ext/libcaca/gstcacasink.c @@ -55,7 +55,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_RGBx ";" - GST_VIDEO_CAPS_RGB_16 ";" GST_VIDEO_CAPS_RGB_15) + GST_VIDEO_CAPS_RGB_16 ";" GST_VIDEO_CAPS_RGB_15) ); static void gst_cacasink_base_init (gpointer g_class); @@ -111,13 +111,13 @@ gst_cacasink_get_type (void) }; cacasink_type = - g_type_register_static (GST_TYPE_VIDEOSINK, "GstCACASink", - &cacasink_info, 0); + g_type_register_static (GST_TYPE_VIDEOSINK, "GstCACASink", + &cacasink_info, 0); g_type_add_interface_static (cacasink_type, GST_TYPE_IMPLEMENTS_INTERFACE, - &iface_info); + &iface_info); g_type_add_interface_static (cacasink_type, GST_TYPE_NAVIGATION, - &navigation_info); + &navigation_info); } return cacasink_type; } @@ -177,14 +177,14 @@ gst_cacasink_class_init (GstCACASinkClass * klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_WIDTH, g_param_spec_int ("screen_width", "screen_width", "screen_width", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_HEIGHT, g_param_spec_int ("screen_height", "screen_height", "screen_height", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_WIDTH, g_param_spec_int ("screen_width", "screen_width", "screen_width", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_HEIGHT, g_param_spec_int ("screen_height", "screen_height", "screen_height", G_MININT, G_MAXINT, 0, G_PARAM_READABLE)); /* CHECKME */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DITHER, g_param_spec_enum ("dither", "Dither Type", "Set type of Dither", - GST_TYPE_CACADITHER, 0, G_PARAM_READWRITE)); + GST_TYPE_CACADITHER, 0, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ANTIALIASING, g_param_spec_boolean ("anti_aliasing", "Anti-Aliasing", - "Enables Anti-Aliasing", TRUE, G_PARAM_READWRITE)); + "Enables Anti-Aliasing", TRUE, G_PARAM_READWRITE)); gobject_class->set_property = gst_cacasink_set_property; gobject_class->get_property = gst_cacasink_get_property; @@ -333,8 +333,8 @@ gst_cacasink_chain (GstPad * pad, GstData * _data) if (cacasink->id && GST_CLOCK_TIME_IS_VALID (time)) { GST_DEBUG ("videosink: clock %s wait: %" G_GUINT64_FORMAT " %u", - GST_OBJECT_NAME (GST_VIDEOSINK_CLOCK (cacasink)), - time, GST_BUFFER_SIZE (buf)); + GST_OBJECT_NAME (GST_VIDEOSINK_CLOCK (cacasink)), + time, GST_BUFFER_SIZE (buf)); gst_element_wait (GST_ELEMENT (cacasink), GST_BUFFER_TIMESTAMP (buf)); } @@ -388,11 +388,11 @@ gst_cacasink_set_property (GObject * object, guint prop_id, case ARG_ANTIALIASING:{ cacasink->antialiasing = g_value_get_boolean (value); if (cacasink->antialiasing) { - caca_set_feature (CACA_ANTIALIASING_MAX); + caca_set_feature (CACA_ANTIALIASING_MAX); } else { - caca_set_feature (CACA_ANTIALIASING_MIN); + caca_set_feature (CACA_ANTIALIASING_MIN); } break; } @@ -463,7 +463,7 @@ gst_cacasink_change_state (GstElement * element) } else { if (!GST_FLAG_IS_SET (element, GST_CACASINK_OPEN)) { if (!gst_cacasink_open (GST_CACASINK (element))) - return GST_STATE_FAILURE; + return GST_STATE_FAILURE; } } @@ -481,7 +481,7 @@ plugin_init (GstPlugin * plugin) return FALSE; if (!gst_element_register (plugin, "cacasink", GST_RANK_NONE, - GST_TYPE_CACASINK)) + GST_TYPE_CACASINK)) return FALSE; return TRUE; diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index 78055cce..a0df5e1f 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -90,7 +90,7 @@ gst_pngenc_get_type (void) }; pngenc_type = g_type_register_static (GST_TYPE_ELEMENT, "GstPngEnc", - &pngenc_info, 0); + &pngenc_info, 0); } return pngenc_type; } @@ -245,7 +245,7 @@ gst_pngenc_chain (GstPad * pad, GstData * _data) pngenc->png_info_ptr = png_create_info_struct (pngenc->png_struct_ptr); if (!pngenc->png_info_ptr) { png_destroy_read_struct (&(pngenc->png_struct_ptr), (png_infopp) NULL, - (png_infopp) NULL); + (png_infopp) NULL); } /* non-0 return is from a longjmp inside of libpng */ @@ -273,7 +273,7 @@ gst_pngenc_chain (GstPad * pad, GstData * _data) for (row_index = 0; row_index < pngenc->height; row_index++) row_pointers[row_index] = GST_BUFFER_DATA (buf) + - (pngenc->width * row_index * pngenc->bpp / 8); + (pngenc->width * row_index * pngenc->bpp / 8); png_write_info (pngenc->png_struct_ptr, pngenc->png_info_ptr); png_write_image (pngenc->png_struct_ptr, row_pointers); diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c index 89e057c1..e7f90748 100644 --- a/ext/mikmod/gstmikmod.c +++ b/ext/mikmod/gstmikmod.c @@ -68,18 +68,18 @@ static GstStaticPadTemplate mikmod_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " - "endianness = (int) BYTE_ORDER, " - "signed = (boolean) TRUE, " - "width = (int) 16, " - "depth = (int) 16, " - "rate = (int) { 8000, 11025, 22050, 44100 }, " - "channels = (int) [ 1, 2 ]; " - "audio/x-raw-int, " - "signed = (boolean) FALSE, " - "width = (int) 8, " - "depth = (int) 8, " - "rate = (int) { 8000, 11025, 22050, 44100 }, " - "channels = (int) [ 1, 2 ]") + "endianness = (int) BYTE_ORDER, " + "signed = (boolean) TRUE, " + "width = (int) 16, " + "depth = (int) 16, " + "rate = (int) { 8000, 11025, 22050, 44100 }, " + "channels = (int) [ 1, 2 ]; " + "audio/x-raw-int, " + "signed = (boolean) FALSE, " + "width = (int) 8, " + "depth = (int) 8, " + "rate = (int) { 8000, 11025, 22050, 44100 }, " + "channels = (int) [ 1, 2 ]") ); static GstStaticPadTemplate mikmod_sink_factory = @@ -123,8 +123,9 @@ gst_mikmod_get_type (void) 0, (GInstanceInitFunc) gst_mikmod_init, }; + mikmod_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstMikmod", &mikmod_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstMikmod", &mikmod_info, 0); } return mikmod_type; } @@ -154,44 +155,44 @@ gst_mikmod_class_init (GstMikModClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SONGNAME, g_param_spec_string ("songname", "songname", "songname", - NULL, G_PARAM_READABLE)); + NULL, G_PARAM_READABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MODTYPE, g_param_spec_string ("modtype", "modtype", "modtype", - NULL, G_PARAM_READABLE)); + NULL, G_PARAM_READABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MUSICVOLUME, g_param_spec_int ("musicvolume", "musivolume", "musicvolume", - 0, 128, 128, G_PARAM_READWRITE)); + 0, 128, 128, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PANSEP, g_param_spec_int ("pansep", "pansep", "pansep", - 0, 128, 128, G_PARAM_READWRITE)); + 0, 128, 128, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_REVERB, g_param_spec_int ("reverb", "reverb", "reverb", - 0, 15, 0, G_PARAM_READWRITE)); + 0, 15, 0, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SNDFXVOLUME, g_param_spec_int ("sndfxvolume", "sndfxvolume", "sndfxvolume", - 0, 128, 128, G_PARAM_READWRITE)); + 0, 128, 128, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VOLUME, g_param_spec_int ("volume", "volume", "volume", - 0, 128, 96, G_PARAM_READWRITE)); + 0, 128, 96, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_INTERP, g_param_spec_boolean ("interp", "interp", "interp", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_REVERSE, g_param_spec_boolean ("reverse", "reverse", "reverse", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SURROUND, g_param_spec_boolean ("surround", "surround", "surround", - TRUE, G_PARAM_READWRITE)); + TRUE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HQMIXER, g_param_spec_boolean ("hqmixer", "hqmixer", "hqmixer", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SOFT_MUSIC, g_param_spec_boolean ("soft_music", "soft_music", "soft_music", - TRUE, G_PARAM_READWRITE)); + TRUE, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SOFT_SNDFX, g_param_spec_boolean ("soft_sndfx", "soft_sndfx", "soft_sndfx", - TRUE, G_PARAM_READWRITE)); + TRUE, G_PARAM_READWRITE)); gobject_class->set_property = gst_mikmod_set_property; @@ -296,28 +297,28 @@ gst_mikmod_loop (GstElement * element) if (!mikmod->initialized) { while ((buffer_in = GST_BUFFER (gst_pad_pull (mikmod->sinkpad)))) { if (GST_IS_EVENT (buffer_in)) { - GstEvent *event = GST_EVENT (buffer_in); + GstEvent *event = GST_EVENT (buffer_in); - if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) - break; + if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) + break; } else { - if (mikmod->Buffer) { - GstBuffer *merge; - - merge = gst_buffer_merge (mikmod->Buffer, buffer_in); - gst_buffer_unref (buffer_in); - gst_buffer_unref (mikmod->Buffer); - mikmod->Buffer = merge; - } else { - mikmod->Buffer = buffer_in; - } + if (mikmod->Buffer) { + GstBuffer *merge; + + merge = gst_buffer_merge (mikmod->Buffer, buffer_in); + gst_buffer_unref (buffer_in); + gst_buffer_unref (mikmod->Buffer); + mikmod->Buffer = merge; + } else { + mikmod->Buffer = buffer_in; + } } } if (!GST_PAD_CAPS (mikmod->srcpad)) { if (GST_PAD_LINK_SUCCESSFUL (gst_pad_renegotiate (mikmod->srcpad))) { - GST_ELEMENT_ERROR (mikmod, CORE, NEGOTIATION, (NULL), (NULL)); - return; + GST_ELEMENT_ERROR (mikmod, CORE, NEGOTIATION, (NULL), (NULL)); + return; } } @@ -541,7 +542,7 @@ static gboolean plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "mikmod", GST_RANK_SECONDARY, - GST_TYPE_MIKMOD)) + GST_TYPE_MIKMOD)) return FALSE; return TRUE; diff --git a/ext/mikmod/mikmod_types.c b/ext/mikmod/mikmod_types.c index 370f59cb..27b2cfff 100644 --- a/ext/mikmod/mikmod_types.c +++ b/ext/mikmod/mikmod_types.c @@ -23,8 +23,8 @@ #include <gst/gst.h> #include "mikmod_types.h" -#include <string.h> /* memcmp */ -#include <ctype.h> /* isdigit */ +#include <string.h> /* memcmp */ +#include <ctype.h> /* isdigit */ #define MODULEHEADERSIZE 0x438 diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c index d0b40294..17f5eca7 100644 --- a/ext/pango/gsttextoverlay.c +++ b/ext/pango/gsttextoverlay.c @@ -34,8 +34,8 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-yuv, " - "format = (fourcc) I420, " - "width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ]") + "format = (fourcc) I420, " + "width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ]") ); static GstStaticPadTemplate video_sink_template_factory = @@ -43,8 +43,8 @@ GST_STATIC_PAD_TEMPLATE ("video_sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-yuv, " - "format = (fourcc) I420, " - "width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ]") + "format = (fourcc) I420, " + "width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ]") ); static GstStaticPadTemplate text_sink_template_factory = @@ -88,9 +88,10 @@ gst_textoverlay_get_type (void) 0, (GInstanceInitFunc) gst_textoverlay_init, }; + textoverlay_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstTextOverlay", - &textoverlay_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstTextOverlay", + &textoverlay_info, 0); } return textoverlay_type; } @@ -129,35 +130,35 @@ gst_textoverlay_class_init (GstTextOverlayClass * klass) klass->pango_context = pango_ft2_get_context (72, 72); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TEXT, g_param_spec_string ("text", "text", - "Text to be display," - " in pango markup format.", "", G_PARAM_WRITABLE)); + "Text to be display," + " in pango markup format.", "", G_PARAM_WRITABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VALIGN, g_param_spec_string ("valign", "vertical alignment", - "Vertical alignment of the text. " - "Can be either 'baseline', 'bottom', or 'top'", - "baseline", G_PARAM_WRITABLE)); + "Vertical alignment of the text. " + "Can be either 'baseline', 'bottom', or 'top'", + "baseline", G_PARAM_WRITABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HALIGN, g_param_spec_string ("halign", "horizontal alignment", - "Horizontal alignment of the text. " - "Can be either 'left', 'right', or 'center'", - "center", G_PARAM_WRITABLE)); + "Horizontal alignment of the text. " + "Can be either 'left', 'right', or 'center'", + "center", G_PARAM_WRITABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_X0, g_param_spec_int ("x0", "X position", - "Initial X position." - " Horizontal aligment takes this point" - " as reference.", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE)); + "Initial X position." + " Horizontal aligment takes this point" + " as reference.", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_Y0, g_param_spec_int ("y0", "Y position", - "Initial Y position." - " Vertical aligment takes this point" - " as reference.", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE)); + "Initial Y position." + " Vertical aligment takes this point" + " as reference.", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FONT_DESC, g_param_spec_string ("font-desc", "font description", - "Pango font description of font " - "to be used for rendering. " - "See documentation of " - "pango_font_description_from_string" - " for syntax.", "", G_PARAM_WRITABLE)); + "Pango font description of font " + "to be used for rendering. " + "See documentation of " + "pango_font_description_from_string" + " for syntax.", "", G_PARAM_WRITABLE)); } @@ -231,22 +232,22 @@ static void gst_text_overlay_blit_yuv420 (GstTextOverlay * overlay, FT_Bitmap * bitmap, guchar * pixbuf, int x0, int y0) { - int y; /* text bitmap coordinates */ - int x1, y1; /* video buffer coordinates */ + int y; /* text bitmap coordinates */ + int x1, y1; /* video buffer coordinates */ int rowinc, bit_rowinc, uv_rowinc; guchar *p, *bitp, *u_p; int video_width = overlay->width, video_height = overlay->height; - int bitmap_x0 = x0 < 1 ? -(x0 - 1) : 1; /* 1 pixel border */ - int bitmap_y0 = y0 < 1 ? -(y0 - 1) : 1; /* 1 pixel border */ + int bitmap_x0 = x0 < 1 ? -(x0 - 1) : 1; /* 1 pixel border */ + int bitmap_y0 = y0 < 1 ? -(y0 - 1) : 1; /* 1 pixel border */ int bitmap_width = bitmap->width - bitmap_x0; int bitmap_height = bitmap->rows - bitmap_y0; int u_plane_size; int skip_y, skip_x; guchar v; - if (x0 + bitmap_x0 + bitmap_width > video_width - 1) /* 1 pixel border */ + if (x0 + bitmap_x0 + bitmap_width > video_width - 1) /* 1 pixel border */ bitmap_width -= x0 + bitmap_x0 + bitmap_width - video_width + 1; - if (y0 + bitmap_y0 + bitmap_height > video_height - 1) /* 1 pixel border */ + if (y0 + bitmap_y0 + bitmap_height > video_height - 1) /* 1 pixel border */ bitmap_height -= y0 + bitmap_y0 + bitmap_height - video_height + 1; rowinc = video_width - bitmap_width; @@ -264,10 +265,10 @@ gst_text_overlay_blit_yuv420 (GstTextOverlay * overlay, FT_Bitmap * bitmap, for (n = bitmap_width; n > 0; --n) { v = *bitp; if (v) { - p[-1] = CLAMP (p[-1] - v, 0, 255); - p[1] = CLAMP (p[1] - v, 0, 255); - p[-video_width] = CLAMP (p[-video_width] - v, 0, 255); - p[video_width] = CLAMP (p[video_width] - v, 0, 255); + p[-1] = CLAMP (p[-1] - v, 0, 255); + p[1] = CLAMP (p[1] - v, 0, 255); + p[-video_width] = CLAMP (p[-video_width] - v, 0, 255); + p[video_width] = CLAMP (p[video_width] - v, 0, 255); } p++; bitp++; @@ -295,15 +296,15 @@ gst_text_overlay_blit_yuv420 (GstTextOverlay * overlay, FT_Bitmap * bitmap, for (n = bitmap_width; n > 0; --n) { v = *bitp; if (v) { - *p = v; - if (!skip_y) { - u_p[0] = u_p[u_plane_size] = 0x80; - } + *p = v; + if (!skip_y) { + u_p[0] = u_p[u_plane_size] = 0x80; + } } if (!skip_y) { - skip_x = !skip_x; - if (!skip_x) - u_p++; + skip_x = !skip_x; + if (!skip_x) + u_p++; } p++; bitp++; @@ -414,7 +415,7 @@ gst_textoverlay_loop (GstElement * element) if (overlay->next_buffer && (GST_BUFFER_TIMESTAMP (overlay->next_buffer) <= now || - GST_BUFFER_TIMESTAMP (overlay->next_buffer) == GST_CLOCK_TIME_NONE)) { + GST_BUFFER_TIMESTAMP (overlay->next_buffer) == GST_CLOCK_TIME_NONE)) { GST_DEBUG ("using new buffer"); if (overlay->current_buffer) { @@ -424,11 +425,11 @@ gst_textoverlay_loop (GstElement * element) overlay->next_buffer = NULL; GST_DEBUG ("rendering '%*s'", - GST_BUFFER_SIZE (overlay->current_buffer), - GST_BUFFER_DATA (overlay->current_buffer)); + GST_BUFFER_SIZE (overlay->current_buffer), + GST_BUFFER_DATA (overlay->current_buffer)); pango_layout_set_markup (overlay->layout, - GST_BUFFER_DATA (overlay->current_buffer), - GST_BUFFER_SIZE (overlay->current_buffer)); + GST_BUFFER_DATA (overlay->current_buffer), + GST_BUFFER_SIZE (overlay->current_buffer)); render_text (overlay); overlay->need_render = FALSE; } @@ -445,7 +446,7 @@ gst_textoverlay_loop (GstElement * element) if (overlay->need_render) { GST_DEBUG ("rendering '%s'", overlay->default_text); pango_layout_set_markup (overlay->layout, - overlay->default_text, strlen (overlay->default_text)); + overlay->default_text, strlen (overlay->default_text)); render_text (overlay); overlay->need_render = FALSE; @@ -547,7 +548,7 @@ gst_textoverlay_set_property (GObject * object, guint prop_id, case ARG_TEXT: if (overlay->default_text) { - g_free (overlay->default_text); + g_free (overlay->default_text); } overlay->default_text = g_strdup (g_value_get_string (value)); overlay->need_render = TRUE; @@ -555,26 +556,26 @@ gst_textoverlay_set_property (GObject * object, guint prop_id, case ARG_VALIGN: if (strcasecmp (g_value_get_string (value), "baseline") == 0) - overlay->valign = GST_TEXT_OVERLAY_VALIGN_BASELINE; + overlay->valign = GST_TEXT_OVERLAY_VALIGN_BASELINE; else if (strcasecmp (g_value_get_string (value), "bottom") == 0) - overlay->valign = GST_TEXT_OVERLAY_VALIGN_BOTTOM; + overlay->valign = GST_TEXT_OVERLAY_VALIGN_BOTTOM; else if (strcasecmp (g_value_get_string (value), "top") == 0) - overlay->valign = GST_TEXT_OVERLAY_VALIGN_TOP; + overlay->valign = GST_TEXT_OVERLAY_VALIGN_TOP; else - g_warning ("Invalid 'valign' property value: %s", - g_value_get_string (value)); + g_warning ("Invalid 'valign' property value: %s", + g_value_get_string (value)); break; case ARG_HALIGN: if (strcasecmp (g_value_get_string (value), "left") == 0) - overlay->halign = GST_TEXT_OVERLAY_HALIGN_LEFT; + overlay->halign = GST_TEXT_OVERLAY_HALIGN_LEFT; else if (strcasecmp (g_value_get_string (value), "right") == 0) - overlay->halign = GST_TEXT_OVERLAY_HALIGN_RIGHT; + overlay->halign = GST_TEXT_OVERLAY_HALIGN_RIGHT; else if (strcasecmp (g_value_get_string (value), "center") == 0) - overlay->halign = GST_TEXT_OVERLAY_HALIGN_CENTER; + overlay->halign = GST_TEXT_OVERLAY_HALIGN_CENTER; else - g_warning ("Invalid 'halign' property value: %s", - g_value_get_string (value)); + g_warning ("Invalid 'halign' property value: %s", + g_value_get_string (value)); break; case ARG_X0: @@ -591,13 +592,13 @@ gst_textoverlay_set_property (GObject * object, guint prop_id, desc = pango_font_description_from_string (g_value_get_string (value)); if (desc) { - g_message ("font description set: %s", g_value_get_string (value)); - pango_layout_set_font_description (overlay->layout, desc); - pango_font_description_free (desc); - render_text (overlay); + g_message ("font description set: %s", g_value_get_string (value)); + pango_layout_set_font_description (overlay->layout, desc); + pango_font_description_free (desc); + render_text (overlay); } else - g_warning ("font description parse failed: %s", - g_value_get_string (value)); + g_warning ("font description parse failed: %s", + g_value_get_string (value)); break; } @@ -627,7 +628,7 @@ static gboolean plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "textoverlay", GST_RANK_PRIMARY, - GST_TYPE_TEXTOVERLAY)) + GST_TYPE_TEXTOVERLAY)) return FALSE; /*texttestsrc_plugin_init(module, plugin); */ diff --git a/ext/pango/gsttimeoverlay.c b/ext/pango/gsttimeoverlay.c index 9ce5c897..3ec20bcb 100644 --- a/ext/pango/gsttimeoverlay.c +++ b/ext/pango/gsttimeoverlay.c @@ -87,8 +87,9 @@ gst_timeoverlay_get_type (void) 0, gst_timeoverlay_init, }; + timeoverlay_type = g_type_register_static (GST_TYPE_VIDEOFILTER, - "GstTimeoverlay", &timeoverlay_info, 0); + "GstTimeoverlay", &timeoverlay_info, 0); } return timeoverlay_type; } @@ -114,7 +115,7 @@ gst_timeoverlay_base_init (gpointer g_class) for (i = 0; i < G_N_ELEMENTS (gst_timeoverlay_formats); i++) { gst_videofilter_class_add_format (videofilter_class, - gst_timeoverlay_formats + i); + gst_timeoverlay_formats + i); } gst_videofilter_class_add_pad_templates (GST_VIDEOFILTER_CLASS (g_class)); @@ -132,8 +133,8 @@ gst_timeoverlay_class_init (gpointer g_class, gpointer class_data) #if 0 g_object_class_install_property (gobject_class, ARG_METHOD, g_param_spec_enum ("method", "method", "method", - GST_TYPE_TIMEOVERLAY_METHOD, GST_TIMEOVERLAY_METHOD_1, - G_PARAM_READWRITE)); + GST_TYPE_TIMEOVERLAY_METHOD, GST_TIMEOVERLAY_METHOD_1, + G_PARAM_READWRITE)); #endif gobject_class->set_property = gst_timeoverlay_set_property; @@ -293,7 +294,7 @@ gst_timeoverlay_planar411 (GstVideofilter * videofilter, void *dest, void *src) layout = pango_layout_new (timeoverlay->context); string = gst_timeoverlay_print_smpte_time (GST_BUFFER_TIMESTAMP (videofilter-> - in_buf)); + in_buf)); pango_layout_set_text (layout, string, strlen (string)); g_free (string); @@ -314,7 +315,7 @@ gst_timeoverlay_planar411 (GstVideofilter * videofilter, void *dest, void *src) for (i = 0; i < b_height / 2; i++) { memset (dest + width * height + i * (width / 2), 128, b_width / 2); memset (dest + width * height + (width / 2) * (height / 2) + - i * (width / 2), 128, b_width / 2); + i * (width / 2), 128, b_width / 2); } bitmap.rows = b_height; bitmap.width = b_width; diff --git a/ext/raw1394/gst1394.c b/ext/raw1394/gst1394.c index 250a5764..cd89d9f5 100644 --- a/ext/raw1394/gst1394.c +++ b/ext/raw1394/gst1394.c @@ -30,7 +30,7 @@ static gboolean plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "dv1394src", GST_RANK_NONE, - GST_TYPE_DV1394SRC)) + GST_TYPE_DV1394SRC)) return FALSE; return TRUE; diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 9509ea2c..fcc93729 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -60,14 +60,14 @@ gst_dv1394src_factory (void) if (!template) { template = gst_pad_template_new ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("dv1394src", - "video/dv", - gst_props_new ("format", GST_PROPS_LIST (G_TYPE_STRING ("NTSC"), - G_TYPE_STRING ("PAL") - ), NULL) - ), NULL); + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("dv1394src", + "video/dv", + gst_props_new ("format", GST_PROPS_LIST (G_TYPE_STRING ("NTSC"), + G_TYPE_STRING ("PAL") + ), NULL) + ), NULL); } return template; } @@ -107,9 +107,10 @@ gst_dv1394src_get_type (void) 0, (GInstanceInitFunc) gst_dv1394src_init, }; + gst_dv1394src_type = - g_type_register_static (GST_TYPE_ELEMENT, "DV1394Src", - &gst_dv1394src_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "DV1394Src", + &gst_dv1394src_info, 0); } return gst_dv1394src_type; } @@ -133,14 +134,14 @@ gst_dv1394src_class_init (GstDV1394SrcClass * klass) g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CONSECUTIVE, g_param_spec_int ("consecutive", "consecutive frames", - "send n consecutive frames after skipping", 1, G_MAXINT, 1, - G_PARAM_READWRITE)); + "send n consecutive frames after skipping", 1, G_MAXINT, 1, + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SKIP, g_param_spec_int ("skip", "skip frames", "skip n frames", 0, G_MAXINT, 1, - G_PARAM_READWRITE)); + G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DROP_INCOMPLETE, g_param_spec_boolean ("drop_incomplete", "drop_incomplete", - "drop incomplete frames", TRUE, G_PARAM_READWRITE)); + "drop incomplete frames", TRUE, G_PARAM_READWRITE)); parent_class = g_type_class_ref (GST_TYPE_ELEMENT); @@ -235,58 +236,58 @@ gst_dv1394src_iso_receive (raw1394handle_t handle, int channel, size_t len, the following code taken from kino-0.51 (Dan Dennedy/Charles Yates) */ unsigned char *p = (unsigned char *) &data[3]; - int section_type = p[0] >> 5; /* section type is in bits 5 - 7 */ - int dif_sequence = p[1] >> 4; /* dif sequence number is in bits 4 - 7 */ + int section_type = p[0] >> 5; /* section type is in bits 5 - 7 */ + int dif_sequence = p[1] >> 4; /* dif sequence number is in bits 4 - 7 */ int dif_block = p[2]; /* if we are at the beginning of a frame, we set buf=frame, and alloc a new buffer for frame */ - if (section_type == 0 && dif_sequence == 0) { // dif header + if (section_type == 0 && dif_sequence == 0) { // dif header if (!dv1394src->negotiated) { - // figure format (NTSC/PAL) - if (p[3] & 0x80) { - // PAL - dv1394src->frameSize = PAL_FRAMESIZE; - GST_DEBUG ("PAL data"); - if (gst_pad_try_set_caps (dv1394src->srcpad, - gst_caps_new_simple ("video/dv", - "format", G_TYPE_STRING, "PAL", NULL)) <= 0) { - GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, (NULL), - ("Could not set source caps for PAL")); - return 0; - } - } else { - // NTSC (untested) - dv1394src->frameSize = NTSC_FRAMESIZE; - GST_DEBUG - ("NTSC data [untested] - please report success/failure to <dan@f3c.com>"); - if (gst_pad_try_set_caps (dv1394src->srcpad, - gst_caps_new_simple ("video/dv", "format", G_TYPE_STRING, - "NTSC", NULL)) <= 0) { - GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, (NULL), - ("Could not set source caps for NTSC")); - return 0; - } - } - dv1394src->negotiated = TRUE; + // figure format (NTSC/PAL) + if (p[3] & 0x80) { + // PAL + dv1394src->frameSize = PAL_FRAMESIZE; + GST_DEBUG ("PAL data"); + if (gst_pad_try_set_caps (dv1394src->srcpad, + gst_caps_new_simple ("video/dv", + "format", G_TYPE_STRING, "PAL", NULL)) <= 0) { + GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, (NULL), + ("Could not set source caps for PAL")); + return 0; + } + } else { + // NTSC (untested) + dv1394src->frameSize = NTSC_FRAMESIZE; + GST_DEBUG + ("NTSC data [untested] - please report success/failure to <dan@f3c.com>"); + if (gst_pad_try_set_caps (dv1394src->srcpad, + gst_caps_new_simple ("video/dv", "format", G_TYPE_STRING, + "NTSC", NULL)) <= 0) { + GST_ELEMENT_ERROR (dv1394src, CORE, NEGOTIATION, (NULL), + ("Could not set source caps for NTSC")); + return 0; + } + } + dv1394src->negotiated = TRUE; } // drop last frame when not complete if (!dv1394src->drop_incomplete - || dv1394src->bytesInFrame == dv1394src->frameSize) { - dv1394src->buf = dv1394src->frame; + || dv1394src->bytesInFrame == dv1394src->frameSize) { + dv1394src->buf = dv1394src->frame; } else { - GST_INFO_OBJECT (GST_ELEMENT (dv1394src), "incomplete frame dropped"); + GST_INFO_OBJECT (GST_ELEMENT (dv1394src), "incomplete frame dropped"); } dv1394src->frame = NULL; dv1394src->frameSequence++; if (dv1394src->frameSequence % (dv1394src->skip + - dv1394src->consecutive) < dv1394src->consecutive) { - dv1394src->frame = gst_buffer_new_and_alloc (dv1394src->frameSize); + dv1394src->consecutive) < dv1394src->consecutive) { + dv1394src->frame = gst_buffer_new_and_alloc (dv1394src->frameSize); } dv1394src->bytesInFrame = 0; } @@ -296,33 +297,33 @@ gst_dv1394src_iso_receive (raw1394handle_t handle, int channel, size_t len, switch (section_type) { - case 0: /* 1 Header block */ - /* p[3] |= 0x80; // hack to force PAL data */ - memcpy (data + dif_sequence * 150 * 80, p, 480); - break; - - case 1: /* 2 Subcode blocks */ - memcpy (data + dif_sequence * 150 * 80 + (1 + dif_block) * 80, p, - 480); - break; - - case 2: /* 3 VAUX blocks */ - memcpy (data + dif_sequence * 150 * 80 + (3 + dif_block) * 80, p, - 480); - break; - - case 3: /* 9 Audio blocks interleaved with video */ - memcpy (data + dif_sequence * 150 * 80 + (6 + dif_block * 16) * 80, p, - 480); - break; - - case 4: /* 135 Video blocks interleaved with audio */ - memcpy (data + dif_sequence * 150 * 80 + (7 + (dif_block / 15) + - dif_block) * 80, p, 480); - break; - - default: /* we canīt handle any other data */ - break; + case 0: /* 1 Header block */ + /* p[3] |= 0x80; // hack to force PAL data */ + memcpy (data + dif_sequence * 150 * 80, p, 480); + break; + + case 1: /* 2 Subcode blocks */ + memcpy (data + dif_sequence * 150 * 80 + (1 + dif_block) * 80, p, + 480); + break; + + case 2: /* 3 VAUX blocks */ + memcpy (data + dif_sequence * 150 * 80 + (3 + dif_block) * 80, p, + 480); + break; + + case 3: /* 9 Audio blocks interleaved with video */ + memcpy (data + dif_sequence * 150 * 80 + (6 + dif_block * 16) * 80, p, + 480); + break; + + case 4: /* 135 Video blocks interleaved with audio */ + memcpy (data + dif_sequence * 150 * 80 + (7 + (dif_block / 15) + + dif_block) * 80, p, 480); + break; + + default: /* we canīt handle any other data */ + break; } dv1394src->bytesInFrame += 480; } @@ -362,35 +363,35 @@ gst_dv1394src_change_state (GstElement * element) switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: if ((dv1394src->handle = raw1394_new_handle ()) == NULL) { - GST_INFO_OBJECT (dv1394src, "can't get raw1394 handle"); - return GST_STATE_FAILURE; + GST_INFO_OBJECT (dv1394src, "can't get raw1394 handle"); + return GST_STATE_FAILURE; } raw1394_set_userdata (dv1394src->handle, dv1394src); dv1394src->numcards = - raw1394_get_port_info (dv1394src->handle, dv1394src->pinfo, 16); + raw1394_get_port_info (dv1394src->handle, dv1394src->pinfo, 16); if (dv1394src->numcards == 0) { - GST_INFO_OBJECT (dv1394src, "no cards available for raw1394"); - return GST_STATE_FAILURE; + GST_INFO_OBJECT (dv1394src, "no cards available for raw1394"); + return GST_STATE_FAILURE; } if (dv1394src->pinfo[dv1394src->card].nodes <= 1) { - GST_INFO_OBJECT (dv1394src, "there are no nodes on the 1394 bus"); - return GST_STATE_FAILURE; + GST_INFO_OBJECT (dv1394src, "there are no nodes on the 1394 bus"); + return GST_STATE_FAILURE; } if (raw1394_set_port (dv1394src->handle, dv1394src->port) < 0) { - GST_INFO_OBJECT (dv1394src, "can't set 1394 port %d", dv1394src->port); - return GST_STATE_FAILURE; + GST_INFO_OBJECT (dv1394src, "can't set 1394 port %d", dv1394src->port); + return GST_STATE_FAILURE; } raw1394_set_iso_handler (dv1394src->handle, dv1394src->channel, - gst_dv1394src_iso_receive); + gst_dv1394src_iso_receive); raw1394_set_bus_reset_handler (dv1394src->handle, - gst_dv1394src_bus_reset); + gst_dv1394src_bus_reset); dv1394src->started = FALSE; GST_DEBUG ("successfully opened up 1394 connection"); break; case GST_STATE_PAUSED_TO_PLAYING: if (raw1394_start_iso_rcv (dv1394src->handle, dv1394src->channel) < 0) { - GST_INFO_OBJECT (dv1394src, "can't start 1394 iso receive"); - return GST_STATE_FAILURE; + GST_INFO_OBJECT (dv1394src, "can't start 1394 iso receive"); + return GST_STATE_FAILURE; } break; case GST_STATE_PLAYING_TO_PAUSED: diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c index 4a1d4a1e..99416760 100644 --- a/ext/shout2/gstshout2.c +++ b/ext/shout2/gstshout2.c @@ -44,18 +44,18 @@ enum enum { ARG_0, - ARG_IP, /* the ip of the server */ - ARG_PORT, /* the encoder port number on the server */ - ARG_PASSWORD, /* the encoder password on the server */ - ARG_PUBLIC, /* is this stream public? */ - ARG_NAME, /* Name of the stream */ - ARG_DESCRIPTION, /* Description of the stream */ - ARG_GENRE, /* Genre of the stream */ - - ARG_PROTOCOL, /* Protocol to connect with */ - - ARG_MOUNT, /* mountpoint of stream (icecast only) */ - ARG_URL, /* Url of stream (I'm guessing) */ + ARG_IP, /* the ip of the server */ + ARG_PORT, /* the encoder port number on the server */ + ARG_PASSWORD, /* the encoder password on the server */ + ARG_PUBLIC, /* is this stream public? */ + ARG_NAME, /* Name of the stream */ + ARG_DESCRIPTION, /* Description of the stream */ + ARG_GENRE, /* Genre of the stream */ + + ARG_PROTOCOL, /* Protocol to connect with */ + + ARG_MOUNT, /* mountpoint of stream (icecast only) */ + ARG_URL, /* Url of stream (I'm guessing) */ }; static GstPadTemplate * @@ -65,15 +65,15 @@ sink_template_factory (void) if (!template) { template = gst_pad_template_new ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - gst_caps_new ("shout2send_sink", - "application/ogg", - NULL), - gst_caps_new ("shout2send_sink", - "audio/mpeg", - gst_props_new ("mpegversion", GST_PROPS_INT (1), - "layer", GST_PROPS_INT_RANGE (1, 3), NULL)), NULL); + GST_PAD_SINK, + GST_PAD_ALWAYS, + gst_caps_new ("shout2send_sink", + "application/ogg", + NULL), + gst_caps_new ("shout2send_sink", + "audio/mpeg", + gst_props_new ("mpegversion", GST_PROPS_INT (1), + "layer", GST_PROPS_INT_RANGE (1, 3), NULL)), NULL); } return template; @@ -105,14 +105,15 @@ gst_shout2send_protocol_get_type (void) static GEnumValue shout2send_protocol[] = { {SHOUT2SEND_PROTOCOL_ICE, "1", "Ice Protocol"}, {SHOUT2SEND_PROTOCOL_XAUDIOCAST, "2", - "Xaudiocast Protocol (icecast 1.3.x)"}, + "Xaudiocast Protocol (icecast 1.3.x)"}, {SHOUT2SEND_PROTOCOL_ICY, "3", "Icy Protocol (ShoutCast)"}, {SHOUT2SEND_PROTOCOL_HTTP, "4", "Http Protocol (icecast 2.x)"}, {0, NULL, NULL}, }; + if (!shout2send_protocol_type) { shout2send_protocol_type = - g_enum_register_static ("GstShout2SendProtocol", shout2send_protocol); + g_enum_register_static ("GstShout2SendProtocol", shout2send_protocol); } return shout2send_protocol_type; } @@ -134,9 +135,10 @@ gst_shout2send_get_type (void) 0, (GInstanceInitFunc) gst_shout2send_init, }; + shout2send_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstShout2send", - &shout2send_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstShout2send", + &shout2send_info, 0); } return shout2send_type; } @@ -161,28 +163,28 @@ gst_shout2send_class_init (GstShout2sendClass * klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_IP, g_param_spec_string ("ip", "ip", "ip", NULL, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PORT, g_param_spec_int ("port", "port", "port", 1, G_MAXUSHORT, 8000, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_IP, g_param_spec_string ("ip", "ip", "ip", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PORT, g_param_spec_int ("port", "port", "port", 1, G_MAXUSHORT, 8000, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PASSWORD, g_param_spec_string ("password", "password", "password", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PASSWORD, g_param_spec_string ("password", "password", "password", NULL, G_PARAM_READWRITE)); /* CHECKME */ /* metadata */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GENRE, g_param_spec_string ("genre", "genre", "genre", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GENRE, g_param_spec_string ("genre", "genre", "genre", NULL, G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PROTOCOL, g_param_spec_enum ("protocol", "protocol", "Connection Protocol to use", - GST_TYPE_SHOUT_PROTOCOL, SHOUT2SEND_PROTOCOL_HTTP, - G_PARAM_READWRITE)); + GST_TYPE_SHOUT_PROTOCOL, SHOUT2SEND_PROTOCOL_HTTP, + G_PARAM_READWRITE)); /* icecast only */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MOUNT, g_param_spec_string ("mount", "mount", "mount", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MOUNT, g_param_spec_string ("mount", "mount", "mount", NULL, G_PARAM_READWRITE)); /* CHECKME */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_URL, g_param_spec_string ("url", "url", "url", NULL, G_PARAM_READWRITE)); /* CHECKME */ + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_URL, g_param_spec_string ("url", "url", "url", NULL, G_PARAM_READWRITE)); /* CHECKME */ @@ -254,7 +256,7 @@ gst_shout2send_set_property (GObject * object, guint prop_id, case ARG_IP: if (shout2send->ip) - g_free (shout2send->ip); + g_free (shout2send->ip); shout2send->ip = g_strdup (g_value_get_string (value)); break; @@ -264,41 +266,41 @@ gst_shout2send_set_property (GObject * object, guint prop_id, case ARG_PASSWORD: if (shout2send->password) - g_free (shout2send->password); + g_free (shout2send->password); shout2send->password = g_strdup (g_value_get_string (value)); break; - case ARG_NAME: /* Name of the stream */ + case ARG_NAME: /* Name of the stream */ if (shout2send->name) - g_free (shout2send->name); + g_free (shout2send->name); shout2send->name = g_strdup (g_value_get_string (value)); break; - case ARG_DESCRIPTION: /* Description of the stream */ + case ARG_DESCRIPTION: /* Description of the stream */ if (shout2send->description) - g_free (shout2send->description); + g_free (shout2send->description); shout2send->description = g_strdup (g_value_get_string (value)); break; - case ARG_GENRE: /* Genre of the stream */ + case ARG_GENRE: /* Genre of the stream */ if (shout2send->genre) - g_free (shout2send->genre); + g_free (shout2send->genre); shout2send->genre = g_strdup (g_value_get_string (value)); break; - case ARG_PROTOCOL: /* protocol to connect with */ + case ARG_PROTOCOL: /* protocol to connect with */ shout2send->protocol = g_value_get_enum (value); break; - case ARG_MOUNT: /* mountpoint of stream (icecast only) */ + case ARG_MOUNT: /* mountpoint of stream (icecast only) */ if (shout2send->mount) - g_free (shout2send->mount); + g_free (shout2send->mount); shout2send->mount = g_strdup (g_value_get_string (value)); break; - case ARG_URL: /* Url of the stream (I'm guessing) */ + case ARG_URL: /* Url of the stream (I'm guessing) */ if (shout2send->url) - g_free (shout2send->url); + g_free (shout2send->url); shout2send->url = g_strdup (g_value_get_string (value)); break; @@ -329,27 +331,27 @@ gst_shout2send_get_property (GObject * object, guint prop_id, GValue * value, g_value_set_string (value, shout2send->password); break; - case ARG_NAME: /* Name of the stream */ + case ARG_NAME: /* Name of the stream */ g_value_set_string (value, shout2send->name); break; - case ARG_DESCRIPTION: /* Description of the stream */ + case ARG_DESCRIPTION: /* Description of the stream */ g_value_set_string (value, shout2send->description); break; - case ARG_GENRE: /* Genre of the stream */ + case ARG_GENRE: /* Genre of the stream */ g_value_set_string (value, shout2send->genre); break; - case ARG_PROTOCOL: /* protocol to connect with */ + case ARG_PROTOCOL: /* protocol to connect with */ g_value_set_enum (value, shout2send->protocol); break; - case ARG_MOUNT: /* mountpoint of stream (icecast only) */ + case ARG_MOUNT: /* mountpoint of stream (icecast only) */ g_value_set_string (value, shout2send->mount); break; - case ARG_URL: /* Url of stream (I'm guessing) */ + case ARG_URL: /* Url of stream (I'm guessing) */ g_value_set_string (value, shout2send->url); break; @@ -400,23 +402,23 @@ gst_shout2send_change_state (GstElement * element) shout2send->conn = shout_new (); switch (shout2send->protocol) { - case SHOUT2SEND_PROTOCOL_ICE: - proto = SHOUT_PROTOCOL_ICE; - break; - case SHOUT2SEND_PROTOCOL_XAUDIOCAST: - proto = SHOUT_PROTOCOL_XAUDIOCAST; - break; - case SHOUT2SEND_PROTOCOL_ICY: - proto = SHOUT_PROTOCOL_ICY; - break; - case SHOUT2SEND_PROTOCOL_HTTP: - proto = SHOUT_PROTOCOL_HTTP; - break; + case SHOUT2SEND_PROTOCOL_ICE: + proto = SHOUT_PROTOCOL_ICE; + break; + case SHOUT2SEND_PROTOCOL_XAUDIOCAST: + proto = SHOUT_PROTOCOL_XAUDIOCAST; + break; + case SHOUT2SEND_PROTOCOL_ICY: + proto = SHOUT_PROTOCOL_ICY; + break; + case SHOUT2SEND_PROTOCOL_HTTP: + proto = SHOUT_PROTOCOL_HTTP; + break; } if (shout_set_protocol (shout2send->conn, proto) != SHOUTERR_SUCCESS) { - g_error ("Error setting protocol: %s\n", - shout_get_error (shout2send->conn)); + g_error ("Error setting protocol: %s\n", + shout_get_error (shout2send->conn)); } /* --- FIXME: shout requires an ip, and fails if it is given a host. */ @@ -424,61 +426,61 @@ gst_shout2send_change_state (GstElement * element) if (shout_set_host (shout2send->conn, shout2send->ip) != SHOUTERR_SUCCESS) { - g_error ("Error setting host: %s\n", - shout_get_error (shout2send->conn)); + g_error ("Error setting host: %s\n", + shout_get_error (shout2send->conn)); } /* --- */ if (shout_set_port (shout2send->conn, - shout2send->port) != SHOUTERR_SUCCESS) { - g_error ("Error setting port: %s\n", - shout_get_error (shout2send->conn)); + shout2send->port) != SHOUTERR_SUCCESS) { + g_error ("Error setting port: %s\n", + shout_get_error (shout2send->conn)); } if (shout_set_password (shout2send->conn, - shout2send->password) != SHOUTERR_SUCCESS) { - g_error ("Error setting password: %s\n", - shout_get_error (shout2send->conn)); + shout2send->password) != SHOUTERR_SUCCESS) { + g_error ("Error setting password: %s\n", + shout_get_error (shout2send->conn)); } if (shout_set_name (shout2send->conn, - shout2send->name) != SHOUTERR_SUCCESS) { - g_error ("Error setting name: %s\n", - shout_get_error (shout2send->conn)); + shout2send->name) != SHOUTERR_SUCCESS) { + g_error ("Error setting name: %s\n", + shout_get_error (shout2send->conn)); } if (shout_set_description (shout2send->conn, - shout2send->description) != SHOUTERR_SUCCESS) { - g_error ("Error setting name: %s\n", - shout_get_error (shout2send->conn)); + shout2send->description) != SHOUTERR_SUCCESS) { + g_error ("Error setting name: %s\n", + shout_get_error (shout2send->conn)); } if (shout_set_genre (shout2send->conn, - shout2send->genre) != SHOUTERR_SUCCESS) { - g_error ("Error setting name: %s\n", - shout_get_error (shout2send->conn)); + shout2send->genre) != SHOUTERR_SUCCESS) { + g_error ("Error setting name: %s\n", + shout_get_error (shout2send->conn)); } if (shout_set_mount (shout2send->conn, - shout2send->mount) != SHOUTERR_SUCCESS) { - g_error ("Error setting mount point: %s\n", - shout_get_error (shout2send->conn)); + shout2send->mount) != SHOUTERR_SUCCESS) { + g_error ("Error setting mount point: %s\n", + shout_get_error (shout2send->conn)); } if (shout_set_user (shout2send->conn, "source") != SHOUTERR_SUCCESS) { - g_error ("Error setting user: %s\n", - shout_get_error (shout2send->conn)); + g_error ("Error setting user: %s\n", + shout_get_error (shout2send->conn)); } gst_version (&major, &minor, µ); version_string = - g_strdup_printf ("GStreamer %d.%d.%d", major, minor, micro); + g_strdup_printf ("GStreamer %d.%d.%d", major, minor, micro); if (shout_set_agent (shout2send->conn, - version_string) != SHOUTERR_SUCCESS) { - g_error ("Error setting agent: %s\n", - shout_get_error (shout2send->conn)); + version_string) != SHOUTERR_SUCCESS) { + g_error ("Error setting agent: %s\n", + shout_get_error (shout2send->conn)); } g_free (version_string); @@ -492,18 +494,18 @@ gst_shout2send_change_state (GstElement * element) we are being given as input. */ if (shout_set_format (shout2send->conn, audio_format) != SHOUTERR_SUCCESS) { - g_error ("Error setting connection format: %s\n", - shout_get_error (shout2send->conn)); + g_error ("Error setting connection format: %s\n", + shout_get_error (shout2send->conn)); } if (shout_open (shout2send->conn) == SHOUTERR_SUCCESS) { - g_print ("connected to server...\n"); + g_print ("connected to server...\n"); } else { - g_warning ("Couldn't connect to server: %s", - shout_get_error (shout2send->conn)); - shout_close (shout2send->conn); - shout_free (shout2send->conn); - return GST_STATE_FAILURE; + g_warning ("Couldn't connect to server: %s", + shout_get_error (shout2send->conn)); + shout_close (shout2send->conn); + shout_free (shout2send->conn); + return GST_STATE_FAILURE; } break; case GST_STATE_PAUSED_TO_READY: diff --git a/ext/speex/gstspeex.c b/ext/speex/gstspeex.c index 0b0de0bf..cde74576 100644 --- a/ext/speex/gstspeex.c +++ b/ext/speex/gstspeex.c @@ -27,11 +27,11 @@ static gboolean plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "speexenc", GST_RANK_NONE, - GST_TYPE_SPEEXENC)) + GST_TYPE_SPEEXENC)) return FALSE; if (!gst_element_register (plugin, "speexdec", GST_RANK_PRIMARY, - GST_TYPE_SPEEXDEC)) + GST_TYPE_SPEEXDEC)) return FALSE; return TRUE; diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index 364ae669..2338f348 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -77,9 +77,10 @@ gst_speexdec_get_type (void) 0, (GInstanceInitFunc) gst_speexdec_init, }; + speexdec_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstSpeexDec", &speexdec_info, - 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstSpeexDec", &speexdec_info, + 0); } return speexdec_type; } @@ -89,18 +90,18 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-speex, " - "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") + "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") ); static GstStaticPadTemplate speex_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " - "endianness = (int) BYTE_ORDER, " - "signed = (boolean) true, " - "width = (int) 16, " - "depth = (int) 16, " - "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") + "endianness = (int) BYTE_ORDER, " + "signed = (boolean) true, " + "width = (int) 16, " + "depth = (int) 16, " + "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") ); static void @@ -157,12 +158,12 @@ gst_speexdec_sinkconnect (GstPad * pad, const GstCaps * caps) gst_structure_get_int (structure, "rate", &rate); if (gst_pad_set_explicit_caps (speexdec->srcpad, - gst_caps_new_simple ("audio/x-raw-int", - "endianness", G_TYPE_INT, G_BYTE_ORDER, - "signed", G_TYPE_BOOLEAN, TRUE, - "width", G_TYPE_INT, 16, - "depth", G_TYPE_INT, 16, - "rate", G_TYPE_INT, rate, "channels", G_TYPE_INT, 1, NULL))) { + gst_caps_new_simple ("audio/x-raw-int", + "endianness", G_TYPE_INT, G_BYTE_ORDER, + "signed", G_TYPE_BOOLEAN, TRUE, + "width", G_TYPE_INT, 16, + "depth", G_TYPE_INT, 16, + "rate", G_TYPE_INT, rate, "channels", G_TYPE_INT, 1, NULL))) { return GST_PAD_LINK_OK; } return GST_PAD_LINK_REFUSED; diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index d1b4ae39..d33a1d9c 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -77,9 +77,10 @@ gst_speexenc_get_type (void) 0, (GInstanceInitFunc) gst_speexenc_init, }; + speexenc_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstSpeexEnc", &speexenc_info, - 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstSpeexEnc", &speexenc_info, + 0); } return speexenc_type; } @@ -89,18 +90,18 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " - "endianness = (int) BYTE_ORDER, " - "signed = (boolean) true, " - "width = (int) 16, " - "depth = (int) 16, " - "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") + "endianness = (int) BYTE_ORDER, " + "signed = (boolean) true, " + "width = (int) 16, " + "depth = (int) 16, " + "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") ); static GstStaticPadTemplate speex_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-speex, " - "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") + "rate = (int) [ 1000, 48000 ], " "channels = (int) 1") ); static void @@ -165,15 +166,15 @@ gst_speexenc_sinkconnect (GstPad * pad, const GstCaps * caps) structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "rate", &speexenc->rate); if (gst_pad_try_set_caps (speexenc->srcpad, - gst_caps_new_simple ("audio/x-speex", - "rate", G_TYPE_INT, speexenc->rate, - "channels", G_TYPE_INT, 1, NULL))) { + gst_caps_new_simple ("audio/x-speex", + "rate", G_TYPE_INT, speexenc->rate, + "channels", G_TYPE_INT, 1, NULL))) { speex_init_header (&speexenc->header, speexenc->rate, 1, speexenc->mode); speexenc->header.frames_per_packet = speexenc->n_packets; speexenc->state = speex_encoder_init (speexenc->mode); speex_encoder_ctl (speexenc->state, SPEEX_GET_FRAME_SIZE, - &speexenc->frame_size); + &speexenc->frame_size); return GST_PAD_LINK_OK; } @@ -203,9 +204,9 @@ gst_speexenc_chain (GstPad * pad, GstData * _data) if (!GST_PAD_CAPS (speexenc->srcpad)) { if (!gst_pad_try_set_caps (speexenc->srcpad, - gst_caps_new_simple ("audio/x-speex", - "rate", G_TYPE_INT, speexenc->rate, - "channels", G_TYPE_INT, 1, NULL))) { + gst_caps_new_simple ("audio/x-speex", + "rate", G_TYPE_INT, speexenc->rate, + "channels", G_TYPE_INT, 1, NULL))) { GST_ELEMENT_ERROR (speexenc, CORE, NEGOTIATION, (NULL), (NULL)); return; } @@ -228,7 +229,7 @@ gst_speexenc_chain (GstPad * pad, GstData * _data) if (speexenc->bufsize && (speexenc->bufsize + size >= frame_size)) { memcpy (speexenc->buffer + speexenc->bufsize, data, - (frame_size - speexenc->bufsize) * sizeof (gint16)); + (frame_size - speexenc->bufsize) * sizeof (gint16)); for (i = 0; i < frame_size; i++) input[i] = speexenc->buffer[i]; @@ -241,7 +242,7 @@ gst_speexenc_chain (GstPad * pad, GstData * _data) outbuf = gst_buffer_new_and_alloc (frame_size * speexenc->n_packets); GST_BUFFER_SIZE (outbuf) = speex_bits_write (&speexenc->bits, - GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf)); + GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf)); GST_BUFFER_TIMESTAMP (outbuf) = speexenc->next_ts; speex_bits_reset (&speexenc->bits); @@ -267,7 +268,7 @@ gst_speexenc_chain (GstPad * pad, GstData * _data) outbuf = gst_buffer_new_and_alloc (frame_size * speexenc->n_packets); GST_BUFFER_SIZE (outbuf) = speex_bits_write (&speexenc->bits, - GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf)); + GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf)); GST_BUFFER_TIMESTAMP (outbuf) = speexenc->next_ts; speex_bits_reset (&speexenc->bits); |