From patchwork Sun Aug 6 10:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp992078pzh; Sun, 6 Aug 2023 03:13:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFuO6kLRelZR9QUj8nql5ub9NQ5mgV5n8g+2zUA+5lzbVkJMglcwL7iRwn4HEdTMFbQ1K07 X-Received: by 2002:a17:907:7711:b0:99b:f3f3:e412 with SMTP id kw17-20020a170907771100b0099bf3f3e412mr5371246ejc.52.1691316790360; Sun, 06 Aug 2023 03:13:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y25-20020a1709063a9900b0099bd6ea3798si4373997ejd.136.2023.08.06.03.13.10; Sun, 06 Aug 2023 03:13:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=QJ8g+58a; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8CA5B68C722; Sun, 6 Aug 2023 13:12:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2093.outbound.protection.outlook.com [40.92.59.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4037568C6E0 for ; Sun, 6 Aug 2023 13:12:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONg1+jhjIPVVIkZSnbiQBXq1jd+jcreGSEn/SMvnyu+WpDkPyLsuUAgQB9NE0MrGnbyvM2EJqVeODYe4edCidA6dJ25hAdrxEz0itnYC8dJqCnnInXk7063N2ececGRytUWisxKxYPX/q1SGaIWcyUztRO19EN7XnckN19n3RJwm3vxKLmOw7Nn4+Hzn5fy9Rxjc9HuTXjrxHQodmwC2YyxU7528PgK4OEHYsbN0p93AmUgsfV6S7alG3tHaP/eZZfYBbSYLOR4wsZUXpRUj86WKgzDC7hrFNB+vYXp3PxSG+LoG0lveQ1MGI17VBS7+Ouk2AiDQOaixkAgV01gRXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rUGRHal1gVN/lVyAQE3t9Bz6XnVFSTLMxSrkR5ZL2mQ=; b=gjBM/+NSmvDvVHE9RwjHm8WBHZ4OrTPgS6vmiqrnJifJIpCQcLexSU37Tycjh2ureyy5aYU3X63VoVMu1VzPvNIHox1EbnDcj3c4crVKVoxt1ATcusFR/VEPs0rIuvbBsJpGtog30jaL3zRlyQAu/3v+ZkHkTMaSM2jYymA1R4PAtt3/ylXJGsupwbyrhkZVZwY7kI4mF887/aSt2E3w361z+6Lk8xi97+SX9nD6yhcJFCM03KvizkimPncviKwEDx6iv6SPoJGWxMtOrw8hohai2svOUIVr0ZpItu/rn1ssR92qS6YHZQqYdoQC3tKpg5SqUZifNTO7HtuzVoXOhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rUGRHal1gVN/lVyAQE3t9Bz6XnVFSTLMxSrkR5ZL2mQ=; b=QJ8g+58aJhwhQW2A5KQhDgfnIsu84jEwwVR9Dt2KZjOuE435BimjK0hUKQjT87qwU/5xDY8dTbuLsS4i1GabRJ5C7iQl0ENEXJiw6A1yNA92jxR4zZ80BsC58ii9JHSrorH4RHsndlcnTOwNEftFIA7FuTmbheF4tXgw1wk2Tg2LYWjQyU+xMvC0LeteKxmqyXhBxlriPAcbXgmFaHeWHgTjqsP/nVAgwVqiMc6O9ZaZ91PYKOWoKQBifNe1aG0dChDPglqXOczSF8O61q7DE9z9+xB/ATQ7gaSQpBsfQ1wqT9xVAKSzeR0v6ibP7tWZ3Fo6FJbhlj2BQcDXcHNXcQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0222.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.25; Sun, 6 Aug 2023 10:12:40 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:12:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:13:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7zVnHrZ50RmeTlwc/3kjtC185Iw3Y7r6Vxt3tXKT9v4=] X-ClientProxiedBy: ZR2P278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101323.2828419-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0222:EE_ X-MS-Office365-Filtering-Correlation-Id: c35a1d54-639a-45e6-0020-08db9665aab6 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHTfiuSrHMX7o8KrpjJfRKByIIZcRpEYpZC3loSf1i9H6g7Fg5Q1fAUuAMk+loxxodN9HmieFGHNCdv1OsdIAp0mG/Sye3kV+qi21pY/snAfaoh/KEZGFL2r7zKliLdJCFKLsrPJL+8FTpq/dk6VB0qiiRr1B3p9MrjXlnoH4jUmqwlN665Y17cZIQu4fsHMGniTz/kQ6/vVpoWTlIWziL5eC1+kWhdxEC3ZHSWMHasRNquGxfqaX8XrtzRbuDSgLnoVMZI3Sg5oqrVhiV38eYvXtH9SjG33g5J+csOGlPKX9nMwO3qPNKzFofpNbq+8WUd83jciUZbNXBgjyO2ouKrcx35UlWux1zY4KnHZSAomCdqwfbc/C4EHcp/Wz3kkpSBqeE572JcvENbeUwMrYJ8eECxqjM+Cxtzdkm/5vJIlDXZfoTJxfVTiWPHFERVfbOjiF55bQMCz5AuIDcZuOg9JG1r9UGrH4G0XJfF2kKHP6ZMYo6CgQocKqIHAXBz7fGSADmc/lbzP77Q0F61QwvA7MeoNuscigZbGoUgA6d3kRMF2jJRS9hMQdxN1mMXfX6De85zBgMCMg98byd/snl32TCcjSQo5WjlTc+UeJgY+A23fCOw6Ub9PhmjOBLm7JwApfrfxKgdhoSYlNEc2E1t+hzsOxj4XURSUDvDwCw82eOoVOnqx+hGfWBXoUUpY8Mu+DaRcnAJe/f1YL+uuPiMu64y1f27jFHsbPhzQCLaKuIz4DqcIlLFA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5IHay13veTEQKuZTIWscJQG82AZO/73+LDTJtjMIgWNsOXk1z1zlQZIoPfaM/Fjjr7NSwfDxPQjhZSXQGSTLPMT9FSejBg7wGEe9OLlJCc7dvcizwizBZCs9whvEd6kHoIfvJtQroaRt9/4taREWg9Iobfu+Y6pVxO6Jy6IZ2ISoPM8r472tazgB4/Sd/iJCD2uZAtdXFS6KeBqrLuuGByjoUnIEkBG0ecyeMtsBjkTYEhXyhgUDY6cBlmyChocIb8/NYXIVoaVtFDO5P+ySPcuoinriTinrsId2i5RTluJeIaQBwrSll9XzNaGel+4v5NIL7TvC/P8Z6HBmjgpeoJeAdXSMPjQYhG8ozNQH7ZnDR74IOASuOLD4h8oq9IaMOb//HvhHuGVFaYpOOsSGxf1/6qK9BaaK0rUSaYO3T0OomGW6OYvK8y/OhSMJmVOs2TKM4ixqf1meycvrd9MvZ5fQLJkbOxnty0qV9RyHBQxUEVj+eWlcKkQTvI58DBN/w3UzCVwJXiJe5+IRLcv5C+yA/30ui8pWCZmefwnLOxyvLwKh94nsrOnuUT2vzpLzr+aGZENveR/uwre1iiS/IYCjHNr6vqOewoxhutiL1ls4ZFV52yWZ0pAlmeu86xkq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QRJe7eifwFaSmohsqeAFVbm6+mbD432tENj2plELwBXJFdYVZHTZ2mtun3dWVX6PbWComVaenYiBoCnk7pxY0puWjxQyIn8ZqZVgyCEIjd59p9cYpCnXJmY4WWtprudfYy+UDE66+t+fN6Rx6qf7fgZOLn8Z3bRLBTgv4xxq448EpsOmZZWVJpcdGT38rBAyikbU14C5r9m/2cKPPxX1Po0RGf82wMgfi7QV1/8U3tlfZkHsI8nKb6FLbZZZp5WbPyGR8PjHJZfmPZkGeg3qv8DVoi/ySQPwWuCKssFGOXrSoOehFrSZau4Xt1UHdUWGCmc7zB5JoaSY/qrVLndUfCQkwei8UD2OPgzIFHQawB29BjPMx56xSDEZnw14ruRv8TlgE0iGtYL/tGmj+TZJcZbezUMIF2tUu/A8/vJxXFjJhEcFb3YuC3vlAZMyKhsKU2WilZ4l5MZpfeYS6j6mBsgw4ER6BdgWJM6fhDg2AJwRwn7znhqIGAk+LM0I0OXzn6xeDi4ZIJL+k4gGjQki1exwoP+yMkjpRb5KLaGuqKPvHqE1ztbIlmjx5nd2ajuwhaUGJ2Z81vzbyXBIWrUWGzTVhYbTcwQVIZSNytTUWVhNIyyfg7YAEKlmYVaJXUiLpEag4LyRRMKvy8wERNTc4yzgnxpW3ktTWfQMLzKG5ET17giZbX612bj8f3Zr+PKij9F6e6XwOg3gwN6g64d4Dkew8IbhnfLAb+CEf4WFhfUr93YzgFqO5lp3hoet0/8rTnc4QB3GFipetV2+ULBj5/xGc4/17sfkKIDKB+UIbs0v/TckRIY8jnTkiuB6iW8oxAd0VFaPtonU7xuaU7Pp9W9VTSse2cEaHgT7gRAszPhRhaWl16BfM1zg2jvewwn9O3f/JxR8aI5QPUOwzaiXYvFjATLPd+GqK3sybg2OdNsQ9jfmP7caCV0RUMTrZLSfpqKxVebq4vmOW2VbCEgyE+d2hkoU/KcNVgzhM6kOvB/F4Wktki8VnyOR5adPo3MwIeCUCt08GtqR4380MO8S1HwHHPXNTVAwW8ebmuPLkMMgXzq9Gy00W8waNc+jLBSIcrRK7S8Fp0DeyYhna9SunCX8b14iawL1Ea9g8UoSmaJxppLdDqY0LDMTnyqv6zizECejaGKBrweGwtR41w1wFfhbN+63GRgQ3NnuxGRe4b6lEOPG+4CwB3mbUkHpWsaGhJXbq0Maz/iwExoeyPctbJeAHO5dKOFqj31COIFFJaJZuRwY7RtfXwWJjx2r2E7h X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c35a1d54-639a-45e6-0020-08db9665aab6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:12:40.5163 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0222 Subject: [FFmpeg-devel] [PATCH 6/7] avutil/tests/channel_layout: Test av_channel_layout_copy() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /f1Ylf5bRX+W 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 --- 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;