avutil/channel_layout: return earlier on UNSPEC layouts in av_channel_layout_subset()

No point running all 64 iterations in the loop to never write anything to ret.
Also make ambisonic layouts check its mask too while at it.

Signed-off-by: James Almer <jamrial@gmail.com>
release/5.1
James Almer 3 years ago
parent 7602b4e4c2
commit f2967490f1
  1. 8
      libavutil/channel_layout.c

@ -989,12 +989,16 @@ uint64_t av_channel_layout_subset(const AVChannelLayout *channel_layout,
uint64_t ret = 0;
int i;
if (channel_layout->order == AV_CHANNEL_ORDER_NATIVE)
switch (channel_layout->order) {
case AV_CHANNEL_ORDER_NATIVE:
case AV_CHANNEL_ORDER_AMBISONIC:
return channel_layout->u.mask & mask;
case AV_CHANNEL_ORDER_CUSTOM:
for (i = 0; i < 64; i++)
if (mask & (1ULL << i) && av_channel_layout_index_from_channel(channel_layout, i) >= 0)
ret |= (1ULL << i);
break;
}
return ret;
}

Loading…
Cancel
Save