From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Subject: [FFmpeg-devel] [PATCH 6/7] avutil/tests/channel_layout: Test av_channel_layout_copy() Date: Sun, 6 Aug 2023 12:13:22 +0200 Message-ID: <AS8P250MB0744BC1E54892BA508E798138F0FA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw) In-Reply-To: <AS8P250MB074479F01FF411D108D29EC68F0FA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> Specifically, test copying a channel layout with custom order, so that the allocation codepath of av_channel_layout_copy() is executed. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavutil/tests/channel_layout.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavutil/tests/channel_layout.c b/libavutil/tests/channel_layout.c index 19f552f8bc..c537e7e710 100644 --- a/libavutil/tests/channel_layout.c +++ b/libavutil/tests/channel_layout.c @@ -150,7 +150,7 @@ static void channel_layout_from_string(AVChannelLayout *layout, int main(void) { const AVChannelLayout *playout; - AVChannelLayout layout = { 0 }; + AVChannelLayout layout = { 0 }, layout2 = { 0 }; AVBPrint bp; void *iter = NULL; uint64_t mask; @@ -324,6 +324,15 @@ int main(void) CHANNEL_LAYOUT_FROM_STRING("FR+FL@Foo+USR63@Foo"); printf("With \"FR+FL@Foo+USR63@Foo\": %33s\n", bp.str); + ret = av_channel_layout_copy(&layout2, &layout); + if (ret < 0) { + printf("Copying channel layout \"FR+FL@Foo+USR63@Foo\" failed; " + "ret %d\n", ret); + } + ret = av_channel_layout_compare(&layout, &layout2); + if (ret) + printf("Channel layout and its copy compare unequal; ret: %d\n", ret); + printf("\nTesting av_channel_layout_index_from_string\n"); CHANNEL_LAYOUT_INDEX_FROM_STRING("FR"); printf("On \"FR+FL@Foo+USR63@Foo\" layout with \"FR\": %18d\n", ret); @@ -425,6 +434,7 @@ int main(void) printf("On \"ambisonic 2+stereo\" layout with AV_CH_LAYOUT_QUAD: 0x%"PRIx64"\n", mask); av_channel_layout_uninit(&layout); + av_channel_layout_uninit(&layout2); av_bprint_finalize(&bp, NULL); return 0; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-08-06 10:13 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-06 10:10 [FFmpeg-devel] [PATCH 1/7] avutil/bprint: Don't use value of AV_BPRINT_SIZE_AUTOMATIC directly Andreas Rheinhardt 2023-08-06 10:13 ` [FFmpeg-devel] [PATCH 2/7] avutil/bprint: Allow size == 0 in av_bprint_init_for_buffer() Andreas Rheinhardt 2023-08-09 9:00 ` Andreas Rheinhardt 2023-08-09 10:08 ` Nicolas George 2023-08-09 11:32 ` James Almer 2023-08-09 12:58 ` Andreas Rheinhardt 2023-08-06 10:13 ` [FFmpeg-devel] [PATCH 3/7] avutil/channel_layout: Account for \0 in sizes Andreas Rheinhardt 2023-08-06 10:13 ` [FFmpeg-devel] [PATCH 4/7] avutil/tests/channel_layout: Also test non-AVBPrint variants Andreas Rheinhardt 2023-08-06 10:13 ` [FFmpeg-devel] [PATCH 5/7] avutil/tests/channel_layout: Don't include lavu/channel_layout.c Andreas Rheinhardt 2023-08-06 10:13 ` Andreas Rheinhardt [this message] 2023-08-06 10:13 ` [FFmpeg-devel] [PATCH 7/7] avcodec/amfenc: Fix declaration-after-statement warning Andreas Rheinhardt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=AS8P250MB0744BC1E54892BA508E798138F0FA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \ --to=andreas.rheinhardt@outlook.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git