highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
James Almer
2022-03-25 16:46:46 -03:00
parent 7602b4e4c2
commit f2967490f1
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavutil/channel_layout.c
View File

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