From patchwork Sat Mar 9 21:54:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 46924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp442295pzb; Sat, 9 Mar 2024 13:55:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUlW69Px7o7IkuMBw+VriiEm60b4+aGBI6n5XpuoJwdKZn/eP9O3t0i1ZyKlnRJgRvxcXUefEkrwZO5g4QubRKTOljp2UIxMk9OZw== X-Google-Smtp-Source: AGHT+IEEnA8rJPy0nBQmE4RtBK3UHa+NCavVNl0JkIGu2an43p1HK8yJWdYdAt1hlOLXPh//K0E8 X-Received: by 2002:a17:906:718:b0:a40:3aa3:9b8a with SMTP id y24-20020a170906071800b00a403aa39b8amr1541798ejb.15.1710021309669; Sat, 09 Mar 2024 13:55:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1710021309; cv=none; d=google.com; s=arc-20160816; b=bGyfGBcivunIGBz+RrhKKIqaU7LC25XS/N0Za57JFUK2QjH0YxQsNVxggTnjm39DDd 8ji50yYmGz/WSK/f9H0zsLoo250hSTMcXOJYwEmCH8G7DLlXpWKPKxhlDM/p6sWCB68N 5ksOzVvEmLU9wgF0DpbTc1+sP8tjz4LsF9FSaf7ckKKLbpxRI9hOPDy8kW6aE1vo5zsJ Wk0a+DuxO7TxFJBsfZbFOjklntFG6dQqmZBwn+E2yaqn7s1rf7IoSNHog3CE2j26/Ygm 4J7hUgRZY59HPHdPMPYedrqNDVih5mCeBRdI1B8JAZdTFwrE008uRCo/A3uGB1gsDSGs 1pVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=H0j001k1q1/zyFo49swnwohfHSw58cZUAADPw/p3dTY=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=jlq5G1s1tsI4lX0gCYc2ES2tEXCRr+DqDMc312xqDiEO9//EdLnMHphpiK5/U9FntE hyqW/BJITMEmCoFrAYGDvdjbmrVcTH41rAyAqXdjStHY3zduOvVAcKdz7UJLpmnegBlo xMKjLFqhoxG5Gw1Z05T2h6etFDhAGt0DkcwlmurTKhJM3miqu+olGCeAYFH9PQfe7zAh sQ0DOtpS5Vc2ZezdqpmmZK7AA12nK5082Z4kITR1RvhL6kAIKUlyryxFRTP8eUAknnsc KKI13kZ5Wk8jyvDSxMaZmHc9mnW+IoBNPCCSPD0zTk4cN/QTKNiTQdiml1sOCqhBOQ/g iEWA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v12-20020a170906180c00b00a45ff20b165si972239eje.761.2024.03.09.13.55.09; Sat, 09 Mar 2024 13:55:09 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 56AF668CDD1; Sat, 9 Mar 2024 23:54:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87C8868CDD1 for ; Sat, 9 Mar 2024 23:54:40 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 53BD5E8EA0; Sat, 9 Mar 2024 22:54:40 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M3MqxztXtCnF; Sat, 9 Mar 2024 22:54:38 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 3CA7FE9B9E; Sat, 9 Mar 2024 22:54:38 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Mar 2024 22:54:11 +0100 Message-Id: <20240309215414.26699-4-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240309215414.26699-1-cus@passwd.hu> References: <20240309215414.26699-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] avutil/tests/channel_layout: add some av_channel_from_string and av_channel_layout_from_string tests 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b7SzCOuoDesx We lacked tests which supposed to fail, and there are some which should fail but right now it does not. This will be fixed in a later commit. Signed-off-by: Marton Balint --- libavutil/tests/channel_layout.c | 26 ++++++++++++++++++++++++++ tests/ref/fate/channel_layout | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/libavutil/tests/channel_layout.c b/libavutil/tests/channel_layout.c index d62b69a5db..14d36c71b5 100644 --- a/libavutil/tests/channel_layout.c +++ b/libavutil/tests/channel_layout.c @@ -255,6 +255,11 @@ int main(void) CHANNEL_FROM_STRING("USR63"); CHANNEL_FROM_STRING("AMBI0"); CHANNEL_FROM_STRING("AMBI1023"); + CHANNEL_FROM_STRING("AMBI1024"); + CHANNEL_FROM_STRING("Dummy"); + CHANNEL_FROM_STRING("FL@Foo"); + CHANNEL_FROM_STRING("Foo@FL"); + CHANNEL_FROM_STRING("@FL"); printf("\n==Native layouts==\n"); @@ -301,6 +306,9 @@ int main(void) CHANNEL_LAYOUT_CHANNEL_FROM_STRING(bp.str, "SL"); CHANNEL_LAYOUT_CHANNEL_FROM_STRING(bp.str, "SR"); CHANNEL_LAYOUT_CHANNEL_FROM_STRING(bp.str, "BC"); + CHANNEL_LAYOUT_CHANNEL_FROM_STRING(bp.str, "@"); + CHANNEL_LAYOUT_CHANNEL_FROM_STRING(bp.str, "@Foo"); + CHANNEL_LAYOUT_CHANNEL_FROM_STRING(bp.str, "FL@Foo"); printf("\nTesting av_channel_layout_index_from_string\n"); CHANNEL_LAYOUT_INDEX_FROM_STRING(bp.str, "FL"); @@ -321,9 +329,27 @@ int main(void) printf("\nTesting av_channel_layout_from_string\n"); CHANNEL_LAYOUT_FROM_STRING("FL+FR+FC+BL+BR+LFE"); CHANNEL_LAYOUT_FROM_STRING("2 channels (FR+FL)"); + CHANNEL_LAYOUT_FROM_STRING("2 channels (AMBI1023+FL)"); + CHANNEL_LAYOUT_FROM_STRING("3 channels (FR+FL)"); + CHANNEL_LAYOUT_FROM_STRING("-3 channels (FR+FL)"); + CHANNEL_LAYOUT_FROM_STRING("0 channels ()"); + CHANNEL_LAYOUT_FROM_STRING("2 channels (FL+FR"); CHANNEL_LAYOUT_FROM_STRING("ambisonic 1+FR+FL"); CHANNEL_LAYOUT_FROM_STRING("ambisonic 2+FC@Foo"); CHANNEL_LAYOUT_FROM_STRING("FL@Foo+FR@Bar"); + CHANNEL_LAYOUT_FROM_STRING("FL+stereo"); + CHANNEL_LAYOUT_FROM_STRING("stereo+stereo"); + CHANNEL_LAYOUT_FROM_STRING("stereo@Boo"); + CHANNEL_LAYOUT_FROM_STRING(""); + CHANNEL_LAYOUT_FROM_STRING("@"); + CHANNEL_LAYOUT_FROM_STRING("@Dummy"); + CHANNEL_LAYOUT_FROM_STRING("@FL"); + CHANNEL_LAYOUT_FROM_STRING("Dummy"); + CHANNEL_LAYOUT_FROM_STRING("Dummy@FL"); + CHANNEL_LAYOUT_FROM_STRING("FR+Dummy"); + CHANNEL_LAYOUT_FROM_STRING("FR+Dummy@FL"); + CHANNEL_LAYOUT_FROM_STRING("FR+@FL"); + CHANNEL_LAYOUT_FROM_STRING("FL+@"); CHANNEL_LAYOUT_FROM_STRING("FR+FL@Foo+USR63@Foo"); ret = av_channel_layout_copy(&layout2, &layout); diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index b98ccdb0f0..ea7ec6fa3c 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -56,6 +56,11 @@ With "FR": 1 With "USR63": 63 With "AMBI0": 1024 With "AMBI1023": 2047 +With "AMBI1024": -1 +With "Dummy": -1 +With "FL@Foo": -1 +With "Foo@FL": -1 +With "@FL": -1 ==Native layouts== @@ -101,6 +106,9 @@ On "5.1(side)" layout with "LFE": 3 On "5.1(side)" layout with "SL": 9 On "5.1(side)" layout with "SR": 10 On "5.1(side)" layout with "BC": -1 +On "5.1(side)" layout with "@": -1 +On "5.1(side)" layout with "@Foo": -1 +On "5.1(side)" layout with "FL@Foo": -1 Testing av_channel_layout_index_from_string On "5.1(side)" layout with "FL": 0 @@ -121,9 +129,27 @@ On "5.1(side)" layout with AV_CH_LAYOUT_4POINT1: 0xf Testing av_channel_layout_from_string With "FL+FR+FC+BL+BR+LFE": 6 channels (FL+FR+FC+BL+BR+LFE) With "2 channels (FR+FL)": 2 channels (FR+FL) +With "2 channels (AMBI1023+FL)": fail +With "3 channels (FR+FL)": fail +With "-3 channels (FR+FL)": fail +With "0 channels ()": fail +With "2 channels (FL+FR": fail With "ambisonic 1+FR+FL": ambisonic 1+2 channels (FR+FL) With "ambisonic 2+FC@Foo": ambisonic 2+1 channels (FC@Foo) With "FL@Foo+FR@Bar": 2 channels (FL@Foo+FR@Bar) +With "FL+stereo": fail +With "stereo+stereo": fail +With "stereo@Boo": fail +With "": fail +With "@": fail +With "@Dummy": fail +With "@FL": 1 channels (FL) +With "Dummy": fail +With "Dummy@FL": fail +With "FR+Dummy": fail +With "FR+Dummy@FL": 1 channels (FR) +With "FR+@FL": 2 channels (FR+FL@FL) +With "FL+@": fail With "FR+FL@Foo+USR63@Foo": 3 channels (FR+FL@Foo+USR63@Foo) Testing av_channel_layout_index_from_string