gst-plugins-bad: re-indent with GNU indent 2.2.12

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4182>
This commit is contained in:
Tim-Philipp Müller 2023-03-15 18:54:13 +00:00 committed by GStreamer Marge Bot
parent 29484f6f12
commit 81716a1097
57 changed files with 584 additions and 520 deletions

View file

@ -277,7 +277,6 @@ BIT_SLICER (Y8, 4, DEF_THR_FRAC) /* any format with 0 bytes between Y or
BIT_SLICER (RGBA24_LE, 4, DEF_THR_FRAC) /* 3 bytes */
BIT_SLICER (RGB16_LE, 4, bs->thresh_frac)
BIT_SLICER (RGB16_BE, 4, bs->thresh_frac)
static const unsigned int LP_AVG = 4;
static vbi_bool
@ -506,7 +505,8 @@ vbi_bool
uint8_t * buffer,
unsigned int buffer_size,
vbi3_bit_slicer_point * points,
unsigned int *n_points, unsigned int max_points, const uint8_t * raw) {
unsigned int *n_points, unsigned int max_points, const uint8_t * raw)
{
static const vbi_pixfmt pixfmt = VBI_PIXFMT_Y8;
static const unsigned int bpp = 1;
static const unsigned int oversampling = 4; /* see above */

View file

@ -1135,7 +1135,8 @@ vbi3_raw_decoder_services (vbi3_raw_decoder * rd)
/* Attn: strict must be int for compatibility with libzvbi 0.2 (-1 == 0) */
vbi_service_set
vbi3_raw_decoder_set_sampling_par
(vbi3_raw_decoder * rd, const vbi_sampling_par * sp, int strict) {
(vbi3_raw_decoder * rd, const vbi_sampling_par * sp, int strict)
{
unsigned int services;
assert (NULL != rd);

View file

@ -332,7 +332,8 @@ static vbi_bool
vbi_service_set
_vbi_sampling_par_check_services_log
(const vbi_sampling_par * sp,
vbi_service_set services, unsigned int strict, _vbi_log_hook * log) {
vbi_service_set services, unsigned int strict, _vbi_log_hook * log)
{
const _vbi_service_par *par;
vbi_service_set rservices;
@ -359,7 +360,8 @@ vbi_service_set
(vbi_sampling_par * sp,
unsigned int *max_rate,
vbi_videostd_set videostd_set_req,
vbi_service_set services, _vbi_log_hook * log) {
vbi_service_set services, _vbi_log_hook * log)
{
const _vbi_service_par *par;
vbi_service_set rservices;
vbi_videostd_set videostd_set;
@ -502,8 +504,8 @@ vbi_service_set
*/
vbi_service_set
vbi_sampling_par_check_services
(const vbi_sampling_par * sp,
vbi_service_set services, unsigned int strict) {
(const vbi_sampling_par * sp, vbi_service_set services, unsigned int strict)
{
return _vbi_sampling_par_check_services_log (sp, services, strict,
/* log_hook */ NULL);
}

View file

@ -397,7 +397,8 @@ gst_openal_helper_probe_caps (ALCcontext * context)
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}
},};
},
};
GstStructure *structure;
guint64 channel_mask;
GstCaps *caps;
@ -421,11 +422,13 @@ gst_openal_helper_probe_caps (ALCcontext * context)
"AL_FORMAT_STEREO16",
"AL_FORMAT_QUAD16",
"AL_FORMAT_51CHN16",
"AL_FORMAT_61CHN16", "AL_FORMAT_71CHN16", NULL}, *fmt8[] = {
"AL_FORMAT_61CHN16", "AL_FORMAT_71CHN16", NULL
}, *fmt8[] = {
"AL_FORMAT_MONO8",
"AL_FORMAT_STEREO8",
"AL_FORMAT_QUAD8",
"AL_FORMAT_51CHN8", "AL_FORMAT_61CHN8", "AL_FORMAT_71CHN8", NULL};
"AL_FORMAT_51CHN8", "AL_FORMAT_61CHN8", "AL_FORMAT_71CHN8", NULL
};
int i;
if (alIsExtensionPresent ("AL_EXT_FLOAT32")) {

View file

@ -1359,7 +1359,8 @@ fixate_size (GstVulkanViewConvert * viewconvert,
GstStructure *ins, *outs;
const GValue *from_par, *to_par;
GValue fpar = { 0, }, tpar = {
0,};
0,
};
othercaps = gst_caps_make_writable (othercaps);
othercaps = gst_caps_truncate (othercaps);

View file

@ -523,7 +523,8 @@ gst_mpeg_video_packet_parse_sequence_display_extension (const GstMpegVideoPacket
gboolean
gst_mpeg_video_packet_parse_sequence_scalable_extension
(const GstMpegVideoPacket * packet,
GstMpegVideoSequenceScalableExt * seqscaleext) {
GstMpegVideoSequenceScalableExt * seqscaleext)
{
GstBitReader br;
g_return_val_if_fail (seqscaleext != NULL, FALSE);

View file

@ -38,7 +38,8 @@ mempool_create (mempool * mptr, const unsigned int size, unsigned int max_size,
return NULL;
**mptr = (struct mempool) {
.malloc = malloc,.free = free,.size = MEMPOOL_RESERVED + max_size,.used =
sizeof (struct mempool),.next = old,};
sizeof (struct mempool),.next = old,
};
mptr_used_start = (uintptr_t) (*mptr) + (*mptr)->used;
(*mptr)->used += (ALIGN_MASK + 1 - (mptr_used_start & ALIGN_MASK)) & ALIGN_MASK; // reserve bytes required to make subsequent allocations aligned
assert (!(((uintptr_t) (*mptr) + (*mptr)->used) & ALIGN_MASK));

View file

@ -104,7 +104,8 @@ pam_computeacolorhash (struct acolorhash_table *acht,
// the array was allocated with spare items
if (i < achl->capacity) {
other_items[i] = (struct acolorhist_arr_item) {
.color = px,.perceptual_weight = boost,};
.color = px,.perceptual_weight = boost,
};
achl->used++;
++colors;
continue;
@ -155,7 +156,8 @@ pam_computeacolorhash (struct acolorhash_table *acht,
achl->other_items = new_items;
achl->capacity = capacity;
new_items[i] = (struct acolorhist_arr_item) {
.color = px,.perceptual_weight = boost,};
.color = px,.perceptual_weight = boost,
};
achl->used++;
} else {
// these are elses for first checks whether first and second inline-stored colors are used
@ -205,7 +207,8 @@ pam_allocacolorhash (unsigned int maxcolors, unsigned int surface,
return NULL;
*t = (struct acolorhash_table) {
.mempool = m,.hash_size = hash_size,.maxcolors = maxcolors,.ignorebits =
ignorebits,};
ignorebits,
};
memset (t->buckets, 0, hash_size * sizeof (struct acolorhist_arr_head));
return t;
}

View file

@ -848,7 +848,8 @@ add_musicbrainz_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
{
GST_TAG_MUSICBRAINZ_ARTISTID, "MusicBrainz Artist Id",
"musicbrainz_artistid"}, {
GST_TAG_MUSICBRAINZ_ALBUMID, "MusicBrainz Album Id", "musicbrainz_albumid"}, {
GST_TAG_MUSICBRAINZ_ALBUMID, "MusicBrainz Album Id",
"musicbrainz_albumid"}, {
GST_TAG_MUSICBRAINZ_ALBUMARTISTID, "MusicBrainz Album Artist Id",
"musicbrainz_albumartistid"}, {
GST_TAG_MUSICBRAINZ_RELEASEGROUPID, "MusicBrainz Release Group Id",

View file

@ -794,8 +794,10 @@ gst_interlace_caps_double_framerate (GstCaps * caps, gboolean half,
} else if (G_VALUE_TYPE (val) == GST_TYPE_FRACTION_RANGE) {
const GValue *min, *max;
GValue nrange = { 0, }, nmin = {
0,}, nmax = {
0,};
0,
}, nmax = {
0,
};
gint n, d;
g_value_init (&nrange, GST_TYPE_FRACTION_RANGE);

View file

@ -846,7 +846,8 @@ mxf_metadata_aes3_audio_essence_descriptor_to_structure (MXFMetadataBase * m)
guint i;
GValue va = { 0, }
, v = {
0,};
0,
};
GstBuffer *buf;
GstMapInfo map;
@ -888,7 +889,8 @@ mxf_metadata_aes3_audio_essence_descriptor_to_structure (MXFMetadataBase * m)
guint i;
GValue va = { 0, }
, v = {
0,};
0,
};
GstBuffer *buf;
GstMapInfo map;

View file

@ -734,7 +734,8 @@ mxf_metadata_preface_to_structure (MXFMetadataBase * m)
if (self->n_identifications > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -778,7 +779,8 @@ mxf_metadata_preface_to_structure (MXFMetadataBase * m)
if (self->n_essence_containers > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -804,7 +806,8 @@ mxf_metadata_preface_to_structure (MXFMetadataBase * m)
if (self->n_dm_schemes > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -1418,7 +1421,8 @@ mxf_metadata_content_storage_to_structure (MXFMetadataBase * m)
if (self->n_packages > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -1447,7 +1451,8 @@ mxf_metadata_content_storage_to_structure (MXFMetadataBase * m)
if (self->n_essence_container_data > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -1910,7 +1915,8 @@ mxf_metadata_generic_package_to_structure (MXFMetadataBase * m)
if (self->n_tracks > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -2558,7 +2564,8 @@ static const struct
{
MXF_UL (TRACK_TIMECODE_12M_INACTIVE),
MXF_METADATA_TRACK_TIMECODE_12M_INACTIVE}, {
MXF_UL (TRACK_TIMECODE_12M_ACTIVE), MXF_METADATA_TRACK_TIMECODE_12M_ACTIVE}, {
MXF_UL (TRACK_TIMECODE_12M_ACTIVE),
MXF_METADATA_TRACK_TIMECODE_12M_ACTIVE}, {
MXF_UL (TRACK_TIMECODE_309M), MXF_METADATA_TRACK_TIMECODE_309M}, {
MXF_UL (TRACK_METADATA), MXF_METADATA_TRACK_METADATA}, {
MXF_UL (TRACK_PICTURE_ESSENCE), MXF_METADATA_TRACK_PICTURE_ESSENCE}, {
@ -2956,7 +2963,8 @@ mxf_metadata_sequence_to_structure (MXFMetadataBase * m)
if (self->n_structural_components > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -3570,7 +3578,8 @@ mxf_metadata_dm_source_clip_to_structure (MXFMetadataBase * m)
if (self->n_track_ids > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -3800,7 +3809,8 @@ mxf_metadata_dm_segment_to_structure (MXFMetadataBase * m)
if (self->n_track_ids > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -4065,7 +4075,8 @@ mxf_metadata_generic_descriptor_to_structure (MXFMetadataBase * m)
if (self->n_locators > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);
@ -6140,7 +6151,8 @@ mxf_metadata_multiple_descriptor_to_structure (MXFMetadataBase * m)
if (self->n_sub_descriptors > 0) {
GValue arr = { 0, }
, val = {
0,};
0,
};
g_value_init (&arr, GST_TYPE_ARRAY);

View file

@ -89,7 +89,8 @@ static const struct
} _cdci_mapping_table[] = {
{
"YUY2", 2, 1, 0, TRUE, GST_VIDEO_CAPS_MAKE ("YUY2")}, {
"UYVY", 2, 1, 0, FALSE, GST_VIDEO_CAPS_MAKE ("UYVY")},};
"UYVY", 2, 1, 0, FALSE, GST_VIDEO_CAPS_MAKE ("UYVY")},
};
typedef struct
{

View file

@ -111,7 +111,8 @@ static const struct
"sequence-layer-bdu", VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU}, {
"sequence-layer-bdu-frame", VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME}, {
"sequence-layer-raw-frame", VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME}, {
"sequence-layer-frame-layer", VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER}, {
"sequence-layer-frame-layer",
VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER}, {
"asf", VC1_STREAM_FORMAT_ASF}, {
"frame-layer", VC1_STREAM_FORMAT_FRAME_LAYER}
};

View file

@ -43,7 +43,8 @@ static struct
jint YUY2;
jint YV12;
} android_graphics_imageformat = {
0};
0
};
gint ImageFormat_JPEG;
gint ImageFormat_NV16;

View file

@ -56,7 +56,8 @@ static struct
jmethodID stopSmoothZoom;
jmethodID unlock;
} android_hardware_camera = {
0};
0
};
static struct
{
@ -67,7 +68,8 @@ static struct
jint CAMERA_FACING_BACK;
jint CAMERA_FACING_FRONT;
} android_hardware_camera_camerainfo = {
0};
0
};
gint CameraInfo_CAMERA_FACING_BACK;
gint CameraInfo_CAMERA_FACING_FRONT;
@ -78,7 +80,8 @@ static struct
jfieldID width;
jfieldID height;
} android_hardware_camera_size = {
0};
0
};
static struct
{
@ -186,7 +189,8 @@ static struct
jstring FOCUS_MODE_CONTINUOUS_VIDEO;
jstring FOCUS_MODE_CONTINUOUS_PICTURE;
} android_hardware_camera_parameters = {
0};
0
};
const gchar *Parameters_WHITE_BALANCE_AUTO;
const gchar *Parameters_WHITE_BALANCE_INCANDESCENT;
@ -250,7 +254,8 @@ static struct
jclass klass;
jmethodID iterator;
} java_util_list = {
0};
0
};
static struct
{
@ -258,28 +263,32 @@ static struct
jmethodID hasNext;
jmethodID next;
} java_util_iterator = {
0};
0
};
static struct
{
jclass klass;
jmethodID intValue;
} java_lang_integer = {
0};
0
};
static struct
{
jclass klass;
jmethodID equals;
} java_lang_string = {
0};
0
};
static struct
{
jclass klass;
jmethodID constructor;
} org_freedesktop_gstreamer_androidmedia_gstahccallback = {
0};
0
};
static void
gst_ah_camera_on_preview_frame (JNIEnv * env, jclass klass, jbyteArray data,

View file

@ -62,7 +62,8 @@ static struct
jstring SENSOR_SERVICE;
jmethodID getSystemService;
} android_content_context = {
0};
0
};
static struct
{
@ -70,7 +71,8 @@ static struct
jfieldID accuracy;
jfieldID values;
} android_hardware_sensor_event = {
0};
0
};
static struct
{
@ -79,14 +81,16 @@ static struct
jmethodID registerListener;
jmethodID unregisterListener;
} android_hardware_sensor_manager = {
0};
0
};
static struct
{
jclass klass;
jmethodID constructor;
} org_freedesktop_gstreamer_androidmedia_gstahscallback = {
0};
0
};
GHashTable *sensor_sizes = NULL;
static void
@ -135,14 +139,16 @@ gst_ah_sensor_sensor_sizes_init (void)
, {
AHS_SENSOR_TYPE_PROXIMITY, sizeof (GstAHSProximityValues)}
, {
AHS_SENSOR_TYPE_RELATIVE_HUMIDITY, sizeof (GstAHSRelativeHumidityValues)}
AHS_SENSOR_TYPE_RELATIVE_HUMIDITY,
sizeof (GstAHSRelativeHumidityValues)}
, {
AHS_SENSOR_TYPE_ROTATION_VECTOR, sizeof (GstAHSRotationVectorValues)}
, {
AHS_SENSOR_TYPE_STEP_COUNTER, sizeof (GstAHSStepCounterValues)}
, {
AHS_SENSOR_TYPE_STEP_DETECTOR, sizeof (GstAHSStepDetectorValues)}
,};
,
};
g_assert_null (sensor_sizes);

