ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Mar 25 17:10:12 2022 -0300| [7602b4e4c219c681ec243a0c81bb8db12b070888] | committer: James Almer
avutil/tests/channel_layout: also test ambisonic layouts in av_channel_layout_subset() Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7602b4e4c219c681ec243a0c81bb8db12b070888 --- libavutil/tests/channel_layout.c | 6 ++++++ tests/ref/fate/channel_layout | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libavutil/tests/channel_layout.c b/libavutil/tests/channel_layout.c index 34f1197bfd..5516db0904 100644 --- a/libavutil/tests/channel_layout.c +++ b/libavutil/tests/channel_layout.c @@ -340,6 +340,12 @@ int main(void) CHANNEL_LAYOUT_CHANNEL_FROM_INDEX(11); printf("On \"ambisonic 2+stereo\" layout with 11: %21d\n", ret); + printf("\nTesting av_channel_layout_subset\n"); + CHANNEL_LAYOUT_SUBSET(AV_CH_LAYOUT_STEREO); + printf("On \"ambisonic 2+stereo\" layout with AV_CH_LAYOUT_STEREO: 0x%"PRIx64"\n", mask); + CHANNEL_LAYOUT_SUBSET(AV_CH_LAYOUT_QUAD); + printf("On \"ambisonic 2+stereo\" layout with AV_CH_LAYOUT_QUAD: 0x%"PRIx64"\n", mask); + av_channel_layout_uninit(&layout); av_bprint_finalize(&bp, NULL); diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index b1a4dcb1b1..19bcbce7d8 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -173,3 +173,7 @@ On "ambisonic 2+stereo" layout with 0: 1024 On "ambisonic 2+stereo" layout with 9: 0 On "ambisonic 2+stereo" layout with 10: 1 On "ambisonic 2+stereo" layout with 11: -1 + +Testing av_channel_layout_subset +On "ambisonic 2+stereo" layout with AV_CH_LAYOUT_STEREO: 0x3 +On "ambisonic 2+stereo" layout with AV_CH_LAYOUT_QUAD: 0x3 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".