mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

sbc: Fix coding style issues.

Browse source
This commit is contained in:
Luiz Augusto von Dentz 2007-10-18 22:46:12 +00:00 committed by Tim-Philipp Müller
parent 01b0530663
commit 8f8ccc0f12
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ext/sbc/gstsbcenc.c
View file

@ -30,7 +30,6 @@
#include "gstsbcenc.h" #include "gstsbcenc.h"
#include "gstsbcutil.h" #include "gstsbcutil.h"
#define SBC_ENC_DEFAULT_MODE CFG_MODE_AUTO #define SBC_ENC_DEFAULT_MODE CFG_MODE_AUTO
#define SBC_ENC_DEFAULT_BLOCKS 16 #define SBC_ENC_DEFAULT_BLOCKS 16
#define SBC_ENC_DEFAULT_SUB_BANDS 8 #define SBC_ENC_DEFAULT_SUB_BANDS 8
@ -86,7 +85,7 @@ enum
PROP_MODE, PROP_MODE,
PROP_ALLOCATION, PROP_ALLOCATION,
PROP_BLOCKS, PROP_BLOCKS,
PROP_SUB_BANDS PROP_SUBBANDS
}; };
GST_BOILERPLATE (GstSbcEnc, gst_sbc_enc, GstElement, GST_TYPE_ELEMENT); GST_BOILERPLATE (GstSbcEnc, gst_sbc_enc, GstElement, GST_TYPE_ELEMENT);
@ -123,6 +122,8 @@ sbc_enc_generate_srcpad_caps (GstSbcEnc * enc, GstCaps * caps)
gint channels; gint channels;
GstCaps *src_caps; GstCaps *src_caps;
GstStructure *structure; GstStructure *structure;
const gchar *mode;
const gchar *allocation;
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
@ -146,13 +147,16 @@ sbc_enc_generate_srcpad_caps (GstSbcEnc * enc, GstCaps * caps)
else else
enc->sbc.allocation = enc->allocation; enc->sbc.allocation = enc->allocation;
src_caps = gst_caps_new_simple ("audio/x-sbc", "rate", G_TYPE_INT, mode = gst_sbc_get_mode_string (enc->sbc.joint);
enc->sbc.rate, "channels", G_TYPE_INT, allocation = gst_sbc_get_allocation_string (enc->sbc.allocation);
enc->sbc.channels, "mode", G_TYPE_STRING,
gst_sbc_get_mode_string (enc->sbc.joint), "subbands", src_caps = gst_caps_new_simple ("audio/x-sbc",
G_TYPE_INT, enc->sbc.subbands, "blocks", G_TYPE_INT, "rate", G_TYPE_INT, enc->sbc.rate,
enc->sbc.blocks, "allocation", G_TYPE_STRING, "channels", G_TYPE_INT, enc->sbc.channels,
gst_sbc_get_allocation_string (enc->sbc.allocation), NULL); "mode", G_TYPE_STRING, mode,
"subbands", G_TYPE_INT, enc->sbc.subbands,
"blocks", G_TYPE_INT, enc->sbc.blocks,
"allocation", G_TYPE_STRING, allocation, NULL);
return src_caps; return src_caps;
} }
@ -284,7 +288,7 @@ gst_sbc_enc_set_property (GObject * object, guint prop_id,
/* TODO - verify consistency */ /* TODO - verify consistency */
enc->blocks = g_value_get_int (value); enc->blocks = g_value_get_int (value);
break; break;
case PROP_SUB_BANDS: case PROP_SUBBANDS:
/* TODO - verify consistency */ /* TODO - verify consistency */
enc->subbands = g_value_get_int (value); enc->subbands = g_value_get_int (value);
break; break;
@ -310,7 +314,7 @@ gst_sbc_enc_get_property (GObject * object, guint prop_id,
case PROP_BLOCKS: case PROP_BLOCKS:
g_value_set_int (value, enc->blocks); g_value_set_int (value, enc->blocks);
break; break;
case PROP_SUB_BANDS: case PROP_SUBBANDS:
g_value_set_int (value, enc->subbands); g_value_set_int (value, enc->subbands);
break; break;
default: default:
@ -346,7 +350,7 @@ gst_sbc_enc_class_init (GstSbcEncClass * klass)
g_param_spec_int ("blocks", "Blocks", g_param_spec_int ("blocks", "Blocks",
"Blocks", 0, G_MAXINT, SBC_ENC_DEFAULT_BLOCKS, G_PARAM_READWRITE)); "Blocks", 0, G_MAXINT, SBC_ENC_DEFAULT_BLOCKS, G_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_SUB_BANDS, g_object_class_install_property (object_class, PROP_SUBBANDS,
g_param_spec_int ("subbands", "Sub Bands", g_param_spec_int ("subbands", "Sub Bands",
"Sub Bands", 0, G_MAXINT, "Sub Bands", 0, G_MAXINT,
SBC_ENC_DEFAULT_SUB_BANDS, G_PARAM_READWRITE)); SBC_ENC_DEFAULT_SUB_BANDS, G_PARAM_READWRITE));

2
ext/sbc/gstsbcparse.c
View file

@ -294,6 +294,7 @@ sbc_parse_change_state (GstElement * element, GstStateChange transition)
} }
sbc_init (&parse->sbc, 0); sbc_init (&parse->sbc, 0);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_DEBUG ("Finish subband codec"); GST_DEBUG ("Finish subband codec");
if (parse->buffer) { if (parse->buffer) {
@ -302,6 +303,7 @@ sbc_parse_change_state (GstElement * element, GstStateChange transition)
} }
sbc_finish (&parse->sbc); sbc_finish (&parse->sbc);
break; break;
default: default:
break; break;
} }