View file

@ -517,7 +517,8 @@ static const struct
COLOR_INTEL_FormatYUV420PackedSemiPlanar, GST_VIDEO_FORMAT_NV12}, {
COLOR_INTEL_FormatYUV420PackedSemiPlanar_Tiled, GST_VIDEO_FORMAT_NV12}, {
COLOR_QCOM_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
COLOR_QCOM_FormatYUV420PackedSemiPlanar64x32Tile2m8ka, GST_VIDEO_FORMAT_NV12}, {
COLOR_QCOM_FormatYUV420PackedSemiPlanar64x32Tile2m8ka,
GST_VIDEO_FORMAT_NV12}, {
COLOR_QCOM_FormatYVU420SemiPlanar32m, GST_VIDEO_FORMAT_NV12}, {
COLOR_QCOM_FormatYVU420SemiPlanar32mMultiView, GST_VIDEO_FORMAT_NV12}, {
COLOR_OMX_SEC_FormatNV12Tiled, GST_VIDEO_FORMAT_NV12}, {
@ -1439,7 +1440,8 @@ static const struct
MPEG4Level3, "3"}, {
MPEG4Level4, "4"}, {
MPEG4Level4a, "4a"}, {
MPEG4Level5, "5"},};
MPEG4Level5, "5"},
};
const gchar *
gst_amc_mpeg4_level_to_string (gint level)

