From aeed2e550c1cb68be7f706c979d0614100087d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 19 Jan 2016 13:01:17 +0000 Subject: [PATCH] rtp: fix compiler warnings with gcc-6 In file included from gstrtpL16depay.h:27:0, from gstrtp.c:73: gstrtpchannels.h:154:33: error: 'channel_orders' defined but not used [-Werror=unused-const-variable] static const GstRTPChannelOrder channel_orders[] = --- gst/rtp/gstrtpchannels.c | 146 ++++++++++++++++++++++++++++++++++++++ gst/rtp/gstrtpchannels.h | 148 +-------------------------------------- 2 files changed, 148 insertions(+), 146 deletions(-) diff --git a/gst/rtp/gstrtpchannels.c b/gst/rtp/gstrtpchannels.c index 100aaa4bd4..9921293fd4 100644 --- a/gst/rtp/gstrtpchannels.c +++ b/gst/rtp/gstrtpchannels.c @@ -29,6 +29,152 @@ * implement a (very rough) approximation here. */ +static const GstAudioChannelPosition pos_4_1[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT +}; + +static const GstAudioChannelPosition pos_4_2[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1 +}; + +static const GstAudioChannelPosition pos_4_3[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1 +}; + +static const GstAudioChannelPosition pos_5_1[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER +}; + +static const GstAudioChannelPosition pos_6_1[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1 +}; + +static const GstAudioChannelPosition pos_6_2[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT +}; + +static const GstAudioChannelPosition pos_8_1[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT +}; + +static const GstAudioChannelPosition pos_8_2[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT +}; + +static const GstAudioChannelPosition pos_8_3[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT +}; + +static const GstAudioChannelPosition pos_def_1[] = { + GST_AUDIO_CHANNEL_POSITION_MONO +}; + +static const GstAudioChannelPosition pos_def_2[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT +}; + +static const GstAudioChannelPosition pos_def_3[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER +}; + +static const GstAudioChannelPosition pos_def_4[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_LFE1 +}; + +static const GstAudioChannelPosition pos_def_5[] = { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT +}; + +static const GstAudioChannelPosition pos_def_6[] = { + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_LFE1 +}; + +const GstRTPChannelOrder gst_rtp_channel_orders[] = { + /* 4 channels */ + {"DV.LRLsRs", 4, pos_4_1}, + {"DV.LRCS", 4, pos_4_2}, + {"DV.LRCWo", 4, pos_4_3}, + /* 5 channels */ + {"DV.LRLsRsC", 5, pos_5_1}, + /* 6 channels */ + {"DV.LRLsRsCS", 6, pos_6_1}, + {"DV.LmixRmixTWoQ1Q2", 6, pos_6_2}, + /* 8 channels */ + {"DV.LRCWoLsRsLmixRmix", 8, pos_8_1}, + {"DV.LRCWoLs1Rs1Ls2Rs2", 8, pos_8_2}, + {"DV.LRCWoLsRsLcRc", 8, pos_8_3}, + + /* default layouts */ + {NULL, 1, pos_def_1}, + {NULL, 2, pos_def_2}, + {NULL, 3, pos_def_3}, + {NULL, 4, pos_def_4}, + {NULL, 5, pos_def_5}, + {NULL, 6, pos_def_6}, + + /* terminator, invalid entry */ + {NULL, 0, NULL}, +}; + static gboolean check_channels (const GstRTPChannelOrder * order, const GstAudioChannelPosition * pos) diff --git a/gst/rtp/gstrtpchannels.h b/gst/rtp/gstrtpchannels.h index 31727fbb41..6d3f530902 100644 --- a/gst/rtp/gstrtpchannels.h +++ b/gst/rtp/gstrtpchannels.h @@ -32,152 +32,8 @@ typedef struct const GstAudioChannelPosition *pos; } GstRTPChannelOrder; -static const GstAudioChannelPosition pos_4_1[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT -}; - -static const GstAudioChannelPosition pos_4_2[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_LFE1 -}; - -static const GstAudioChannelPosition pos_4_3[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_LFE1 -}; - -static const GstAudioChannelPosition pos_5_1[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER -}; - -static const GstAudioChannelPosition pos_6_1[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_LFE1 -}; - -static const GstAudioChannelPosition pos_6_2[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_LFE1, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT -}; - -static const GstAudioChannelPosition pos_8_1[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_LFE1, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, - GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT -}; - -static const GstAudioChannelPosition pos_8_2[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_LFE1, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, - GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT -}; - -static const GstAudioChannelPosition pos_8_3[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_LFE1, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, - GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT -}; - -static const GstAudioChannelPosition pos_def_1[] = { - GST_AUDIO_CHANNEL_POSITION_MONO -}; - -static const GstAudioChannelPosition pos_def_2[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT -}; - -static const GstAudioChannelPosition pos_def_3[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER -}; - -static const GstAudioChannelPosition pos_def_4[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_LFE1 -}; - -static const GstAudioChannelPosition pos_def_5[] = { - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT -}; - -static const GstAudioChannelPosition pos_def_6[] = { - GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, - GST_AUDIO_CHANNEL_POSITION_LFE1 -}; - -static const GstRTPChannelOrder channel_orders[] = -{ - /* 4 channels */ - { "DV.LRLsRs", 4, pos_4_1 }, - { "DV.LRCS", 4, pos_4_2 }, - { "DV.LRCWo", 4, pos_4_3 }, - /* 5 channels */ - { "DV.LRLsRsC", 5, pos_5_1 }, - /* 6 channels */ - { "DV.LRLsRsCS", 6, pos_6_1 }, - { "DV.LmixRmixTWoQ1Q2", 6, pos_6_2 }, - /* 8 channels */ - { "DV.LRCWoLsRsLmixRmix", 8, pos_8_1 }, - { "DV.LRCWoLs1Rs1Ls2Rs2", 8, pos_8_2 }, - { "DV.LRCWoLsRsLcRc", 8, pos_8_3 }, - - /* default layouts */ - { NULL, 1, pos_def_1 }, - { NULL, 2, pos_def_2 }, - { NULL, 3, pos_def_3 }, - { NULL, 4, pos_def_4 }, - { NULL, 5, pos_def_5 }, - { NULL, 6, pos_def_6 }, - - /* terminator, invalid entry */ - { NULL, 0, NULL }, -}; +#define channel_orders gst_rtp_channel_orders +G_GNUC_INTERNAL extern const GstRTPChannelOrder gst_rtp_channel_orders[]; const GstRTPChannelOrder * gst_rtp_channels_get_by_pos (gint channels, const GstAudioChannelPosition *pos);