From patchwork Sun Jul 16 05:12:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 42750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4659592pzb; Sat, 15 Jul 2023 22:13:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlHWNZuyTK3tvy7B7FPN1DPaIPRHaRZlkU9fMz9aYcpyyzUt3K71jrxaRJ5Gc9H+lz12YNef X-Received: by 2002:aa7:d7c7:0:b0:51e:1932:db07 with SMTP id e7-20020aa7d7c7000000b0051e1932db07mr8604955eds.34.1689484393886; Sat, 15 Jul 2023 22:13:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689484393; cv=none; d=google.com; s=arc-20160816; b=W+Ss3iet+2Vr3d6w1D8z3CTKp7XpxGM50h3vbnbZBJfg8+Df50XPdAyuwCzGLFWgau IN1NKQcWfYHJCZiTYcSoz7oOTyLkUcHltUzj751RH49fi6oQGthxyCyBqF26Jk/vsD/L +wf0SqVU8mwZ5sWJ3fEO9qwV8a7ODGDY0rw1/8kZDBF0tPNqNu2CILG8t9tWOjOcjf5d OzyK5bze+FzBw77B8UANklr9/+nrxWBDosTkKJift6U4vXyFy1OBVBSs/M70Ix7wJ9zx iU6lRRHkZ1LD695M4F7eQdjJQg4qORqo00dVRFG99n6KmoaDnD1MIBrFUxWW0FKHN2gY b6Rw== 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:dkim-signature:delivered-to; bh=Hrh5VDNLl5G5N9D8aFR5ylwISj+u4gHccXY5EAMIWlU=; fh=vygSd0VBRjxpT4vLIvnwzUd30IwIKCJSP/yQrpRr5rs=; b=onx9n+ENPzT2E622c7dc8TAHBbeIWbmstjTVnRx+1GqXeE4cYXFeIyiYP6m6svaVPC BafBqRsuWgiR/gBcGyPBG3QczAzuOL0RiTe0BPSqjoocgcG1pXA+EhM0QDntB7KQBsbU 2aDJlSYbCpX0hvoIgBF7JyyhxouOqBZK67DQS1PV9ZVlWIG2T86ljFxizf2YTqHriIcm E0Ao1fhY6u9XQdoqihByaNCCjBLVt4yUAvbheowVELoqCACnsCJVG9aYZfWpj2WuIRi/ ca6XYGqY/ir0tX7ketKJQtKHeFLgUpO0APxcLTchoCcaKxNSqJZDaiDfffZf/Uj5ZsZZ rbsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=EL9ritxY; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l4-20020aa7c3c4000000b0051e168e63dasi12800895edr.450.2023.07.15.22.13.13; Sat, 15 Jul 2023 22:13:13 -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=@gmail.com header.s=20221208 header.b=EL9ritxY; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D29AD68C4E5; Sun, 16 Jul 2023 08:13:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com [209.85.221.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BA8468C39F for ; Sun, 16 Jul 2023 08:12:55 +0300 (EEST) Received: by mail-vk1-f182.google.com with SMTP id 71dfb90a1353d-47e36c35285so1048741e0c.0 for ; Sat, 15 Jul 2023 22:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689484373; x=1692076373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=padDW3fPA7gp20ByE+/UoiX/5wI2BBGPqfJ/dZ0+HuM=; b=EL9ritxY1gyT0/P3urWaE2kgXC/TrF08ccuKgfymIX/lxZf8EGBDTm3QvRl17A0mJ0 YrBWuZNBMRm6C6t57/J/GvGxwXXX9/3vqxuOlgUZg3kiUdEm53735TpXLlUWsIf9ggqm S+rQyDAO7m+z+iZbLxy7l1tu5zv4hdw54RDfvA7q2+CMCCPkFHr+xIjAeED35ccPkpT/ U+CaD6+Eza6wATWVkxJ181KjpVWvxaYthBF8Lz9UJqp6oYHrGnqnzyJuvkpfENzhG+ni bNo4ZY8RprOlawiztArwUVM+LYKtBrpsQ1NqB2FAgEPbzjuWGr9GiGeHZSrI8xWl7V/Z U9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689484373; x=1692076373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=padDW3fPA7gp20ByE+/UoiX/5wI2BBGPqfJ/dZ0+HuM=; b=FHfvzEBWznZ/EOhUK1JWB6/HNlQJZq2br6QGzz8RD5I5QQAOKcwgSCMaFtBdIteY1B 2j5P01GXxzpiW1lZL5XRhYS3Hc6rRNYYmqZpNonzsVZGCy23irOu/jEi7MikquKd+FFG e5T7O4MK8Gu2BFItPSvdJiOOF6cK7309SfIsIu3IvDPZpvK5udpEK15oem57DQOf2CuF +Jh4QGL7kRiiIK4OqBY505AaaVq3dLUAfq44SpdZDmcXc+BXR80eiHnrTCshtnmj46xT udynYRPANaNDWRbaaUBySUh+rLBhIaMSU9G2mdVe0IgIfyKJs94jGji4mbLcCI0SB3GL JIpg== X-Gm-Message-State: ABy/qLYDdajys7EPi2Z40MoWl3sL3l1A6zs3j97CHZcSjCm4G4dyjztI qFkGYhWtA8f46nRNfHOlxr3f9zycdwY= X-Received: by 2002:a1f:5fd1:0:b0:47b:802b:ff38 with SMTP id t200-20020a1f5fd1000000b0047b802bff38mr5026238vkb.7.1689484373365; Sat, 15 Jul 2023 22:12:53 -0700 (PDT) Received: from cappuccino.. ([35.142.174.80]) by smtp.gmail.com with ESMTPSA id i7-20020ac5cd87000000b00483e3d330ccsm111562vka.22.2023.07.15.22.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 22:12:52 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 01:12:45 -0400 Message-Id: <20230716051246.7793-2-qyot27@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230716051246.7793-1-qyot27@gmail.com> References: <20230716051246.7793-1-qyot27@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avisynth: pass audio channel layout 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: Stephen Hutchinson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 69sH6K6NwYNm --- libavformat/avisynth.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index b426ac343e..027e8c63f6 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -62,6 +62,7 @@ typedef struct AviSynthLibrary { AVSC_DECLARE_FUNC(avs_create_script_environment); AVSC_DECLARE_FUNC(avs_delete_script_environment); AVSC_DECLARE_FUNC(avs_get_audio); + AVSC_DECLARE_FUNC(avs_get_channel_mask); AVSC_DECLARE_FUNC(avs_get_error); AVSC_DECLARE_FUNC(avs_get_frame); AVSC_DECLARE_FUNC(avs_get_version); @@ -157,6 +158,7 @@ static av_cold int avisynth_load_library(void) LOAD_AVS_FUNC(avs_create_script_environment, 0); LOAD_AVS_FUNC(avs_delete_script_environment, 0); LOAD_AVS_FUNC(avs_get_audio, 0); + LOAD_AVS_FUNC(avs_get_channel_mask, 1); LOAD_AVS_FUNC(avs_get_error, 1); // New to AviSynth 2.6 LOAD_AVS_FUNC(avs_get_frame, 0); LOAD_AVS_FUNC(avs_get_version, 0); @@ -793,6 +795,10 @@ static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st) st->duration = avs->vi->num_audio_samples; avpriv_set_pts_info(st, 64, 1, avs->vi->audio_samples_per_second); + if (avs_library.avs_get_version(avs->clip) >= 10) + av_channel_layout_from_mask(&st->codecpar->ch_layout, + avs_library.avs_get_channel_mask(avs->vi)); + switch (avs->vi->sample_type) { case AVS_SAMPLE_INT8: st->codecpar->codec_id = AV_CODEC_ID_PCM_U8; From patchwork Sun Jul 16 05:12:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 42751 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4659634pzb; Sat, 15 Jul 2023 22:13:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlES3joZJe55HZnmpr9bpa7eXrwogFiya4cT5QAn5sVC+cOW3botiuCkm3O9WrCGU1p4W60J X-Received: by 2002:aa7:c986:0:b0:521:6d39:7e45 with SMTP id c6-20020aa7c986000000b005216d397e45mr4271970edt.31.1689484401747; Sat, 15 Jul 2023 22:13:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689484401; cv=none; d=google.com; s=arc-20160816; b=IQ6agN8Qs1r7XK5Tw7sW2DFLnUG1uh6wfmBgPa0Zfmc2iVanqiiMYjI5RV7J8kXgAy OC/v0JSaILKFUcW89y2IWYOERjEoYD7rqo0gf3nbE8joUZb9P5IPsGVrUAWsOc0uiias oehg51TgdxjUsg7X9gXCmnmZsm9uERUi99Hliyi7lrBO/iRZKAMXAR9NSHIiTM99XoHP qfCFqNNTZliOmGg+4ZASxtnqxi2waTHqu67ysEIgf9sTJ1xtGuizvqrTYeXmgOBUyqb5 t3jIeEu4kcOcLbd+9GOyB8rvrYvHxsuvrG/iandwowOwNaybzYyw5ckylGHrP0yuODW9 4VCA== 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:dkim-signature:delivered-to; bh=xIcRgLdptLQ1mE2DsUlKYbRehWhyBV+Z0QIKuma9VWg=; fh=vygSd0VBRjxpT4vLIvnwzUd30IwIKCJSP/yQrpRr5rs=; b=N+oro86bOaarnnI8qDac0rFS/e8kouAdwVAyUUcm7382y4tKpwKb6S+XBXq6FxuM44 dBHHCyyCV9EN6UGRk5oYmx/1LSp5UYgFDLGiYpdWo7Q52afjWR8EXJWNQeeHa5BO4lou fRhXrdb/+sb0st+aatBp5SM3h9mQLqhuxjkM3OpDzq7OejiprV6EmyBn1/+tAuPjTnMP 00Kp5NysApHvD7ZJUQQF7g0lHipY9aYSj9jSev9PxKsFIKobhXVCpIAbjwIqwq1TgShp fN2QIGx8PYI3mstOC9XRC26uY08BDlLPHh1Nohmmhnu9n5K42JXIemMJ1szjiT0K1+iL Hilg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=FleKrUxb; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w15-20020a50fa8f000000b0051df101ce08si12194427edr.431.2023.07.15.22.13.21; Sat, 15 Jul 2023 22:13:21 -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=@gmail.com header.s=20221208 header.b=FleKrUxb; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF15D68C4FA; Sun, 16 Jul 2023 08:13:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f170.google.com (mail-vk1-f170.google.com [209.85.221.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B623568C4CD for ; Sun, 16 Jul 2023 08:12:56 +0300 (EEST) Received: by mail-vk1-f170.google.com with SMTP id 71dfb90a1353d-4816db26ff1so709035e0c.2 for ; Sat, 15 Jul 2023 22:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689484375; x=1692076375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5R2L7IZDJcEfOEqk5M9gOk5qwDeZ8kGSx5lKbwHwhd0=; b=FleKrUxbdlYZh+vtScyPuD+nRPUU2L2zMirLk/F8aSlEt6zuaYORvHwUgwBkjx8grK h2ZCl16ngh44oQTHT5/oQGxt4YxWc5FD//lVbr92ymcXXXIsRbHQa0tpVcStv1iZcUe9 Bgt6N3hiwoWMFyb9QTrbbmJ7cbVM/RpaiV6iIMtsqdI6UA3mi0Kv7mzK7I9zZFxu7D9z m3x5ZDAol30TtDUiPYuP/4wyDUgzvKGw8y98Wrmi6CWVLTwuThv1zu1AIDhFX5hbgnul PlX+hOSV1DrkuCFZ0J8gLhoaCEMGXWPKfsxmxzyZ2UwMusbKy0sKX+EqGSTqmZ6wDIzl /3JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689484375; x=1692076375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5R2L7IZDJcEfOEqk5M9gOk5qwDeZ8kGSx5lKbwHwhd0=; b=ilchN4JqIKKGSk3ODy/t7kdL7R1eYW+8nlTCayv3R4Ki/z5lhy7Svd8XRfUjWuGL7h EVNV1jsGr87FWqOIrIGBhKKmGkhrD+rUdI7Wsec042jvxsclMWHB8OBKa3WYBnG9OfVY EHAFvROjwsIK4Cf9gnwNCnIKNqmLkI8De50dXidkNKJbizlehReIHhLVDMEC3s4o8jCu HS8O2qmPob9VicMaUtzm409Up6OkI/6ivmJY9NDEP9N8V5dDKHp8AVAq8+Uc7EfMBSAm IK/84vn90h8/aMs0BBiGfJm1QaaJ2L6GoklJ7XTtzv9Fr5mVUyFzdDLvkNHSzAqUSWDk 6k6g== X-Gm-Message-State: ABy/qLaE1xvef0rAZpFmAzCcDku7l09brLKdzumoB10YDmtuhbL03OcH N5LSmWB604jXIGDH6+ZcezZ9prWHkCo= X-Received: by 2002:a1f:6094:0:b0:481:3423:4f1f with SMTP id u142-20020a1f6094000000b0048134234f1fmr4512443vkb.4.1689484374845; Sat, 15 Jul 2023 22:12:54 -0700 (PDT) Received: from cappuccino.. ([35.142.174.80]) by smtp.gmail.com with ESMTPSA id i7-20020ac5cd87000000b00483e3d330ccsm111562vka.22.2023.07.15.22.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 22:12:54 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 01:12:46 -0400 Message-Id: <20230716051246.7793-3-qyot27@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230716051246.7793-1-qyot27@gmail.com> References: <20230716051246.7793-1-qyot27@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] configure: bump minimum AviSynth+ header version 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: Stephen Hutchinson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZDTQBbykfGk3 AVISYNTH_INTERFACE_VERSION 10 fell in-between the releases of 3.7.2 and 3.7.3, and is required to be able to read the channel layout information. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dab3fb9036..a85122921e 100755 --- a/configure +++ b/configure @@ -6657,8 +6657,8 @@ done # these are off by default, so fail if requested and not available enabled avisynth && { require_headers "avisynth/avisynth_c.h avisynth/avs/version.h" && - { test_cpp_condition avisynth/avs/version.h "AVS_MAJOR_VER >= 3 && AVS_MINOR_VER >= 7 && AVS_BUGFIX_VER >= 1 || AVS_MAJOR_VER >= 3 && AVS_MINOR_VER > 7 || AVS_MAJOR_VER > 3" || - die "ERROR: AviSynth+ header version must be >= 3.7.1"; } } + { test_cpp_condition avisynth/avs/version.h "AVS_MAJOR_VER >= 3 && AVS_MINOR_VER >= 7 && AVS_BUGFIX_VER >= 3 || AVS_MAJOR_VER >= 3 && AVS_MINOR_VER > 7 || AVS_MAJOR_VER > 3" || + die "ERROR: AviSynth+ header version must be >= 3.7.3"; } } enabled cuda_nvcc && { check_nvcc cuda_nvcc || die "ERROR: failed checking for nvcc."; } enabled chromaprint && { check_pkg_config chromaprint libchromaprint "chromaprint.h" chromaprint_get_version || require chromaprint chromaprint.h chromaprint_get_version -lchromaprint; }