mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libav: re-indent with GNU indent 2.2.12

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4182>
This commit is contained in:
Tim-Philipp Müller 2023-03-15 18:59:56 +00:00 committed by GStreamer Marge Bot
parent 00ae689f7c
commit 3ad4128084
3 changed files with 64 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
subprojects/gst-libav/ext/libav/gstavcodecmap.c
View file

@ -43,27 +43,28 @@ static const struct
GstAudioChannelPosition gst; GstAudioChannelPosition gst;
} _ff_to_gst_layout[] = { } _ff_to_gst_layout[] = {
{ {
AV_CH_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, { AV_CH_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
AV_CH_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, { AV_CH_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
AV_CH_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, { AV_CH_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, {
AV_CH_LOW_FREQUENCY, GST_AUDIO_CHANNEL_POSITION_LFE1}, { AV_CH_LOW_FREQUENCY, GST_AUDIO_CHANNEL_POSITION_LFE1}, {
AV_CH_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, { AV_CH_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, {
AV_CH_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, { AV_CH_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
AV_CH_FRONT_LEFT_OF_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, { AV_CH_FRONT_LEFT_OF_CENTER,
AV_CH_FRONT_RIGHT_OF_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, {
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, { AV_CH_FRONT_RIGHT_OF_CENTER,
AV_CH_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, { GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
AV_CH_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, { AV_CH_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, {
AV_CH_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, { AV_CH_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, {
AV_CH_TOP_CENTER, GST_AUDIO_CHANNEL_POSITION_TOP_CENTER}, { AV_CH_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, {
AV_CH_TOP_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT}, { AV_CH_TOP_CENTER, GST_AUDIO_CHANNEL_POSITION_TOP_CENTER}, {
AV_CH_TOP_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER}, { AV_CH_TOP_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT}, {
AV_CH_TOP_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}, { AV_CH_TOP_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER}, {
AV_CH_TOP_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT}, { AV_CH_TOP_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT}, {
AV_CH_TOP_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER}, { AV_CH_TOP_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT}, {
AV_CH_TOP_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT}, { AV_CH_TOP_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER}, {
AV_CH_STEREO_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, { AV_CH_TOP_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT}, {
AV_CH_STEREO_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT} AV_CH_STEREO_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
AV_CH_STEREO_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}
}; };
static guint64 static guint64
@ -323,24 +324,25 @@ gst_ff_vid_caps_new (AVCodecContext * context, const AVCodec * codec,
gint framerate_n, framerate_d; gint framerate_n, framerate_d;
} profiles[] = { } profiles[] = {
{ {
"Y41B", 720, 480, 8, 9, 30000, 1001}, { "Y41B", 720, 480, 8, 9, 30000, 1001}, {
"Y41B", 720, 480, 32, 27, 30000, 1001}, { "Y41B", 720, 480, 32, 27, 30000, 1001}, {
"Y42B", 720, 480, 8, 9, 30000, 1001}, { "Y42B", 720, 480, 8, 9, 30000, 1001}, {
"Y42B", 720, 480, 32, 27, 30000, 1001}, { "Y42B", 720, 480, 32, 27, 30000, 1001}, {
"I420", 720, 576, 16, 15, 25, 1}, { "I420", 720, 576, 16, 15, 25, 1}, {
"I420", 720, 576, 64, 45, 25, 1}, { "I420", 720, 576, 64, 45, 25, 1}, {
"Y41B", 720, 576, 16, 15, 25, 1}, { "Y41B", 720, 576, 16, 15, 25, 1}, {
"Y41B", 720, 576, 64, 45, 25, 1}, { "Y41B", 720, 576, 64, 45, 25, 1}, {
"Y42B", 720, 576, 16, 15, 25, 1}, { "Y42B", 720, 576, 16, 15, 25, 1}, {
"Y42B", 720, 576, 64, 45, 25, 1}, { "Y42B", 720, 576, 64, 45, 25, 1}, {
"Y42B", 1280, 1080, 1, 1, 30000, 1001}, { "Y42B", 1280, 1080, 1, 1, 30000, 1001}, {
"Y42B", 1280, 1080, 3, 2, 30000, 1001}, { "Y42B", 1280, 1080, 3, 2, 30000, 1001}, {
"Y42B", 1440, 1080, 1, 1, 25, 1}, { "Y42B", 1440, 1080, 1, 1, 25, 1}, {
"Y42B", 1440, 1080, 4, 3, 25, 1}, { "Y42B", 1440, 1080, 4, 3, 25, 1}, {
"Y42B", 960, 720, 1, 1, 60000, 1001}, { "Y42B", 960, 720, 1, 1, 60000, 1001}, {
"Y42B", 960, 720, 4, 3, 60000, 1001}, { "Y42B", 960, 720, 4, 3, 60000, 1001}, {
"Y42B", 960, 720, 1, 1, 50, 1}, { "Y42B", 960, 720, 1, 1, 50, 1}, {
"Y42B", 960, 720, 4, 3, 50, 1},}; "Y42B", 960, 720, 4, 3, 50, 1},
};
GstCaps *temp; GstCaps *temp;
gint n_sizes = G_N_ELEMENTS (profiles); gint n_sizes = G_N_ELEMENTS (profiles);
@ -2618,7 +2620,7 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
} }
layout = gst_structure_get_string (structure, "layout"); layout = gst_structure_get_string (structure, "layout");
interleaved = ! !g_strcmp0 (layout, "non-interleaved"); interleaved = !!g_strcmp0 (layout, "non-interleaved");
switch (format) { switch (format) {
case GST_AUDIO_FORMAT_F32: case GST_AUDIO_FORMAT_F32:
@ -3623,7 +3625,7 @@ gst_ffmpeg_formatid_to_caps (const gchar * format_name)
gboolean gboolean
gst_ffmpeg_formatid_get_codecids (const gchar * format_name, gst_ffmpeg_formatid_get_codecids (const gchar * format_name,
enum AVCodecID ** video_codec_list, enum AVCodecID ** audio_codec_list, enum AVCodecID **video_codec_list, enum AVCodecID **audio_codec_list,
AVOutputFormat * plugin) AVOutputFormat * plugin)
{ {
static enum AVCodecID tmp_vlist[] = { static enum AVCodecID tmp_vlist[] = {

38
subprojects/gst-libav/ext/libav/gstavdemux.c
View file

@ -1099,27 +1099,27 @@ static const struct
const gchar *gst_tag_name; const gchar *gst_tag_name;
} tagmapping[] = { } tagmapping[] = {
{ {
"album", GST_TAG_ALBUM}, { "album", GST_TAG_ALBUM}, {
"album_artist", GST_TAG_ALBUM_ARTIST}, { "album_artist", GST_TAG_ALBUM_ARTIST}, {
"artist", GST_TAG_ARTIST}, { "artist", GST_TAG_ARTIST}, {
"comment", GST_TAG_COMMENT}, { "comment", GST_TAG_COMMENT}, {
"composer", GST_TAG_COMPOSER}, { "composer", GST_TAG_COMPOSER}, {
"copyright", GST_TAG_COPYRIGHT}, "copyright", GST_TAG_COPYRIGHT},
/* Need to convert ISO 8601 to GstDateTime: */ /* Need to convert ISO 8601 to GstDateTime: */
{ {
"creation_time", GST_TAG_DATE_TIME}, "creation_time", GST_TAG_DATE_TIME},
/* Need to convert ISO 8601 to GDateTime: */ /* Need to convert ISO 8601 to GDateTime: */
{ {
"date", GST_TAG_DATE_TIME}, { "date", GST_TAG_DATE_TIME}, {
"disc", GST_TAG_ALBUM_VOLUME_NUMBER}, { "disc", GST_TAG_ALBUM_VOLUME_NUMBER}, {
"encoder", GST_TAG_ENCODER}, { "encoder", GST_TAG_ENCODER}, {
"encoded_by", GST_TAG_ENCODED_BY}, { "encoded_by", GST_TAG_ENCODED_BY}, {
"genre", GST_TAG_GENRE}, { "genre", GST_TAG_GENRE}, {
"language", GST_TAG_LANGUAGE_CODE}, { "language", GST_TAG_LANGUAGE_CODE}, {
"performer", GST_TAG_PERFORMER}, { "performer", GST_TAG_PERFORMER}, {
"publisher", GST_TAG_PUBLISHER}, { "publisher", GST_TAG_PUBLISHER}, {
"title", GST_TAG_TITLE}, { "title", GST_TAG_TITLE}, {
"track", GST_TAG_TRACK_NUMBER} "track", GST_TAG_TRACK_NUMBER}
}; };
static const gchar * static const gchar *

4
subprojects/gst-libav/ext/libav/gstavviddec.c
View file

@ -1348,7 +1348,7 @@ gst_ffmpegviddec_negotiate (GstFFMpegVidDec * ffmpegdec,
GstStructure *in_s; GstStructure *in_s;
GstVideoInterlaceMode interlace_mode; GstVideoInterlaceMode interlace_mode;
gint caps_height; gint caps_height;
gboolean one_field = ! !(flags & GST_VIDEO_BUFFER_FLAG_ONEFIELD); gboolean one_field = !!(flags & GST_VIDEO_BUFFER_FLAG_ONEFIELD);
if (!update_video_context (ffmpegdec, context, picture, one_field)) if (!update_video_context (ffmpegdec, context, picture, one_field))
return TRUE; return TRUE;
@ -1846,7 +1846,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
GST_DEBUG_OBJECT (ffmpegdec, "repeat_pict:%d", GST_DEBUG_OBJECT (ffmpegdec, "repeat_pict:%d",
ffmpegdec->picture->repeat_pict); ffmpegdec->picture->repeat_pict);
GST_DEBUG_OBJECT (ffmpegdec, "corrupted frame: %d", GST_DEBUG_OBJECT (ffmpegdec, "corrupted frame: %d",
! !(ffmpegdec->picture->flags & AV_FRAME_FLAG_CORRUPT)); !!(ffmpegdec->picture->flags & AV_FRAME_FLAG_CORRUPT));
if (!gst_ffmpegviddec_negotiate (ffmpegdec, ffmpegdec->context, if (!gst_ffmpegviddec_negotiate (ffmpegdec, ffmpegdec->context,
ffmpegdec->picture, GST_BUFFER_FLAGS (out_frame->input_buffer))) ffmpegdec->picture, GST_BUFFER_FLAGS (out_frame->input_buffer)))