mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
interleave: fix weird indentation
This commit is contained in:
parent
59dc9dac03
commit
fe529e71c5
1 changed files with 0 additions and 36 deletions
|
@ -260,11 +260,8 @@ static gboolean
|
||||||
gst_interleave_check_channel_positions (GValueArray * positions)
|
gst_interleave_check_channel_positions (GValueArray * positions)
|
||||||
{
|
{
|
||||||
gint i;
|
gint i;
|
||||||
|
|
||||||
guint channels;
|
guint channels;
|
||||||
|
|
||||||
GstAudioChannelPosition *pos;
|
GstAudioChannelPosition *pos;
|
||||||
|
|
||||||
gboolean ret;
|
gboolean ret;
|
||||||
|
|
||||||
channels = positions->n_values;
|
channels = positions->n_values;
|
||||||
|
@ -333,7 +330,6 @@ static void
|
||||||
gst_interleave_class_init (GstInterleaveClass * klass)
|
gst_interleave_class_init (GstInterleaveClass * klass)
|
||||||
{
|
{
|
||||||
GstElementClass *gstelement_class;
|
GstElementClass *gstelement_class;
|
||||||
|
|
||||||
GObjectClass *gobject_class;
|
GObjectClass *gobject_class;
|
||||||
|
|
||||||
gobject_class = G_OBJECT_CLASS (klass);
|
gobject_class = G_OBJECT_CLASS (klass);
|
||||||
|
@ -475,11 +471,8 @@ gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ,
|
||||||
const gchar * req_name)
|
const gchar * req_name)
|
||||||
{
|
{
|
||||||
GstInterleave *self = GST_INTERLEAVE (element);
|
GstInterleave *self = GST_INTERLEAVE (element);
|
||||||
|
|
||||||
GstPad *new_pad;
|
GstPad *new_pad;
|
||||||
|
|
||||||
gchar *pad_name;
|
gchar *pad_name;
|
||||||
|
|
||||||
gint channels, padnumber;
|
gint channels, padnumber;
|
||||||
GValue val = { 0, };
|
GValue val = { 0, };
|
||||||
|
|
||||||
|
@ -523,7 +516,6 @@ gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ,
|
||||||
/* Update the src caps if we already have them */
|
/* Update the src caps if we already have them */
|
||||||
if (self->sinkcaps) {
|
if (self->sinkcaps) {
|
||||||
GstCaps *srccaps;
|
GstCaps *srccaps;
|
||||||
|
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
|
|
||||||
/* Take lock to make sure processing finishes first */
|
/* Take lock to make sure processing finishes first */
|
||||||
|
@ -562,7 +554,6 @@ static void
|
||||||
gst_interleave_release_pad (GstElement * element, GstPad * pad)
|
gst_interleave_release_pad (GstElement * element, GstPad * pad)
|
||||||
{
|
{
|
||||||
GstInterleave *self = GST_INTERLEAVE (element);
|
GstInterleave *self = GST_INTERLEAVE (element);
|
||||||
|
|
||||||
GList *l;
|
GList *l;
|
||||||
|
|
||||||
g_return_if_fail (GST_IS_INTERLEAVE_PAD (pad));
|
g_return_if_fail (GST_IS_INTERLEAVE_PAD (pad));
|
||||||
|
@ -589,7 +580,6 @@ gst_interleave_release_pad (GstElement * element, GstPad * pad)
|
||||||
if (self->sinkcaps) {
|
if (self->sinkcaps) {
|
||||||
if (self->channels > 0) {
|
if (self->channels > 0) {
|
||||||
GstCaps *srccaps;
|
GstCaps *srccaps;
|
||||||
|
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
|
|
||||||
srccaps = gst_caps_copy (self->sinkcaps);
|
srccaps = gst_caps_copy (self->sinkcaps);
|
||||||
|
@ -616,7 +606,6 @@ static GstStateChangeReturn
|
||||||
gst_interleave_change_state (GstElement * element, GstStateChange transition)
|
gst_interleave_change_state (GstElement * element, GstStateChange transition)
|
||||||
{
|
{
|
||||||
GstInterleave *self;
|
GstInterleave *self;
|
||||||
|
|
||||||
GstStateChangeReturn ret;
|
GstStateChangeReturn ret;
|
||||||
|
|
||||||
self = GST_INTERLEAVE (element);
|
self = GST_INTERLEAVE (element);
|
||||||
|
@ -668,7 +657,6 @@ static void
|
||||||
__remove_channels (GstCaps * caps)
|
__remove_channels (GstCaps * caps)
|
||||||
{
|
{
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
|
|
||||||
gint i, size;
|
gint i, size;
|
||||||
|
|
||||||
size = gst_caps_get_size (caps);
|
size = gst_caps_get_size (caps);
|
||||||
|
@ -683,7 +671,6 @@ static void
|
||||||
__set_channels (GstCaps * caps, gint channels)
|
__set_channels (GstCaps * caps, gint channels)
|
||||||
{
|
{
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
|
|
||||||
gint i, size;
|
gint i, size;
|
||||||
|
|
||||||
size = gst_caps_get_size (caps);
|
size = gst_caps_get_size (caps);
|
||||||
|
@ -701,7 +688,6 @@ static GstCaps *
|
||||||
gst_interleave_sink_getcaps (GstPad * pad)
|
gst_interleave_sink_getcaps (GstPad * pad)
|
||||||
{
|
{
|
||||||
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
GstCaps *result, *peercaps, *sinkcaps;
|
GstCaps *result, *peercaps, *sinkcaps;
|
||||||
|
|
||||||
GST_OBJECT_LOCK (self);
|
GST_OBJECT_LOCK (self);
|
||||||
|
@ -780,9 +766,7 @@ gst_interleave_sink_setcaps (GstPad * pad, GstCaps * caps)
|
||||||
goto cannot_change_caps;
|
goto cannot_change_caps;
|
||||||
} else {
|
} else {
|
||||||
GstCaps *srccaps;
|
GstCaps *srccaps;
|
||||||
|
|
||||||
GstStructure *s;
|
GstStructure *s;
|
||||||
|
|
||||||
gboolean res;
|
gboolean res;
|
||||||
|
|
||||||
s = gst_caps_get_structure (caps, 0);
|
s = gst_caps_get_structure (caps, 0);
|
||||||
|
@ -825,7 +809,6 @@ gst_interleave_sink_setcaps (GstPad * pad, GstCaps * caps)
|
||||||
|
|
||||||
if (!self->sinkcaps) {
|
if (!self->sinkcaps) {
|
||||||
GstCaps *sinkcaps = gst_caps_copy (caps);
|
GstCaps *sinkcaps = gst_caps_copy (caps);
|
||||||
|
|
||||||
GstStructure *s = gst_caps_get_structure (sinkcaps, 0);
|
GstStructure *s = gst_caps_get_structure (sinkcaps, 0);
|
||||||
|
|
||||||
gst_structure_remove_field (s, "channel-positions");
|
gst_structure_remove_field (s, "channel-positions");
|
||||||
|
@ -871,7 +854,6 @@ static gboolean
|
||||||
gst_interleave_sink_event (GstPad * pad, GstEvent * event)
|
gst_interleave_sink_event (GstPad * pad, GstEvent * event)
|
||||||
{
|
{
|
||||||
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
gboolean ret;
|
gboolean ret;
|
||||||
|
|
||||||
GST_DEBUG ("Got %s event on pad %s:%s", GST_EVENT_TYPE_NAME (event),
|
GST_DEBUG ("Got %s event on pad %s:%s", GST_EVENT_TYPE_NAME (event),
|
||||||
|
@ -902,13 +884,9 @@ static gboolean
|
||||||
gst_interleave_src_query_duration (GstInterleave * self, GstQuery * query)
|
gst_interleave_src_query_duration (GstInterleave * self, GstQuery * query)
|
||||||
{
|
{
|
||||||
gint64 max;
|
gint64 max;
|
||||||
|
|
||||||
gboolean res;
|
gboolean res;
|
||||||
|
|
||||||
GstFormat format;
|
GstFormat format;
|
||||||
|
|
||||||
GstIterator *it;
|
GstIterator *it;
|
||||||
|
|
||||||
gboolean done;
|
gboolean done;
|
||||||
|
|
||||||
/* parse format */
|
/* parse format */
|
||||||
|
@ -984,13 +962,9 @@ static gboolean
|
||||||
gst_interleave_src_query_latency (GstInterleave * self, GstQuery * query)
|
gst_interleave_src_query_latency (GstInterleave * self, GstQuery * query)
|
||||||
{
|
{
|
||||||
GstClockTime min, max;
|
GstClockTime min, max;
|
||||||
|
|
||||||
gboolean live;
|
gboolean live;
|
||||||
|
|
||||||
gboolean res;
|
gboolean res;
|
||||||
|
|
||||||
GstIterator *it;
|
GstIterator *it;
|
||||||
|
|
||||||
gboolean done;
|
gboolean done;
|
||||||
|
|
||||||
res = TRUE;
|
res = TRUE;
|
||||||
|
@ -1004,7 +978,6 @@ gst_interleave_src_query_latency (GstInterleave * self, GstQuery * query)
|
||||||
it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (self));
|
it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (self));
|
||||||
while (!done) {
|
while (!done) {
|
||||||
GstIteratorResult ires;
|
GstIteratorResult ires;
|
||||||
|
|
||||||
gpointer item;
|
gpointer item;
|
||||||
|
|
||||||
ires = gst_iterator_next (it, &item);
|
ires = gst_iterator_next (it, &item);
|
||||||
|
@ -1015,11 +988,8 @@ gst_interleave_src_query_latency (GstInterleave * self, GstQuery * query)
|
||||||
case GST_ITERATOR_OK:
|
case GST_ITERATOR_OK:
|
||||||
{
|
{
|
||||||
GstPad *pad = GST_PAD_CAST (item);
|
GstPad *pad = GST_PAD_CAST (item);
|
||||||
|
|
||||||
GstQuery *peerquery;
|
GstQuery *peerquery;
|
||||||
|
|
||||||
GstClockTime min_cur, max_cur;
|
GstClockTime min_cur, max_cur;
|
||||||
|
|
||||||
gboolean live_cur;
|
gboolean live_cur;
|
||||||
|
|
||||||
peerquery = gst_query_new_latency ();
|
peerquery = gst_query_new_latency ();
|
||||||
|
@ -1076,7 +1046,6 @@ static gboolean
|
||||||
gst_interleave_src_query (GstPad * pad, GstQuery * query)
|
gst_interleave_src_query (GstPad * pad, GstQuery * query)
|
||||||
{
|
{
|
||||||
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
gboolean res = FALSE;
|
gboolean res = FALSE;
|
||||||
|
|
||||||
switch (GST_QUERY_TYPE (query)) {
|
switch (GST_QUERY_TYPE (query)) {
|
||||||
|
@ -1165,7 +1134,6 @@ static gboolean
|
||||||
gst_interleave_src_event (GstPad * pad, GstEvent * event)
|
gst_interleave_src_event (GstPad * pad, GstEvent * event)
|
||||||
{
|
{
|
||||||
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
GstInterleave *self = GST_INTERLEAVE (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
gboolean result;
|
gboolean result;
|
||||||
|
|
||||||
switch (GST_EVENT_TYPE (event)) {
|
switch (GST_EVENT_TYPE (event)) {
|
||||||
|
@ -1176,9 +1144,7 @@ gst_interleave_src_event (GstPad * pad, GstEvent * event)
|
||||||
case GST_EVENT_SEEK:
|
case GST_EVENT_SEEK:
|
||||||
{
|
{
|
||||||
GstSeekFlags flags;
|
GstSeekFlags flags;
|
||||||
|
|
||||||
GstSeekType curtype;
|
GstSeekType curtype;
|
||||||
|
|
||||||
gint64 cur;
|
gint64 cur;
|
||||||
|
|
||||||
/* parse the seek parameters */
|
/* parse the seek parameters */
|
||||||
|
@ -1267,9 +1233,7 @@ gst_interleave_collected (GstCollectPads * pads, GstInterleave * self)
|
||||||
|
|
||||||
for (collected = pads->data; collected != NULL; collected = collected->next) {
|
for (collected = pads->data; collected != NULL; collected = collected->next) {
|
||||||
GstCollectData *cdata;
|
GstCollectData *cdata;
|
||||||
|
|
||||||
GstBuffer *inbuf;
|
GstBuffer *inbuf;
|
||||||
|
|
||||||
guint8 *outdata;
|
guint8 *outdata;
|
||||||
|
|
||||||
cdata = (GstCollectData *) collected->data;
|
cdata = (GstCollectData *) collected->data;
|
||||||
|
|
Loading…
Reference in a new issue