View file

@ -157,13 +157,15 @@ create_amc_format (GstAmcVideoEnc * encoder, GstVideoCodecState * input_state,
const gchar *key;
gint id;
} amc_profile = {
NULL, -1};
NULL, -1
};
struct
{
const gchar *key;
gint id;
} amc_level = {
NULL, -1};
NULL, -1
};
gint color_format;
gint stride, slice_height;
GstAmcFormat *format = NULL;

View file

@ -271,24 +271,30 @@ GST_START_TEST (test_crf_cvf_data)
gst_object_unref (avtpcrfbase);
orig = (struct buffer_tstamps) {
.buf_pts = 103000,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 108000};
.buf_pts = 103000,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 108000
};
expected = (struct buffer_tstamps) {
.buf_pts = 104204,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 109204};
.buf_pts = 104204,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 109204
};
test_crf_tstamps (h, buf, &orig, &expected);
orig = (struct buffer_tstamps) {
.buf_pts = 107000,.buf_dts = 105000,.avtp_ts = 113000,.h264_ts = 118500};
.buf_pts = 107000,.buf_dts = 105000,.avtp_ts = 113000,.h264_ts = 118500
};
expected = (struct buffer_tstamps) {
.buf_pts = 108400,.buf_dts = 105300,.avtp_ts = 113300,.h264_ts = 119900};
.buf_pts = 108400,.buf_dts = 105300,.avtp_ts = 113300,.h264_ts = 119900
};
test_crf_tstamps (h, buf, &orig, &expected);
/* test for invalid DTS */
orig = (struct buffer_tstamps) {
.buf_pts = 107000,.buf_dts = GST_CLOCK_TIME_NONE,.avtp_ts =
113000,.h264_ts = 118500};
113000,.h264_ts = 118500
};
expected = (struct buffer_tstamps) {
.buf_pts = 108400,.buf_dts = GST_CLOCK_TIME_NONE,.avtp_ts =
113300,.h264_ts = 119900};
113300,.h264_ts = 119900
};
test_crf_tstamps (h, buf, &orig, &expected);
gst_buffer_unref (buf);
@ -313,15 +319,19 @@ GST_START_TEST (test_crf_aaf_data)
gst_object_unref (avtpcrfbase);
orig = (struct buffer_tstamps) {
.buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0};
.buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0
};
expected = (struct buffer_tstamps) {
.buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0};
.buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0
};
test_crf_tstamps (h, buf, &orig, &expected);
orig = (struct buffer_tstamps) {
.buf_pts = 110000,.buf_dts = 0,.avtp_ts = 113000,.h264_ts = 0};
.buf_pts = 110000,.buf_dts = 0,.avtp_ts = 113000,.h264_ts = 0
};
expected = (struct buffer_tstamps) {
.buf_pts = 110300,.buf_dts = 0,.avtp_ts = 113300,.h264_ts = 0};
.buf_pts = 110300,.buf_dts = 0,.avtp_ts = 113300,.h264_ts = 0
};
test_crf_tstamps (h, buf, &orig, &expected);
gst_buffer_unref (buf);
@ -346,9 +356,11 @@ GST_START_TEST (test_crf_period_zero)
gst_object_unref (avtpcrfbase);
orig = (struct buffer_tstamps) {
.buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110};
.buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110
};
expected = (struct buffer_tstamps) {
.buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110};
.buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110
};
test_crf_tstamps (h, buf, &orig, &expected);
gst_buffer_unref (buf);

View file

@ -596,7 +596,8 @@ GST_START_TEST (test_kate_encode_keepalives)
{
0.5, n_keepalives}, {
2.0, n_keepalives / 2}, {
5.0, n_keepalives / 5},};
5.0, n_keepalives / 5},
};
for (round = 0; round < 3; ++round) {
kateenc = setup_kateenc ();