History

avfilter/af_headphone: Use uint64_t for channel mapping

The headphone filter has an option for the user to specify an assignment of inputs to channels (or from pairs of channels of the second input to channels). Up until now, these channels were stored in an int containing the logarithm of the channel layout. Yet it is not the logarithm that is used lateron and so a retransformation was necessary. Therefore this commit simply stores the uint64_t as is, avoiding the retransformation. This also has the advantage that unset channels (whose corresponding entry is zero) can't be mistaken for valid channels any more; the old code had to initialize the channels to -1 to solve this problem and had to check for whether a channel is set before the retransformation (because 1 << -1 is UB). The only downside of this approach is that the size of the context increases (by 256 bytes); but this is not exceedingly much. Finally, the array has been moved to the end of the context; it is only used a few times during the initialization process and moving it decreased the offsets of lots of other entries, reducing codesize.

Andreas Rheinhardt committed 6 years ago

Commit bc533ba1 parent 5e687271 file · +13 −27Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/af_headphone.c+13−27
@@ -52,8 +52,6 @@ typedef struct HeadphoneContext { · 51 unmodified lines
5252 int ir_len;
5353 int air_len;
5454
55− int mapping[64];
56−
5755 int nb_inputs;
5856
5957 int nb_irs;
@@ -86,12 +84,13 @@ typedef struct HeadphoneContext { · 26 unmodified lines
8684 int delay_r;
8785 int eof;
8886 } *in;
87+ uint64_t mapping[64];
8988 } HeadphoneContext;
9089
91−static int parse_channel_name(char **arg, int *rchannel, char *buf)
90+static int parse_channel_name(char **arg, uint64_t *rchannel, char *buf)
9291 {
9392 int len, i, channel_id = 0;
94− int64_t layout, layout0;
93+ uint64_t layout, layout0;
9594
9695 if (sscanf(*arg, "%7[A-Z]%n", buf, &len)) {
9796 layout0 = layout = av_get_channel_layout(buf);
@@ -101,9 +100,9 @@ static int parse_channel_name(char **arg, int *rchannel, char *buf) · 3 unmodified lines
101100 layout >>= i;
102101 }
103102 }
104− if (channel_id >= 64 || layout0 != 1LL << channel_id)
103+ if (channel_id >= 64 || layout0 != 1ULL << channel_id)
105104 return AVERROR(EINVAL);
106− *rchannel = channel_id;
105+ *rchannel = layout0;
107106 *arg += len;
108107 return 0;
109108 }
@@ -115,7 +114,6 @@ static void parse_map(AVFilterContext *ctx) · 5 unmodified lines
115114 HeadphoneContext *s = ctx->priv;
116115 char *arg, *tokenizer, *p, *args = av_strdup(s->map);
117116 uint64_t used_channels = 0;
118− int i;
119117
120118 if (!args)
121119 return;
@@ -124,27 +122,23 @@ static void parse_map(AVFilterContext *ctx) · 2 unmodified lines
124122 s->lfe_channel = -1;
125123 s->nb_inputs = 1;
126124
127− for (i = 0; i < 64; i++) {
128− s->mapping[i] = -1;
129− }
130−
131125 while ((arg = av_strtok(p, "|", &tokenizer))) {
132− int out_ch_id;
126+ uint64_t out_channel;
133127 char buf[8];
134128
135129 p = NULL;
136− if (parse_channel_name(&arg, &out_ch_id, buf)) {
130+ if (parse_channel_name(&arg, &out_channel, buf)) {
137131 av_log(ctx, AV_LOG_WARNING, "Failed to parse \'%s\' as channel name.\n", arg);
138132 continue;
139133 }
140− if (used_channels & (1ULL << out_ch_id)) {
134+ if (used_channels & out_channel) {
141135 av_log(ctx, AV_LOG_WARNING, "Ignoring duplicate channel '%s'.\n", buf);
142136 continue;
143137 }
144− used_channels |= 1ULL << out_ch_id;
145− if (out_ch_id == av_log2(AV_CH_LOW_FREQUENCY))
138+ used_channels |= out_channel;
139+ if (out_channel == AV_CH_LOW_FREQUENCY)
146140 s->lfe_channel = s->nb_irs;
147− s->mapping[s->nb_irs] = out_ch_id;
141+ s->mapping[s->nb_irs] = out_channel;
148142 s->nb_irs++;
149143 }
150144
@@ -499,11 +493,7 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink) · 348 unmodified lines
499493 int idx = -1;
500494
501495 for (j = 0; j < inlink->channels; j++) {
502− if (s->mapping[i] < 0) {
503− continue;
504− }
505−
506− if ((av_channel_layout_extract_channel(inlink->channel_layout, j)) == (1LL << s->mapping[i])) {
496+ if ((av_channel_layout_extract_channel(inlink->channel_layout, j)) == s->mapping[i]) {
507497 idx = i;
508498 break;
509499 }
@@ -541,11 +531,7 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink) · 31 unmodified lines
541531 int idx = -1;
542532
543533 for (j = 0; j < inlink->channels; j++) {
544− if (s->mapping[k] < 0) {
545− continue;
546− }
547−
548− if ((av_channel_layout_extract_channel(inlink->channel_layout, j)) == (1LL << s->mapping[k])) {
534+ if ((av_channel_layout_extract_channel(inlink->channel_layout, j)) == s->mapping[k]) {
549535 idx = k;
550536 break;
551537 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t