From patchwork Fri Sep 24 16:29:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1691309iob; Fri, 24 Sep 2021 09:29:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPu4lay8XqdeM3VLMT6G1a4Q6vXEl0kYsyQ9htfrhsB6EHQ2PLQBaYYa3Q33C8znENdC/D X-Received: by 2002:a17:906:a24c:: with SMTP id bi12mr11748815ejb.530.1632500978867; Fri, 24 Sep 2021 09:29:38 -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 13si9647179ejf.489.2021.09.24.09.29.38; Fri, 24 Sep 2021 09:29:38 -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=F+HFBw9Z; 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 BFEBE68A6CC; Fri, 24 Sep 2021 19:29:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074066.outbound.protection.outlook.com [40.92.74.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C20D68A67D for ; Fri, 24 Sep 2021 19:29:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W2zRPrR9YBhO+WGaOaE4kLG0KJ/CjSnkK6aeFBTkxGeeArqxDVs6dBc1cXi3w4mZU60NHV14NSSg483CPyW3cgNCLGFpXCxlX90wJ3sdwcFZ+mP5Lh1pDMsw8Vxpx5/yE1S7JIMZ6Sk+5gQ8iQgRt6uSqQjCK0ulf/rIV2oGIfJuDe0WjI/F6E8YJAimJdjs7PzQaF0Ki75WU/+r+LN36th5YgG/ATq7qkXsdnNndlWMpn1WQyYf+SDSYmGRJuo6735XCYP/i+BwlVjysxypm1KC6h4RuDvL+NliORwbWavjJ51B3/YPU5YZjaFBRNHtPViAL+tqB4IslYm5Ktm+ew== 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; bh=fmvVtftQKQG7+pwcBizCv0uI6MWfOT1hwvPewxhFhWs=; b=XxlZvRA3GwCVwzODFOG3RT5EFwkNmXXXuVC3Jy9ATAgB9fYgL5+nkz/dEZE10RWfBzSYro/wRoiVmygSGp6Qfg3874LS05KPN93Y8Cf4ycVRDaK49dwuaxyJEbUnWaYdU0Bv4pKoH25cWI1Sjz/zdTLYpCRVFwN14cHC6MTdpyX6kzj0KztFI9+0ZXqSsBmmIaW30cytzSVNa17uuesGUdtpXFmScbzw2UlnMhsDsIPfVZDozJ9+cpJGbH1uY5qtmf1FbqJoiVFokg1F67AS664WfZlvn8nGljs+CpvQt46sFXxyVfswuvyTgETd47xQG2UTaCN6gZmdGn4e42tMmg== 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=fmvVtftQKQG7+pwcBizCv0uI6MWfOT1hwvPewxhFhWs=; b=F+HFBw9ZE3VOiRHFrt+X4uPmRnuvHSPdHJRh6twm19bRlGVazdIueo+MQRl70u1R3HtuVJdC1dvWJsQRFev9Tv5AagZFubaALbKNoFJfCSmw9HkUUQMyVIwS0F/5zorMQ/YIdMcck3tarz0O2KFBpckC3MTEtjT+t1W5Mno/O+nZ8sArVjWk/ZB1ZwtxyKCI/iVh6EZYtFuOSl8ul2SRHEbhuwFqfgxe46n/Ot5/KRlrlC7amqfJHNxxjQz3nBmAi04Rbm467B2JX+snN7+svIyyIFi3YRfwQP4j8URIGlncU7T26kVr0M4pOl1qc99YNK/WpX3+iKO1quCMvkyekA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6635.eurprd03.prod.outlook.com (2603:10a6:102:5c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Fri, 24 Sep 2021 16:29:27 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:29:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:29:09 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [Vqu61IZnncaN8EzFvN3g85FLVe3IpmL7] X-ClientProxiedBy: PR3P189CA0025.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::30) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924162919.562150-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P189CA0025.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:29:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3561c346-f50c-40a4-1b43-08d97f787a1d X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUggP6Egsaxdw4x2opvW4nRctEc0KewfG+5832nHWpmVMG3hwbgM6G4KMh7+esqm5JosHYseDY2A4DZgsvQEJ6oKKol8z0xGGzOH0gyV6WcK1OrYgIvtYtNT7/xa5aiu6kgsvKRYY31OMuzEcjppc/wOb18m5JZNxjLwDjU575dtMKJn6+LvaGUHGsnTvuVaLZc1Q3VqnCqEBf7eVcknCEkbZQn4I/qZgPjq0Sw/cz3M20g7Q0HIuXyMKk+tGzVywiKbOIFVw/SUlPtgUyJqLl0gg6cuCGbPD6vxM9BoJVOPsJ+U3bqbx+uvlbZNuViZaCaU5YdMdrKgXgvGUWhOysldnKGVpYvS0pP/MCtx3pwM3lOoMe3rATG/BpGTO0JW49ZnhhH25xZ6tfS0eheuGsyFX3SLYBHbM1MfqcNHCeIee8wGYzXBtJ42d4VXeDr+USx1qpj0ZJkQVUfKfGYsvwOdLqyzJ77BDjjQsLfbY2si9snK/D9V/pnpDLTAryntdZesu+4ZGrVXU7Club072ZFdRQ4s4UsIZIU0TCdbTK6Avdru0E1UAAghabjAsAq/5iXlE5Nz1MxCOs6xxJp8JNLm3wEG3hIRefUKF5JjN9Cc1DVt9/QA9vsPas8696cv38LdsURqorJFBEo8M4m036FESQV4uAyqVHbv0RNq0ivUy8uBmMyIx+7WlmI7Tcl3QI2iVITm47a1l4A== X-MS-TrafficTypeDiagnostic: PR3PR03MB6635: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jriydtsIc6E+NIRXBe3lqZpuO1mJ5VrCaPimU7ambZZLChMVyrSLLdzhFBTsIcvJo6pqJsEjGRcjGE2KjXg95NVcnVbvHiIy/TYwQuNvnNVqlH+1fdwlQDOPgVOJnhnPlaNUSoFnFR8Nw0/mRh3/a7ovaYR7CXCPpn6TqPcBBEXEHJQzzZ5OfYVle9dqwTLI9F6nqXNw32xiLYTiXuuuVBxo2bjEIo1kWi8DYT3WLeqEzUfqao9FOjPMMOq+6NQaacy/JSvrP38UXYsWmogVB1QyVfY9EMBnqJTKyzQX6r5ci6v/tsC/mvPbWAgihYcfOjoVAYX8B5DHjcbzCIuZCboIILIGesj+eR46Xk52grQxfDmVI/8lKThtOGUevVAFoxfuwR6qJGfBxBlB0B6aDBnOIuBv2SSTow7PGXLirctS00yWCogN/fx7LGGoc5Zl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Byo/72d9tHZ8TmizAjl8yz41bt2vxaP70j9d1PVaa7vDEOE8vEgtzuHAJdArNLa1b+7t7kUqLHO3YVsGSQp6hoYEtXmREnkcSJdet40DutpQaj7RbHcaBQSsyl+QU/iCs/uTvkUqwMbjDcoxAh8FiA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3561c346-f50c-40a4-1b43-08d97f787a1d X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:29:27.4890 (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: PR3PR03MB6635 Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/tests/utils: Rename to avcodec 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: AnmTvGGc0X4X The current name comes from a time in which libavcodec/utils.c contained the whole core of libavcodec. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 4 ++-- libavcodec/tests/{utils.c => avcodec.c} | 0 tests/fate/libavcodec.mak | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename libavcodec/tests/{utils.c => avcodec.c} (100%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 11873eecae..8012b69f61 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1209,13 +1209,13 @@ SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h -TESTPROGS = avpacket \ +TESTPROGS = avcodec \ + avpacket \ celp_math \ codec_desc \ htmlsubtitles \ jpeg2000dwt \ mathops \ - utils \ TESTPROGS-$(CONFIG_CABAC) += cabac TESTPROGS-$(CONFIG_DCT) += avfft diff --git a/libavcodec/tests/utils.c b/libavcodec/tests/avcodec.c similarity index 100% rename from libavcodec/tests/utils.c rename to libavcodec/tests/avcodec.c diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 682296914a..aa199e0308 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -79,10 +79,10 @@ FATE_LIBAVCODEC-$(CONFIG_JPEG2000_ENCODER) += fate-j2k-dwt fate-j2k-dwt: libavcodec/tests/jpeg2000dwt$(EXESUF) fate-j2k-dwt: CMD = run libavcodec/tests/jpeg2000dwt$(EXESUF) -FATE_LIBAVCODEC-yes += fate-libavcodec-utils -fate-libavcodec-utils: libavcodec/tests/utils$(EXESUF) -fate-libavcodec-utils: CMD = run libavcodec/tests/utils$(EXESUF) -fate-libavcodec-utils: CMP = null +FATE_LIBAVCODEC-yes += fate-libavcodec-avcodec +fate-libavcodec-avcodec: libavcodec/tests/avcodec$(EXESUF) +fate-libavcodec-avcodec: CMD = run libavcodec/tests/avcodec$(EXESUF) +fate-libavcodec-avcodec: CMP = null FATE_LIBAVCODEC-yes += fate-libavcodec-huffman fate-libavcodec-huffman: libavcodec/tests/mjpegenc_huffman$(EXESUF) From patchwork Fri Sep 24 16:37:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30556 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1698328iob; Fri, 24 Sep 2021 09:37:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXyWnPQ8ywaF/nMUkZas4GvFWDA7ygP79XSGuduaCU0yxWB6PIMWMjSdmCi3xytDJttXZl X-Received: by 2002:a50:9d48:: with SMTP id j8mr6163669edk.165.1632501461350; Fri, 24 Sep 2021 09:37:41 -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 l3si11870626ejo.634.2021.09.24.09.37.38; Fri, 24 Sep 2021 09:37:41 -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=foVbvpSQ; 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 6D2FB68A6E0; Fri, 24 Sep 2021 19:37:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2088.outbound.protection.outlook.com [40.92.91.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFE8468A576 for ; Fri, 24 Sep 2021 19:37:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g3HMWCP9qIly/C4CisQ+doPUWMW8+vugQSzPvZkh9dLCl8t4uhcdz5gfrUmwykkJPsJuQuavh8Vuk3GmJinntdSraQREg3TunvqpDaQ2J6D/Cr0esV3MrvSYio30m/qcXlBaO3mkF9lcPr6I3WXhch27owb+rCe6ucEjkh6MOgFmxc8RxeTjeRpkcqdKh9CrkLeW2HH5Mi7tIJOt5qArc/j2MpkKykXVxr9UZqm9GSXGGuEDsg9u1GbVao0wHSfo35zZCvlzXtKDvyVusW7ERibk777tU3Pf2eN06urmaN8nuRCldUAKKT17YnHU8m4oCHwPnkC0LJse0GOBisfPdw== 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; bh=NvrNLWXf6Ou54ds7kRCWR7/685UNQ3LH5436L3RdzII=; b=NXZQ6JzWlKO0Cg14xT/i2U97Wn+98Swj5ybM1mWxtHtefVp/PU+UhOjw3WTPihsKvY+NLoIEbmkIrjyLUruWARXMeXAlssyt5+3Ji0kFe6fEQUpe7Phjsg6ewJ/OW9QMqdgruZvEuk+Am8wbjbTdhHfja7OjaDnKhs5S+qp0cCwiG8jxDsPacx5Kem33SWIdvgNT3hOAnmf0femvwpPx4dPQxqsX/WRasIOxQ2HXZO6tCm/v9HNQpDeykdI5ey/IO2wfHx8Z9d4tHox2tW+EJmd2sYK6pDBM8rUAMjHAH9iDonzkFobn+SDtT3kRrTfBxzZ43HvgSdenLJN4hxfprg== 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=NvrNLWXf6Ou54ds7kRCWR7/685UNQ3LH5436L3RdzII=; b=foVbvpSQRlcTvPWMqIufm3apYHl6kI7jaxWp98TaT8CBdm0NaYmCehYHk4KVJgNtKQXl/M/QUeZv9QI4GEc7uSiS7MbEp90cZFqxVg0VoU2vaQoriEOxjzSR5U0Jik2DLkORawy1y3txjoOVB5SxIY08O0ITV0wny4mS8HvTodZZUuhm/tswMmPnSwxem+87Vm71snyecF8eeo3cJ1SSI7jY/vn7+FS/rVNwyNnc56Dx6O5xEELe++DBZdQ4GPKHDeO5Q9dNEocoNMsSjNGZJ7Q+gCEp2aVd0gTVK2TgZ/liASTKi+220Fu3JUKRybu8mZCZmpz4ue0XOge/pgcdng== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:28 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:10 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [iuRo2tLcCX0nz2JNxfcyWnnvazVA3F2c] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c831a41-17bc-4638-a719-08d97f7998ba X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUggP6Egsaxdw4x2opvW4nRctkaAxuZ1nYjl2+mKAkDR4vqlTBaaNXpG4M3nrD/mUpIYfYKL6+XRCJVmu3ZQqmWA76CkgNYawj/wDauEE8vlvJv8Lsdt8NfAhqiqUz94ZggeMT8uYHAlWRB3GnW29NC+qo2F2uDPFw8Q5h0SpZcI52AsOBkvMPdc99OaQqtox/yf0uNqlROTAIjnOnQDSuTg1G9isX0Qe1X3vHks4iXJeGViYkDBrgvedIxfLKzt311Q1xZ37YsvEk4B2DR8iqlvTqREBT1ZtfbL3B/+iIq/94/zroRyyCcNjvFFHG4Xwh0LvAj/M65UujuU9fjdIMSJTBYZ0vtAYgSvXIK4uRle6sfDIZQaVobL6ert9K+FeE7wfzWuxn5Lb0LW0c3ukAbRiyvRCqrpIj8xoF9Z6OXCKJXf4ReNX34ckfe59i4NrL3NOwv/XZyQ9wQGmT8HJ8z4tDe4T0hMy7OPAKW4A0HGi0ize7mJA0F6qliBkhNe/zy7T0ZeRU42HBy1PxxMUy+8LnuAbrI0r9lcIH/1Q+NgZTVU5nUBGLgAuRUGMISwTtPEeo7q+pwJgWvgDGbM1kB+4R4gCt+JlmWbHlFTwVdV8c3U6ruOCvaFw7QJCXctRXYBlLa8SyUJYuNRYqlAlcSbC+XuTWo2pCD9jSaR384U/6iDmjCsUAwWJ0A9mbZMeCGzmJPPlJWlMGQ== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sb8MyrqiUug3kGWVeKLfw/WYJVfqb9fQvvmkbVD6/3wXDfn68wmRIAilzNQUIwkbtikWcjnNqx+RZCc7R0pU/Mi+sL9GQzzSLEw9oFplKA22CsCok3EAOskhUJJP1kwLEN/d+oAEqdDs01eLA2GYGFVhByUGIE1Nl/72i6I2Dr1pZj+kfkX919T4wj9MRwF/Y9R2/Nt1/J6wBOjCYKy7DBvFjMJTYe02wLVY2pVHQixvZi7+lbFc6diJBoGb0i2H9uGbtdPPDubmdsyE4/8JY75dRJG2oxIDTCwj8MNFE9vVc8zveKWjqzPpLENEacqD6CAw2K/NFW6/0lWsuML+GRTplRtqbJU2Va3+3jresJOpE33+W4WM3edOWOjGNfDwfI0L5AISW2N4nQAMUIHyEivr99HqGQc+gf4plL9mICz362hUtZZjlEucqkAageZq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nkdRKVrPQm2d+C8sG3BsTZiE6uEjK8cx2ujbYHv28sIfWXxz16F7mr5xQtyHVz++G932dZWCrL7LmmRD2ciM/irvDn01HUVNaVdntNkUrGlROH2stK4XjuHSSz+1Tl+VwcvctG+e/4k0tV7qE0eRdw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c831a41-17bc-4638-a719-08d97f7998ba X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:28.3300 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/tests/avcodec: Add basic sanity checks for AVCodec properties 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: M+RbsI6TtVJP Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/avcodec.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index 9232647ff0..22f308fafa 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -18,12 +18,48 @@ #include "libavcodec/avcodec.h" +static const char *get_type_string(enum AVMediaType type) +{ + const char *ret = av_get_media_type_string(type); + return ret ? ret : "unknown"; +} + +#define AV_LOG(...) av_log(NULL, AV_LOG_FATAL, __VA_ARGS__) +#define ERR_INTERNAL(msg, ...) \ +do { \ + AV_LOG(msg, codec->name __VA_ARGS__); \ + ret = 1; \ +} while (0) +#define ERR(msg) ERR_INTERNAL(msg, ) +#define ERR_EXT(msg, ...) ERR_INTERNAL(msg, , __VA_ARGS__) + int main(void){ void *iter = NULL; const AVCodec *codec = NULL; int ret = 0; while (codec = av_codec_iterate(&iter)) { + if (!codec->name) { + AV_LOG("Codec for format %s has no name\n", + avcodec_get_name(codec->id)); + ret = 1; + continue; + } + if (codec->type != AVMEDIA_TYPE_VIDEO && + codec->type != AVMEDIA_TYPE_AUDIO && + codec->type != AVMEDIA_TYPE_SUBTITLE) + ERR_EXT("Codec %s has unsupported type %s\n", + get_type_string(codec->type)); + if (codec->type != AVMEDIA_TYPE_AUDIO) { + if (codec->channel_layouts || codec->sample_fmts || + codec->supported_samplerates) + ERR("Non-audio codec %s has audio-only fields set\n"); + } + if (codec->type != AVMEDIA_TYPE_VIDEO) { + if (codec->pix_fmts || codec->supported_framerates) + ERR("Non-video codec %s has audio-only fields set\n"); + } + if (av_codec_is_encoder(codec)) { if (codec->type == AVMEDIA_TYPE_AUDIO) { if (!codec->sample_fmts) { From patchwork Fri Sep 24 16:37:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30555 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1698406iob; Fri, 24 Sep 2021 09:37:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjsOT6ziZxMxDZ5mDy1f9sP0RmUUCCI7gB51pFR7mooJLNjdc8LZ7MmQDKYOnoRs9rqrJw X-Received: by 2002:a50:f1db:: with SMTP id y27mr6071028edl.26.1632501468263; Fri, 24 Sep 2021 09:37:48 -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 26si11427036ejk.643.2021.09.24.09.37.47; Fri, 24 Sep 2021 09:37:48 -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=Tc6kc1SM; 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 7385568A716; Fri, 24 Sep 2021 19:37:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070015.outbound.protection.outlook.com [40.92.70.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A78868A6EE for ; Fri, 24 Sep 2021 19:37:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VbFdVZ4RVAPuXfqnvg4XxQ3TAX5PF4aWvoc11dCW57VXZqtl9Oke3lLaCHbDepN15i6nhoKnaoPyDU0ZmRDvAmA+TzFDrcZvl5AV1S64eO6hMgYW1MaFJNpmZVBnxOMPLAcxUBYv8IRqYQGqYFbVEJHiTiAp/KoGkMhUD+CAyyCfRy6fnYntC8wi3NF+Gv/zjCD8qLOfqL9AJ00EUVCyQBZ/u8WUSqOKCpKHWvQb5RUeRzgfP+GpjydVV6Bdntt6razfe5+1stO8hj47v3zvk18Gas1Zwdc2tx7GYdPw0ebV0lDRX6YEaaPJ9L3oOjOrYYeD1PCQV7mlhz2IvOJGKw== 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; bh=0VzaRYK6M3i3GAurXd9lF7NXnI54l7KBmt0c8dxrOc0=; b=hb2elnh9Icqw6KVA2QFvR1drBD8KpwW2EBGKxWxD1gYhtZqAgP8HYr+irsvs35a5s8cNRZt+2YnLcjw6975kaNFAzlfe2T+NDVMVfTYqRpftlNN7y/D9CHYOX2TKnee8AGVAVPsE5El4oQNId0EOPhBIXR7ZICDPk0LoMxU0yjfViO7Gz1sr/HnBE5LyjentrvBZPN1zkrjqvyhDIrxGG0qORrYkG5t5nOg7rJBxAZ87i3vsFv2Dk7s/F/oIyDxyWFC+WTP3ofIe0TequReibpihBGxR8QccfxerNarVAXhKoiCse8+ygIAEQJxUGpS4a0wNq79HUbPFl+bCvLQbKw== 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=0VzaRYK6M3i3GAurXd9lF7NXnI54l7KBmt0c8dxrOc0=; b=Tc6kc1SMdbNiKNi5VLWR7aqnKAnaf2sEGxbE/jAl8zDlJQOjLvv0VAyymnG2A+JvrOZfzDgKjtsu6xMWPXAb9upS5KuULSOr+vy+J+Gu0x1aneqx632WsFpooBFYAAOOhWgUqVegECXj3BYBBLaGexLRT1OQSBJMkJVnOP5SskgzUeokeQythXA8qUHhON885m1YRl3xTmyN2iyFHYn8aOROHPBrwe8/QcG6XQC7HBv5RDPqy9SbaM53Pcd5y/l1cUYyjzWhOOkDvbMb/JdD0q/TvY85MQ//zbaefF99eDmI6lD6VgVZ0VN4xLk0OJFd1+qt5mW8n1LFY0PnixjzHA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:37 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [W82n6WXwrZrRfEOuh7cqFiW02DTZhbSs] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d6cc84d-b4e9-4c7e-3c1e-08d97f799e12 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WA2tgwuLJIiHMjGr9JQEv4Z6SWI85Yy5DsQ4pM9ZxLEtQdnaNzKc1t6VTOV4FDAJOZquCM7leFJ17VRCCkz5buOwZzLIi/k27Ek34mkKxyo45+HymZuqzEcKLT7e4VlIoYysSkZxuC6H0g93eKg54zdjqYBBj8VrtwjJG8OoojnssaA+psoR52ZYvS8kJt+6thkSZWrGGDe+ic+meTNoNI2nPiDFHMr9SQC4pxR0sgoO7mHrZNtHl/fYFfjj2mDDbBl9ain6beqLihwvPwMEYJnCKeaEOufQp5G/wDMk6KR/AxUAPYmnaKC4uk2WqP+Sxa94cqhj7ZppXbthhJBTM9wrHmwLdhVXV+zlmkPEZjRyJu8bJOP54Iiuvyzz58DKBZGHagAJHdCjTdX/N5clHKAOOR/rVuomkqMuQ1+KnZYZOztaXWF9jda2DMd/D8eacUWDajLyfSej+pIHaJQSHt1sbXwwur/mJzW7K2mdlbZWhfoMZ8h7HkyMsxngP2imSgbCC91F9N5/uT85Y+VMp+lBuZZPutEPvwf3fyOkhKAF+lDkO8/9hk5MJRD0cjWvrSv6HdnGTy/bV4cUhxEiVVPUdFaw38KipA8Ux/VKriuQLbiy9rJlETVNMTjyq5kvuhZgXJGEEzLaXVsOw9YH5UZZm8qxMp7om/tlcdvkuRjT05Q8HS0rfXPflZkJI1G0u4HZFphAj0jro= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jw3UoHUjGCKTKNc5AvI4MxQvfXDsSiy/aZNDoduSxVLcOg0F0fAjyPsAqfyQsg8i4qgs4yzEIvlrQ97om/q7X9QO0kS155DkChDzdasPMEG0S3tUx6Sw1tqZz2+UiYEXQgRnh0iFR+XZWVbPxRMml8nWOu+ADyp+0R9RXGND/QssaBycINz0cHX1zHbnGTxtq42j9YDalcSWUX1frI2GAn693a4vardgRo0wYwjOsBPsA3WKLXrsU08Hllqu5kILSCh0r5OekianRHha4t1Q7bxSP4Df9GtBvOVGL3vPVoDzZMutSdrs7eiQ+CJpINZ89R8dyKEBS3rS8m53OFk4Dd0oexnwZ0EQ/pSsQR7QxRT8TGUKN3T82fF3ixDiQaANI+dms2LYqwvWvjiZIJs8FLn/1iaPgVgGY5+z+ZWY7vn22MLwHABy4DWZaB4472Ac X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VPzkR1mNdh0QXWPGEVvCersikynRRfScCBni31nlq7D2aWU5OXjAQNLK9ZSTlQSiDgfn9obgt4jK+WVGEEVEsGc1YWNOJiC33qIl0kwQwnxi6BMImZNdjaVAoV7qvFYfZLCCE7xoJ6bORuO8EOPyyA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d6cc84d-b4e9-4c7e-3c1e-08d97f799e12 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:37.1681 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/tests/avcodec: Test AVCodec and AVCodecDescriptor consistency 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: VcKlATIe1t6E Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/avcodec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index 22f308fafa..64940cfdb1 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/avcodec.h" +#include "libavcodec/codec.h" +#include "libavcodec/codec_desc.h" static const char *get_type_string(enum AVMediaType type) { @@ -39,6 +40,8 @@ int main(void){ int ret = 0; while (codec = av_codec_iterate(&iter)) { + const AVCodecDescriptor *desc; + if (!codec->name) { AV_LOG("Codec for format %s has no name\n", avcodec_get_name(codec->id)); @@ -68,6 +71,12 @@ int main(void){ } } } + if (!(desc = avcodec_descriptor_get(codec->id))) { + ERR("Codec %s lacks a corresponding descriptor\n"); + } else if (desc->type != codec->type) + ERR_EXT("The type of AVCodec %s and its AVCodecDescriptor differ: " + "%s vs %s\n", + get_type_string(codec->type), get_type_string(desc->type)); } return ret; } From patchwork Fri Sep 24 16:37:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30562 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1698533iob; Fri, 24 Sep 2021 09:37:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNzTITsurrXTdr+TErpGhANkt3qwN+jKX10fkLyBoiLeiEezpV3fAkVB/OuiNIFtSBW9QW X-Received: by 2002:a17:906:3a0f:: with SMTP id z15mr12560314eje.42.1632501477174; Fri, 24 Sep 2021 09:37:57 -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 y12si10283952ede.501.2021.09.24.09.37.56; Fri, 24 Sep 2021 09:37:57 -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=Hba1anpT; 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 6C54468A72C; Fri, 24 Sep 2021 19:37:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070100.outbound.protection.outlook.com [40.92.70.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B741A68A6EE for ; Fri, 24 Sep 2021 19:37:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HBz0c+woFQUTosNQi8F7cn/hyHcZVQMC499eLKf0+3OzUP7Ip/LW/Jfyudd5Dt99z9uLASvIli8jGQfyXef4YUCPJmKLm/Pt/BSGSGDMzONUlX410QM4nmQi96io+anjLbDBi1m756rSQPLTAF6XaAx0QkEJTkNJ7NH93w1GFb3LqzFgC1mJNprjdAVcX/WTl7rnIaeCCBZUEqK5JZWZgLBZIj3wBGYjR2R4X+BeNWqe9j9sxPXxVwQj366K8RuA1Y6Xji+ed+l+QTrEMxCfiLiRnv90zab61ab8YGL12sNxBRz//s5iUVhmNw376EhCkCxta3/9qkFC7i3ufYR1Jg== 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; bh=u5jkre7PPGwQRGrParyMD43Z7n0RxhKYEexArH658iQ=; b=JLIZTNOFigrK2IAHehrhHrXwzOKY/IqUH3YLEtMAt/NvVwAZCTbu4GL6+kxhnp5to4FKJn6UfbKp7ayGszpQBdb2mInT9Um+yHEJnyUzB5795ihqu9zy/UA7GP7G76xAy7YX5srYVfSixeDK+9aJ7g3cHJXZPknpYwHKwCsCGgyBgEY5jF0v6lVBYGrBdCIixBwLe8svqZCC2JFkSp7gGKpwcvEtT5UXKxj5KdYvokVvDSOzmlzYOPiW2eVHxkNvTG49TOJw9cwt9EiV+1YqCIgErGQEedCp+4rtXtk5vE7JM6ze4i9tF7IDnkJuI5KfloBi3SmBbs1Tdu77UFiW3g== 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=u5jkre7PPGwQRGrParyMD43Z7n0RxhKYEexArH658iQ=; b=Hba1anpTWlZ6q8T/w0cfbGjth3WOPeuuyyxvFYQa9jLLLi451/FaAHzdomsTX5ze6tHMMttP2TPivx9Er2GvyRJG2NHi49Rot0/NvoX99V8kjsn94gR/+fDXh3CGpnSb0foy7BRcLlA1I2uyYz5kL0CFO7TjTG+IZjy+1dPpAijYA5ifzWuv86MyXfbU2rNcjlc8f53IdjsUz0IcmuBtpNb6cNis+ET4FsP4USlzWpQEC6RVgmsnmjpwfDMnPydOVlH8Exa/98/HXOQHfeAD0FbC+N6h2QJVlVcWaNcqLuTawjpkGonyYvrMa7wut9EIo8RV/GRHxNWAS6IMU1mtLQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:44 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:12 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [kRct9Nv+i2xY2ZE+au63XnwmLcCVnljG] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 743be659-aabd-47ff-55a7-08d97f79a2a9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WACm0S28irvxy4XNN9g0Yr6N5KhskX76MJlp3bpfAYtO5jbvE8m0xRCl3rfE5zZ86nm6RrtfWJsv9Imthr6Pcx8YyDxmDWBjjgGfyEgQOZ57KuS2W8fSQWLcsHe30vm+ujX8Tba4pB6QFk3NrB3Q1XUHu13NIO0KMdK5uJclzHrUZFCwZ4lVexDnB1dLvQYi3m4ZWyw3HUWEhA18p9hi8vdKLQ4657JQSw9nx3lqMCH7Ekxx/fv4JE+qGAkSs1XdLrin4Oyu0GsOgeey5Ab9ytt0ThPT/gsJQWD42lgWDKeefou8lr8ghV0bUHON2BndwfDb0vteKSgN1J0C4SRLgCajThUcsWuaX/ckWpngcOy6YEUS/xI9FuQlk1hKYpoJHJaG4IR8PpaNCJpRkulJ9xUmL9rJNnetj+DNuFWcwl2kqD03GQ5b9ZMAsrXbDkSWzM0NVZvhD1rsrb7GSZCNNO1BzBEKZaamDUxUi1nAO2hELnTve/g/AUqoUtVIlZnP0Z9S7/3UiJJWzmqg/eH78d18nuJEe1lMG43c8ixN1632iWMEy02zEPc1CEB3wNA/lHhjCZnKvZJ43FFma6mxHUJQ7B/naGk+S5HbIAHW6k8FATkYw1JBR/Nk/4QmODJn7sYBr+XQhC9WfezfvWGV8HkJ+48mIl7j5Tc8YLlN/ySqZLpRUieMfr3pY37ZhSiSCNn9GjILTTfsA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y55WBHyA4qBZ77o7EcBr90g/D+e8FDkRre63bKitosM48hUA6dVn0CQ81NtHIFKkGgGY/KX4o/+HnWheun5C8BpPo9KxEp7HBWr4/dTO31pXd0RtIiyTZ9LidMkXQ02KOZuLhCBMGP+YnRqZ12TjdJbzWB2mNx6QeBard7FWNNuHJrb6cU+KWszq+j/u2sj8n6IaPLZ4HGOx5fjOsSsVg61G6CmvQDyeVmC9wwHiykuuEL7NQYpAmjdHpamnFGY2hgy4NVGP/yMArn8405cqDdz2HgpCCOzopmszaUplesJ+6XGoDTLZGGUalrADxP6DBBg/uf/PVnk9tz5luh1XyCNnaYqJ6MkIEmIL6DYnK37OX/+jgr7cXji0wb/OuRGHadiwlGGVc4FknJoPZzodM2Vi6CIUcVy4aRTGzpoqAhdSHFIiPvpROmIFUDcmQS61 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: X5Zl/QgwwPecyPO1/J8/EdlX4ryeMGko8mYF+gxk3zBbZ6UkWMitustVcUii2M1Yx/iSkek8Wdz/UYR9zweQduGghtQDkh1keClwekD2OEo1QRMVG29rstsbPSGW3sOKnjgs0tXbXxQADGoMR9LQ2Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 743be659-aabd-47ff-55a7-08d97f79a2a9 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:44.8463 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 04/11] avcodec/tests/avcodec: Check consistency of function pointers 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: HgUrrfZEIW7/ Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/avcodec.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index 64940cfdb1..3eb4372019 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -41,6 +41,7 @@ int main(void){ while (codec = av_codec_iterate(&iter)) { const AVCodecDescriptor *desc; + int is_decoder, is_encoder; if (!codec->name) { AV_LOG("Codec for format %s has no name\n", @@ -63,13 +64,33 @@ int main(void){ ERR("Non-video codec %s has audio-only fields set\n"); } - if (av_codec_is_encoder(codec)) { + is_decoder = av_codec_is_decoder(codec); + is_encoder = av_codec_is_encoder(codec); + if (!!is_decoder + !!is_encoder != 1) { + ERR("Codec %s is decoder and encoder or neither.\n"); + continue; + } + if (is_encoder) { + if (codec->type == AVMEDIA_TYPE_SUBTITLE ^ !!codec->encode_sub) + ERR("Encoder %s is both subtitle encoder and not subtitle encoder."); + if (!!codec->encode_sub + !!codec->encode2 + !!codec->receive_packet != 1) + ERR("Encoder %s does not implement exactly one encode API.\n"); + if (codec->update_thread_context || codec->update_thread_context_for_user || codec->bsfs) + ERR("Encoder %s has decoder-only thread functions or bsf.\n"); if (codec->type == AVMEDIA_TYPE_AUDIO) { if (!codec->sample_fmts) { av_log(NULL, AV_LOG_FATAL, "Encoder %s is missing the sample_fmts field\n", codec->name); ret = 1; } } + } else { + if (codec->type == AVMEDIA_TYPE_SUBTITLE && !codec->decode) + ERR("Subtitle decoder %s does not implement decode callback\n"); + if (codec->type == AVMEDIA_TYPE_SUBTITLE && codec->bsfs) + ERR("Automatic bitstream filtering unsupported for subtitles; " + "yet decoder %s has it set\n"); + if (!!codec->decode + !!codec->receive_frame != 1) + ERR("Decoder %s does not implement exactly one decode API.\n"); } if (!(desc = avcodec_descriptor_get(codec->id))) { ERR("Codec %s lacks a corresponding descriptor\n"); From patchwork Fri Sep 24 16:37:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30557 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1698697iob; Fri, 24 Sep 2021 09:38:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+stesd9kd7jrIL8wIdU8oKJ9MAff8R9+XDUAsEkxmdkNiVm6ju4JFO0M8pDJSj4ReZyk4 X-Received: by 2002:a05:6402:2908:: with SMTP id ee8mr6175220edb.33.1632501487914; Fri, 24 Sep 2021 09:38:07 -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 my49si9440696ejc.46.2021.09.24.09.38.07; Fri, 24 Sep 2021 09:38:07 -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=VKx4vuB5; 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 68F9E68A769; Fri, 24 Sep 2021 19:37:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070100.outbound.protection.outlook.com [40.92.70.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3CAD6880B5 for ; Fri, 24 Sep 2021 19:37:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fw8yfPDs9AkSbKYYVyjIz/FoSPoXXjKSmUGCFBdcD7SYYiN/y4VdVqG9TUlNwaePydmMvGPIMPykLVaPA5DhMsYVxEDClRwej/NurftFdOqoS8UnlHpOoQKWJVkqP1pwbqnfz+T2epYAatoNyDmgIwRXwfPIZNkbUKKh9DgP98HF80DerCOE+TaMpUwqUxOKkz2yKRWcAQyr2nL9PtJ4p3jpTYTvG9QCApx8H75H+PEeutYov6p5wOGWcXGKBL6Itt7UlJj+/Q5M5vW6dvG+ZOV1jtoiwBO5a4L9JHVUY1TzhujX0enmFGMPZh4Bpy78htljyGpK7U6CaUOswFiEBg== 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; bh=ZnUO+YQTA9/VMtYsjGQ/K0JtSvdZ+CPo1u0KXYWUPsU=; b=OA0R29LzHiCAF89s5CH6u1x2sH5nfKroM6Nj7e6Rs9O0f03FJB3EeC752lXOd3gt6t5NKyhRAxa7FOifZnis0BXB+pl0Cj7Vw3/2hWxBi/YXcDK1ezU3VOePL4u3bUxdxBL9sfPt3fl0auaFwzvlKkJEzrT1Lk91wMTepx1jXN+IFXKDN/lAZJPN1m/c1pimtmHvZjITxcR6K2ltTbC83hs0t+y0yhJBUyWOhv/fRg1jhHzDP5uwdEj3TvcyZFRnAzWWnkAlOFCGTUr5l767C0uCCz0VXOoaJqNWbiXlWE2ozHjqVlbKjlXFiUTLF1r/O+nHr8iQTvQ2SqRwfH9xJA== 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=ZnUO+YQTA9/VMtYsjGQ/K0JtSvdZ+CPo1u0KXYWUPsU=; b=VKx4vuB5UYh9o5tkYpMECSkz2afdKJOgPpa/YSx+tadD+NwuiVdkPSzvqjMyWyLq1pkE8XRrMHd6Pp+6/FMwgm3aQxplNszpSQFt8cgUqLgE1KTudGOWSDEYer/uYRbfac+n7ScReGAhPkV4TXyOlg9BxyKRWI32iJS8Zml2+PVlHcUiD+/B9Xq93plw+CRM+gB5UHTo6PejFojxZUVyqQXC8Aip4TfeMyGLZ0tvJlaLa/J61KmS5pSKbjqoZXCXROc5aK1dtPTMLHyKb5G6bamS8VJZpevCydoklM5ZiRR925ih6bNmjXoP9PhucdtQhaCEDm3U+3AN+0rw6GC2rw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:46 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ediORo33se4Rh5gzHL0HKzN8SznVEgHp] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f437c09a-9e83-458a-80c5-08d97f79a3d7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTEQTq7U1k5ffr6GiZbarwOYF1jszu3NdDBQf0oJ3RBLTwotRPT2C2aNobarO+XjQJ+PVVgGrVCitUcn2VH59//uXL+XqI/usjg5+bkkl5CRcaIcNKLfqe3pGpN9BOznvgph6cSmzVUhR05AFw331wYgPB/oVHmexo/KgIxpJjxSDi84BK8wHe8w8+6Cz2hvb9y/OTt+XFHuQne7YLVCoXHUQ+qRho+YxawWgpCvl/LmyLEqNIy4Be9j9fg2bIFbkGoA7XzioIYU6KS5D7Syi+Y70hXjOythPrAYoV3AzwZfZHFDkXnWEsTxp4mlE+zNg7+aZ1HLrS4mDfxJHL15+YYHOP3siziUT6yb56dIQ/9E1rAnxN+pEopnVwujwT9S6Yng185us9oA4QDBXboGdsE8Rq04gnX2Pco6HQVvsh1n4O/Sr1teqcNbDq/pSbbaCLkbGVAWJzxUblcp5RTX2PKz0YPRbouK3ZN584pfKv1Qr0ukwjd1VarUgtDxFX3wH4lvXqMyL83SwS5yFr5sajAkOIquBoXWGlrpLOn9xNO8x3WVf3dY/lJK9jcQExRjTe5m+PDMH+m6tIkIuBTSNaeP+nHZ6ybVJxGwtgJwKF2ZCYlx2UIVrvzQK6T37vmG5LDTPozv43sXsi95+gujCYV2PsMofBckp9nd/6lY80OXIvJSN/itbkkwXeQGchXzG3edfxQjAtKlPH90b3CybMQ42UPQbVmjYg5MrqoNV1w2wlBV10JOZzwuhHK6p8UrBo= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +T5tfOpDDjCVLGu2VqfWl8cox+g7I7M7OdwRrZy4E2+B+6s5DUjvTge3NXi4DCVSAdxW36m3H+/fpho07IKyUm9KPpoI814w4uFmif3+F0RxQRzwwct6kwKhioUjQJe7CSgblJnGsPOxgirwog1ZBwqDHTWnVpfD9JiWy860HmwU0tdHfrH8zoBsdbep30wFhV0dN7oDjkmIC4Y5YDDTM72L8Rx1U73sneUk52BKaYatgSZO+quJKqWIVX+imDMRHQjrwzxQ3Gr6q/ouiOWfeu9o+/SCCSQUmj57bQtKYBweVtAGqeU3hYDEArtsEqfs1BLmow/Wa39T2islOAePyBfFzC9XPkB898yTBpK6b37GY9tI5FzKBILb1VTY1VACqscAEXjNGNhoqHzNKCo+CmzlEByEThiPzIvjRbgEQ/H4jVjFjaI4O4lanLh7A5Y8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1kBEaHFkF5JPsi2X+ftMCxL7hVMCoDpdKNQGJVHBGzxQ/PjmUWJlBDQlXTeCtQKE2GpdJFU+te9eOKWQYNd4SOsRNq3BbSnEIZFDIP01UMPYWsRm0VVuiQSXq/zv0EEwVmkdZYsobXovq3TBc7iTbw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f437c09a-9e83-458a-80c5-08d97f79a3d7 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:46.8226 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 05/11] avcodec/j2kenc: Fix AV_OPT_TYPE_CONST offsets 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: ns1es1graSr3 They are supposed to be zero. Signed-off-by: Andreas Rheinhardt --- libavcodec/j2kenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 7ebd6856e0..71010509ec 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1818,11 +1818,11 @@ static const AVOption options[] = { { "sop", "SOP marker", OFFSET(sop), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, }, { "eph", "EPH marker", OFFSET(eph), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, }, { "prog", "Progression Order", OFFSET(prog), AV_OPT_TYPE_INT, { .i64 = 0 }, JPEG2000_PGOD_LRCP, JPEG2000_PGOD_CPRL, VE, "prog" }, - { "lrcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP }, 0, 0, VE, "prog" }, - { "rlcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP }, 0, 0, VE, "prog" }, - { "rpcl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL }, 0, 0, VE, "prog" }, - { "pcrl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL }, 0, 0, VE, "prog" }, - { "cprl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL }, 0, 0, VE, "prog" }, + { "lrcp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP }, 0, 0, VE, "prog" }, + { "rlcp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP }, 0, 0, VE, "prog" }, + { "rpcl", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL }, 0, 0, VE, "prog" }, + { "pcrl", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL }, 0, 0, VE, "prog" }, + { "cprl", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL }, 0, 0, VE, "prog" }, { "layer_rates", "Layer Rates", OFFSET(lr_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE }, { NULL } }; From patchwork Fri Sep 24 16:37:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30553 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1698859iob; Fri, 24 Sep 2021 09:38:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxuX+0Gmr9B+AX02sfWEUyZGj4vFqSBIiza3az2qIVh8Jml7qwbPRi1FMZCHfpM79J+1HZ X-Received: by 2002:aa7:da45:: with SMTP id w5mr6049565eds.266.1632501497690; Fri, 24 Sep 2021 09:38:17 -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 m2si9481194eds.578.2021.09.24.09.38.17; Fri, 24 Sep 2021 09:38:17 -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=H2U4PcFz; 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 440CE68A776; Fri, 24 Sep 2021 19:37:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070100.outbound.protection.outlook.com [40.92.70.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 085956880B5 for ; Fri, 24 Sep 2021 19:37:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VDznOKh+Jy9LrrFo8yy9I3CcDFeLO3wrl0bEl7As+2n9gT9OsPFq+M95X/ybYCyw1GrUPXjvxK3ISHQqDwC+rxEI2zXRQm9nr0PKgLIQoE/O2Q4g2JXVGxl6WqD3ELKLNe7vY6SAbAWVsu+bwvUCsNQfOYcseuHgXXiATiYhvVJDiCBsj4R95+9pTP/IDltyWtWPDg35/Xm4kehJ8y/CNjh18/43BAGXzanGRNvE4nR3XcJBJBo7MVuvID/1fF6ePH52Y9R+8Vql2XPvgkK4sYQX5Qy7Lcu3hNvS7y4iCjsAqZ7uqtlHpeKvLuQ+tvi68Ip+KnygUWsQbl6WM5KYmA== 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; bh=vM1kmV78x8Fljqdtpp2GilN8v3BY6Q41KaKQwDqQR7w=; b=KvZcyCxrZFoLjY2MBWyMEoHLp4yyZfOCccXeJavLx5ORt+SFWpM7UJ4LohiR0JdM4H/RIhlf3eJMs8ifQVY7IbWkhvbMT/hVYSCwKfFcphRgfMV0SkdNOvPX2wunrqEI2VYLbUeVcKq46tNSkp6n1vHD7TIY2GGBzh7SoOdq3+qU83cihrohvk/3n8rivoAmmNQHSGWZLblEEQTJXVtsCN/kruNSFH0vzmS0V6121MKFCNqP5qf2cfXSLBhkZ+0CVFm3kVLMEaaw5KjkiqwvfR5W047dP5/8XbcPdw4n0EvuCoewr3BTDXkUpD4q914riBKaDJs6bVLTj5EFlXb/2A== 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=vM1kmV78x8Fljqdtpp2GilN8v3BY6Q41KaKQwDqQR7w=; b=H2U4PcFzsNYslGFRD7SgvK+lmq9Im7Zj0rJJsnXMMjPdz87M+Aabdchmd9AglVbzxoniLoh7fLO1eZMkM4tM+jQn9V7OvpBqK7ZlDVSWyAM+5xDGbVtjJhOK5bJj9vtOh2qYn15s42PHiCiPrjLrC87JvDqbSDZ4ir6tyYracVV5Le/8samrTrjobtKySXWOoZzjZWq5nEezU1ZTbYpISKX2Yv3/4Q7p97VK5rRoVuAugiUV9bIaBVqb4TXNNpnQA8topBps+jNMFODbKpZ1Vfh1rpE09D0VmB4R7glUD7127RBi4T7h8OEhcTrHTfNABdOOK8lh2fxoYyI8P3VkTQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:48 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:14 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NCokoHx0toq1f7wbw1tv9Pa5oO1RksRL] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3a58c2e-c992-4ee5-2f95-08d97f79a488 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WA0TbozIxWwB1cm7MMX0nkSOkaSl14y3WhIFx3JIbXrlyd8XsLC6yVvSm7dBXR63sMFopJc9/R7SKKr2BfGESuEDp91PKjI4OUpwl9MLN6t+qAiwzF8pC+mrhEDSmw5hZJBcD7Y3h+BeYM07zImWVrut43uhQc9LzZnFA2h2+ZiyVSuiBukRVI5Ovc8o79qdTBD9SPIJ3ZC/kzlGqMfJmTidrHcLMWS8WZu1E8pr3pTHVdpUSQ6IM5rId7Ewzv3Pmk7gJr26j/YIpZYfkSdc1tx3ydF3bV7QKpSu6ARPkA20vecAjCxBeGfHiUhY4k1p7r1e0eTqm8OsStIY42r3tMvLRlSzosym6pLkR23/maI5FAFXtZaMlYWiGHN7yK3+o2yXk+UF7+d5ecl1OuGyEj1Z8Ja90mRRvxkws0IQ31Aj8s3qVgQa5mvDInhGcKQ5Xqpx2Ec1XWbObBDIbbiKMPerlA1FaOBDo1tlc+GrPNZZIwuNaRc728CyaEFM90k+Bz8ddDmYZIIIG6bhbEbCaET+W//2pmrhT3RMlKDNJZy99HFX7LB8RvAqDPQHQoUAyZ5xnX5z3lYpto2EkZYED6qbSg+oWKtxHsRT41vjeuflX3/8jJjrNhgLSQKdYGVIjwMVgfEiVyivcL9t5w4r9QQosm4IFDOsYL0hUBY3ZtsuzjfOtP0VVqeUZamblTAbYpWj9S2kPAgqs= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6KP01OEZRoRFPja/Jgme14McMb9+DHFDbHwq/Y7rjQX3sVYAz5qB7C5nuL58jRM6OMXKv/tCNAO4prWAf+91z4zjOLtbTHoMSeIwiRf+vUiVoTKcbMy0+NgN0PvERINJjpQ3c7twnmQ+4630rEMFD+NuacCex39BOCMsRwBwo99uIzkA0CrourS35iWMW7xY3csa0P6wAoBoMVLu+KpXeDWUXeQLDkvRkDUv0zN3nXaSnOXIQAN4oNh/GCJU7/M/0wl4+/stTrbBtuMwktnFweNEKuSw62t/6BKyU9i1B4sCNf0YyTBS4NNCinc2sxnVkUMKoC9/mdWdQ15DCaqjNrIQzGwimFplJrC/e4h6QPLAe3UHm/iTrsr9DyQ8FU6raTBMiYwGZS7mYYOSRee2Up1nzSLdNdaoLiRDeGSSlDJcwyFCbXggqq03OAlLMm6m X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3DEd6D9ymD7om7qN/JLn55yAx1OyKzK4JPIeX9cuWsAAC/PDuF3tLxZQ9rjh6crjl8RiF3V3U3i7wYGCp1souYfUxlzcifWh/v0bc4yqyDELwTtKWic7KbdduONKIQbY2p1DITnH3D5YtdtoaSpjbA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3a58c2e-c992-4ee5-2f95-08d97f79a488 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:48.0134 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/tests/avcodec: Sanity check AVCodec.priv_data_size 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: /y9XzuM5w8Op Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/avcodec.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index 3eb4372019..5512ae99f7 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/opt.h" #include "libavcodec/codec.h" #include "libavcodec/codec_desc.h" @@ -34,6 +35,25 @@ do { \ #define ERR(msg) ERR_INTERNAL(msg, ) #define ERR_EXT(msg, ...) ERR_INTERNAL(msg, , __VA_ARGS__) +static int priv_data_size_wrong(const AVCodec *codec) +{ + if (codec->priv_data_size < 0 || + codec->priv_class && codec->priv_data_size < sizeof(AVClass*)) + return 1; + if (!codec->priv_class || !codec->priv_class->option) + return 0; + for (const AVOption *opt = codec->priv_class->option; opt->name; opt++) { + if (opt->offset >= codec->priv_data_size || + opt->type == AV_OPT_TYPE_CONST && opt->offset != 0 || + opt->type != AV_OPT_TYPE_CONST && (opt->offset < sizeof(AVClass*) || opt->offset < 0)) { + AV_LOG("Option %s offset %d nonsensical\n", + opt->name, opt->offset); + return 1; + } + } + return 0; +} + int main(void){ void *iter = NULL; const AVCodec *codec = NULL; @@ -92,6 +112,9 @@ int main(void){ if (!!codec->decode + !!codec->receive_frame != 1) ERR("Decoder %s does not implement exactly one decode API.\n"); } + if (priv_data_size_wrong(codec)) + ERR_EXT("Private context of codec %s is impossibly-sized (size %d).", + codec->priv_data_size); if (!(desc = avcodec_descriptor_get(codec->id))) { ERR("Codec %s lacks a corresponding descriptor\n"); } else if (desc->type != codec->type) From patchwork Fri Sep 24 16:37:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30558 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1699001iob; Fri, 24 Sep 2021 09:38:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7MuIJ3I0oTOcAcp4LE8uzaonKwOcyjgbZfWIeXUkUuhm3F2AT2E6qSsY8PB5ctaLSmJar X-Received: by 2002:a05:6402:17cd:: with SMTP id s13mr5951209edy.321.1632501507408; Fri, 24 Sep 2021 09:38:27 -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 q15si10063376edi.437.2021.09.24.09.38.27; Fri, 24 Sep 2021 09:38:27 -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=I40XmrMn; 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 2D34B68A753; Fri, 24 Sep 2021 19:38:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070100.outbound.protection.outlook.com [40.92.70.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24AF568A744 for ; Fri, 24 Sep 2021 19:37:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fUPd0xyEd31HVcZRfDm07jciOXjqCvn2XemcNYPB96oLaIl0iNDuPV2YnKNOX679xxiEjq4PgmQls/+PwvHAM17F6eVq4wrQsETx0128yspdT7vQNAXHdaoWMSeRlMl+xcjaQpym8olXKU9bIIvA3VOkND9yMz1vFDtc+AYjS2VryfpLLEXkeLU2PXCqyTdezmw0/2NvmS7PP53oimxGjDLzV5/iXbacaiirhpH/ugINKGK22US8wYVm1nccoxyUaPs3Jvr2PHgpuS1gR7MWrFOgdB1PVSjlga9SvqXo5K+A8KrDmO32hkjvUQNLKG7ZEiLCNynITu2SPUXO9TqDzw== 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; bh=TSV57w0eF1EMUQsCZYjva5+airQe94gIsZJtkbBWXZY=; b=oRIrH/NQhvAFdzumR/c/c1ednZ84YbRlX7rXZSC2ATk84qUi99d1h9T3jQ0gfLrWWSaf2Z5OEAwv2cNGMm0Tf/fyaXzu8Y2ZswC+r26J4jOqL0QY8FZppPTdtS6bibg6oH7LYm2PaE3NEI0liDJRktnah9Np+WJlWNhhifWQXOCkiUfskLPQMSTvCD4VYFo9qiTLP9QlZ/IO3mIuYwMZ8HCaaLMVvVwSFZJ2XDMsR5dFCII1TsBR72ze8/RdfvBkd4GT10tIXvxuQqFxMaY2Zpp2L6g7fy2AGuRTygDViiqgSDbDsdQ9CHEwHoul9a+yugnBeHquwpacWxA7YOzsaA== 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=TSV57w0eF1EMUQsCZYjva5+airQe94gIsZJtkbBWXZY=; b=I40XmrMnoAy2wRxy7Bu/TxIOwPJ+/7qd99qFyW/8ufwQI/F7yjEfqJHD2wn4Wk1lls2PP7e6++soJMr08pl8vNrsFENolKZeGtZ4Wlzrq4PS2Jpaefz81+dtPg2gMjvs916NvaJcMPWRduLDv4G5zHzI1lnwSG4VS0wmfdsaaXquq+wufSbFPfRuBSWxnDHK+f9LOeNYDDqOAzk2QFULfh/n2TXNwkkuKqm/FCx/H06rpRzpMS2zC5pXOAQsf6v1Vp4vNzu/Q2Cy/EJnGYWSrCHEp8/BupsgAuLxPxtEy2SDKOWLCgDjNffisYOYvBOmECVIyRnykEb/NPMRSwc61A== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:51 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:15 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [zQCOfLb0wuEN2m1pSFcOWq2PLTwHxK70] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9fc50d36-027c-4d51-3cc6-08d97f79a6b2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL0L/IA1O2ztnNnL/cAHC6sMytiTa3ZRJL7tiNsEsfuVSDZzqY9pLHH76D51i7+XVScrcwIRLC3RiHFah0JI24LBczvj3Dp+UMFbbPPCDFHWQf2O9Rb0nw7tvohQH8UH9qIrtl3QPuuPAZNw/Goqm95Kda/mnDGjcaDtBY9KpG7hp+KNhpbNxRziI40I+dXc9hyTlqAi1oRleDZdMs0fa+68lPdTu8nVipo3m2Po69oZBSop27cKRLZ9gFpGiREzN7cMqiQ+B+hQTfJYouCIfm7HO0ktzsdTCFJYwNFYJ0mr4K7FYcReLsYWiXd4vqHV/R/f8e9lBbVXKGdCe6E7CDajZwPV+/CV3XBNX+dbJgIIUGU/v2gx2p+lO4pCa8r209JfWmyOLzMirTbrfmvqp0Pfs5HoKsS4tR98Zz232hbf+jpj4Glk1wXiB2IzyyNV9Iy2OfRmj+RLJBdFpxGjaQLRkTrdbW3K7t/uuwoalWF2PUCkbLefFGHZCeOdUML2vH5U9CT1tMxy7TAL7MKJaHKOUGEYQAo8rgjLrovO5vw5j/3/k18mncdGxaz3/f+YBuJtqmbGGm0B3XQs2Lj4bq3V2EX1TBmBXdXY7L0tqCdtRlCFHE72OFKYKS2x9PxuCT8eNd+lAzJYk9DYQIfun2RTUbVAbFkJ1XDB+P7q15U72e07wV2sO3Ntr2+l1bm+AyYgXud8iOegg== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yh1Pp8wX9ABrXDrETc3trmipp+p8oGLgcr9yJAANMbUNqs1sZyBVcgM+aMOhVnxUMsKRDnW/U+GDnezkNVmlOXsIRBltYD2lmozb4L0QH2/svauAIFc1kYrQXd6654WzGNfdWtTtQzMXM7lE7xzkwfnwmsDEWgf3bI3INhbCALHG4frtLcbCyOimypDW3squbdCNN3CCwW1AvyKIyGN0N3sIZnMWteTBW8zcBR2Bv2q/80rx73cXdwICEhOLjp/zZXZhHiJXLi3DM/tQQQeBYr1I6ZrjR8jtW7XtfF4ecz9rivVlwL54xlPYljoBC0FxGrddS/SkDG/pYfV/pHwQitWbgLgLLoi6cR04UokG6bfviig8VCDrxulZOqA5jlMpST+wDRhn47YZzES6YwU+rvXNfJHH/VYwNmwCu6Y7lh95LIHudNt+2gRIHzZCBAli X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lORN3AlM0o6vIQt72mj7h9rDN815HVVkoklDqlKseOZs1QXcXCcs5SNWEKrsGoLvvdNJFt00cRvHMXnMGuixGbdzu6E+cbDyWdLheIRMz0C72aoVKy3k+6h45BGQ3sn/nr+QbLNJ4KndGYrygPI37g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fc50d36-027c-4d51-3cc6-08d97f79a6b2 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:51.6215 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 07/11] avcodec/avcodec: Make sanity check stricter 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: VR7ju744by94 If an AVCodec has a private class, its priv_data_size must be > 0 and at the end of a successful call to avcodec_open2() the AVCodecContext's priv_data must exist and its first element must be a pointer to said AVClass. This should not be conditioned on priv_data_size being > 0 (which is tested by FATE) or on the private context having been successfully allocated (which has to have happened at that point). So remove these preconditions to make the test stricter. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 2dd7dd84e0..97eb1ec431 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -364,9 +364,8 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); #endif } - if (codec->priv_data_size > 0 && avctx->priv_data && codec->priv_class) { + if (codec->priv_class) av_assert0(*(const AVClass **)avctx->priv_data == codec->priv_class); - } end: unlock_avcodec(codec); From patchwork Fri Sep 24 16:37:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30554 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1699180iob; Fri, 24 Sep 2021 09:38:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5fpNFooRtszFSYS8NOljclfHkh1Y4ID/sIsBVMJiUT4Xuzqp0Bup1R1NIYLo91AyW735s X-Received: by 2002:a17:906:660f:: with SMTP id b15mr12420872ejp.491.1632501517418; Fri, 24 Sep 2021 09:38:37 -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 bl3si514212ejb.204.2021.09.24.09.38.37; Fri, 24 Sep 2021 09:38:37 -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=egAMZdiM; 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 2DC8568A6F9; Fri, 24 Sep 2021 19:38:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070100.outbound.protection.outlook.com [40.92.70.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41BFD68A75A for ; Fri, 24 Sep 2021 19:37:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dWQ8f36MVSXP1x2H3m51+tXrzGvnuqdojnlOn591iwDyu1G9hwVfZ0j9W4yBOFTmts1vdpxH/tBtjMDUv8haKlqosfSvmZ7OpVsGC8BlIcEiHXxu7DEVE9ALoiUAKZN5WBG8XZfP3tlLELCQVUVmbp+TiQVM/Ni6zrSiVHxJ4pM4I8SIjnrG5uj2o8iWJgv0nOfAjfiX4mraKu4p/I6VvSDHY20X+PRpUY6yk3ObQ9RXXNM6w0LqMn/g07ihW0f7DNRSQcaEHSdx5gsr+qoyNA5P8eX0hzL1dzWB2hcWhrDY5Q31CEIUo6PmN9zwoVl0hex//KeLj1Jc/iFm7bwdNQ== 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; bh=PiHSxRM650yIm545P3zakXPg31CKGXu7TNLMCBpPkYk=; b=BTypXH+Hjd3L/ieCSpAGyh6uh6Mrfo16awo4PnjdZATfvJ7cWfYXzdDGZE6Rh00M7ruVpnSjKJPgaLBj+ruPu7hGY4sIxPwEGPKaO576+QMMUynB6WpbpQe2cX2bWvCUWH6TdguiRcmIOP7DeDXi/YCK63WlHg97aKt5WXzg/2EWodOXSed21sHMRHB1Gdrrq94ej4w+tmdzoZia1ZJAZglplVPffeyPOZ/9McHdHzCSCPlcT1JalpXFC7y8SfX6pNLWRqyPmuJcs3J35KNbhm6v9uzEafKWvQ4+SHO+Ev6rVWWR2yy/zqtCYswrSX6qfmCJ96nfCOChbwdGJsTdhg== 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=PiHSxRM650yIm545P3zakXPg31CKGXu7TNLMCBpPkYk=; b=egAMZdiMknxBqgwr6indFS9JIPlspltYWYUUDw7XFpFM4JDC6bd09lnpu2J38NPu8X1WZZ/uYX7Ax7E5Ac45LOnjZbfo4iIPy1dnDvaJhWXE/xMcU4ZudUkjb6J+Zj9PxD9982aLEkgERR6OcHlu++X4MEQsuBHQgGleR7uHJwdAUigwwBmjXUha/La8rTKrElr/mBsWJIZQrg+A0Knx3Exp8H6eOqMUElYMvgQWzOgsO2SsNxXs2+bHlZ+CCqzNyaohY3I7Ek8ijKQbTeUQJHqPNQSyBvHbmdKQM3nMyx7B8cJaGijrhXM2qkTMb+B4oVr7QVUaHz0ns4CNJn1Mng== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:55 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [iSsHV2ROg+b5lmkv73RKFCQYbf+XtuEy] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f8eb8e1d-4226-4739-3f43-08d97f79a91c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WABH5HaqWURfS7U42LeQvk+QTMerCnuVLifXCvGDj6PGattUK8IQQb+TFhJIBlUX3/oqhcb8C0jW/+Xjsv1idvc0EWSJjOjbIX06YbKmmve8wdQsK1fgLC9kKMTgEH13iIcXZNjGFh9uISXdsLgkq7Kb9Hj5Xqt2Vgp7XA9lD2XCl2dkY+DUilVMmh9s42nOIGuZfI5hKmE3avhSt8aMsFmpPTuV5qwIop5j0FF0dyNBPvcwhp7LNL/oPsYkd3HO3JaA/uNdVGyDT9M/IMLzofEYacbTSnhlqbSyauRaZuexXawFv937dnfYRcivIoUqHu7Cp33OnlM4iCBR5GcapEddV5LV3Gp37/0b+oXTQTEU09xOiLY88/EYmOMvmflhlXoZPD3Nkyb4+CjiwT/nPskEaXjPca5U661XZwZwbTJ2xMIBWuDAS2h/2PtzeNkg3Zk5CXs1FcwJtr1JW5ZLqTTZ0wdqKS3JamZiFb3mgk4zd9iH/Sj1fjkasVSvA4eVO/EEt5hc5PqGaudBXfgUvwmxtzr43Rxa2JIcbBuwAZxXaHp/5/IkKScsXdg/s+WU2Bo4koQIRh8ONo8zzpW0YSZbFLKbAen9XLJsexYC6YkZIMsJpIVtNKy3VlTikJRnf+2c6PTqcFnZfOPFdHXyZoPzIsv7aKlM1Baygm1RLXKn/dGBUkupit6Cyrw3o8BuBgTYAQHr+Al1o= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OxUOAri7osBSpkg6QILnDlQ8MQrIDRo8pdlB/vCBxm1Mdfef09hmUBBdD70DjA6FFuFuWiC+E7k8PRV5fkTEDHFBOPyG5FXdYIbbD72NyMyr/CijPDi05l+7J98x0XXtmg/UzOCCP1DJdP3GYvr0XFW8GrSZFUDj9g36corWlWJ//5xkHO0kLYkB908H6D/2aVBvHP4HD3K6i4xGPVW8NzemAlMf2UjaKcW2t6pXMTDl/zE5K3AyHnVopME05hSnUUHS6XN9STxtIztBom0X7CFTiZZy2J4iJNbEsSz4nBsFhvHoYMfE6vF9pK2uLKmnZybCzI7xqQUGT+NoJLjnMDyUhd6DiwH1UXZ2M1L3/sKW6x1NNIT8m2cdz+IVFt6PHBamlAv3KVMWvFHSRAm8y3kawxtLYn7PQer466ihCDpa9w6jSftWpLrephxJwWbq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6tGCYPGtwB5RCC74KXhfFfgeEK+4YKVqQqA7ndSkJTuYkdvRR9JqqcZ6ldwwl5aGHZiV8Ld8yPwY6bVTXlt2OGDX+FMsg0n12wg5eg3v2FWduW9H4gIghuS2+o2kLtwgyAPpHM6OC/DwXzlG4oSuMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8eb8e1d-4226-4739-3f43-08d97f79a91c X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:55.6498 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/tests/avcodec: Check codec caps for consistency 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: ie7z91vwAsrf Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/avcodec.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index 5512ae99f7..e26315c368 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -19,6 +19,7 @@ #include "libavutil/opt.h" #include "libavcodec/codec.h" #include "libavcodec/codec_desc.h" +#include "libavcodec/internal.h" static const char *get_type_string(enum AVMediaType type) { @@ -78,11 +79,26 @@ int main(void){ if (codec->channel_layouts || codec->sample_fmts || codec->supported_samplerates) ERR("Non-audio codec %s has audio-only fields set\n"); + if (codec->capabilities & (AV_CODEC_CAP_SMALL_LAST_FRAME | + AV_CODEC_CAP_CHANNEL_CONF | + AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) + ERR("Non-audio codec %s has audio-only capabilities set\n"); } if (codec->type != AVMEDIA_TYPE_VIDEO) { if (codec->pix_fmts || codec->supported_framerates) ERR("Non-video codec %s has audio-only fields set\n"); + if (codec->caps_internal & FF_CODEC_CAP_EXPORTS_CROPPING) + ERR("Non-video codec %s exports cropping\n"); } + if (codec->caps_internal & FF_CODEC_CAP_SLICE_THREAD_HAS_MF && + !(codec->capabilities & AV_CODEC_CAP_SLICE_THREADS)) + ERR("Codec %s wants mainfunction despite not being " + "slice-threading capable"); + if (codec->caps_internal & FF_CODEC_CAP_AUTO_THREADS && + !(codec->capabilities & (AV_CODEC_CAP_FRAME_THREADS | + AV_CODEC_CAP_SLICE_THREADS | + AV_CODEC_CAP_OTHER_THREADS))) + ERR("Codec %s has private-only threading support\n"); is_decoder = av_codec_is_decoder(codec); is_encoder = av_codec_is_encoder(codec); @@ -103,6 +119,19 @@ int main(void){ ret = 1; } } + if (codec->caps_internal & (FF_CODEC_CAP_ALLOCATE_PROGRESS | + FF_CODEC_CAP_SETS_PKT_DTS | + FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | + FF_CODEC_CAP_EXPORTS_CROPPING | + FF_CODEC_CAP_SETS_FRAME_PROPS) || + codec->capabilities & (AV_CODEC_CAP_AVOID_PROBING | + AV_CODEC_CAP_CHANNEL_CONF | + AV_CODEC_CAP_DRAW_HORIZ_BAND | + AV_CODEC_CAP_SUBFRAMES)) + ERR("Encoder %s has decoder-only capabilities set\n"); + if (codec->capabilities & AV_CODEC_CAP_FRAME_THREADS && + codec->capabilities & AV_CODEC_CAP_ENCODER_FLUSH) + ERR("Frame-threaded encoder %s claims to support flushing\n"); } else { if (codec->type == AVMEDIA_TYPE_SUBTITLE && !codec->decode) ERR("Subtitle decoder %s does not implement decode callback\n"); @@ -111,6 +140,15 @@ int main(void){ "yet decoder %s has it set\n"); if (!!codec->decode + !!codec->receive_frame != 1) ERR("Decoder %s does not implement exactly one decode API.\n"); + if (codec->capabilities & (AV_CODEC_CAP_SMALL_LAST_FRAME | + AV_CODEC_CAP_VARIABLE_FRAME_SIZE | + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE | + AV_CODEC_CAP_ENCODER_FLUSH)) + ERR("Decoder %s has encoder-only capabilities\n"); + if (codec->caps_internal & FF_CODEC_CAP_ALLOCATE_PROGRESS && + !(codec->capabilities & AV_CODEC_CAP_FRAME_THREADS)) + ERR("Decoder %s wants allocated progress without supporting" + "frame threads\n"); } if (priv_data_size_wrong(codec)) ERR_EXT("Private context of codec %s is impossibly-sized (size %d).", From patchwork Fri Sep 24 16:37:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30561 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1699377iob; Fri, 24 Sep 2021 09:38:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEPh1zLqAM7HkXssP1+sDMdfaYn872bJgQMYGI8/pfKN1Vt5DA751ualMCADV56bCB7MoQ X-Received: by 2002:a17:906:718e:: with SMTP id h14mr11666063ejk.365.1632501527722; Fri, 24 Sep 2021 09:38:47 -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 k2si10031037ejo.293.2021.09.24.09.38.47; Fri, 24 Sep 2021 09:38:47 -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=tFeVkIBp; 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 83F6968A7AD; Fri, 24 Sep 2021 19:38:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070027.outbound.protection.outlook.com [40.92.70.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87E6568A742 for ; Fri, 24 Sep 2021 19:37:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MWV6B/qisqSBCmjOp70iEfUFC5Df4hYMSVhf45eeRVMzdWR8Xue99opBHgVzYpO8LkkksYvFurEWtQDtPwLHyV1BtWPQCu2UqUalAS3bPl57j0eQJJ/gnfuXTtQbtCcIyMeqWA4prUG62Bvz9CsmGyfu7L4Ltw/bylsqKrK4F5Ulv8qOU9Zi9tk19nqp1HgUNrk8LzkVdJFX8NrOt70u8EpfXEuzky9t7GlekK4lImcPfMx+0I0/h7X8hor7aZMnWHOf+JeMq4HIqYlEn5Lj44tq6PttdiBPrmeEQl0SyVm4fobMrfLriH8KghYTB+AiBgvxjh7kY5D24VTt3AL0cg== 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; bh=8v/PjjKiO+FIWiJMQyEB3kK+lBVG3uPmCWVY19umKGg=; b=Pi22OvU1X+Ko6WZsAoG1nK9n7O9aPeWf1mDuGpAPIY2R8umGc9iKcDxA5V6jCCHnNNWfiUM1Nm9gplhKYxcSSbEv/BaYufLMmuGwnHBcZbcgGvKM6qfQogTbYooPwJgLQq9AfO4E4KRAvvckF1jUKVgeK1XOsy5L30CA5xx7VkBguzMkbIsCsuJ4N9KooqmXeyhSGrWERzMILhL1edIF+Z3TI+Wj//a/ZxKwqhULIMR9EMf8yhEc5Hb6P7p1kE6eqFcoTUAnebgr5iVG402dKRam+6+/KO1R5HHmTweXx6pqNSC1N0J4YgbTffDPhY00yRUrlltnDt8Hou5JchnjWg== 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=8v/PjjKiO+FIWiJMQyEB3kK+lBVG3uPmCWVY19umKGg=; b=tFeVkIBpqg+eg7ZwooffIj/Yd7byxYefm1aAaLZPD5G4yKaVs7sIFWo2kQUEvhv+jRa608rB2lqkBLvmKg7bh4AigQnACs6cpgYsSCGnWSLPcr1Zar0FZCY9CQIaMUG9FvQy2CTu+t6vTZns6M3dvfKocF8p0mLrcOmZn4UgNqy4OQsKA+Z8icqrJs5IieC9Zb+jQPTD28WVxAXx2pBPLsW7g93uaBdbQRkOxSpIso+WYtzQUFPJ6k2d+E8Lcq45Jf/HdZxmmI2kTxlqTcdO4rNLVUQk36IA6aYbIGM/unsXz5REg2Rz5kiEtajTRVL8yuKkQBppt3ikHUj0MH7ATQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:58 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:17 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [afWxRZAWLUPJw0OboS5n0JnNbdCaqa9s] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ae698900-e297-4459-765f-08d97f79aa89 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL0L/IA1O2ztnNnL/cAHC6sOGcqf/QSNBWCCA1eWB+sNsr0nwgO2QkmS9RUbKOtRvS7ExdcMqvxGdXjAhCZfLjV8aAHr2Vetvbm5xuq7yic7hOv6kQwFeFvDkVIcMpL5oSDPsrqbuRS2xzbVj/tCyicpd6+juhuOyQP3HPvHtOiTPJ07dBNFQnv1zUBtI/uTKXvb3/fZF5laXQ5+67/WHow9psXYHMdxV6sgodqE9QyB6valTD+OUeFWqTpLt3b5wNuzSDsEiM7U7AoUpRhz26XXiMwjsdZS/MT9wbIAcAADBMuLpP+VjHlSlsAmM6mEIgCIj3ATnaC1hrlMvuXtA4L0N7R5sZRzv1dqRl3Me32p1D/nuAXL04/u13XbPyE0vCkpWcX1xi93FJ4NwoizGXOppDgmzrtgsv6E+CXaHZuQpxs6RdWQdbqg9OnwinGO13WDJ3v9lygiiBtwz3gC3RSHZi9nudZbs6Um3Umyo7+zYEE3oUAcNMCMMifLUyoNgO6slHJeh1ugZPN+imuSJjinP6aF3o0oR9kXCrxo38iBilFgNQxDhTt686fWI3SRzK35dHBotNM4axATGUlluf7pO5dL7544AVc+Pc5BGM+q+mYmNlwPSlNO53X8bJxvEGVDTIxHpGrVRx6qMLBnNgkit78RLi52cQa2/nn9Kf4QMD+e4RE1pB6DpksddsP3TSgR175ZHkF0A== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K0bMSGAttEQFnlg2bunXhYo+IV/NYBU0mGRu95mH9iZWR7PQnK1EXMH+4+uKsEtJn6fF9jWVVu4CU+a7obu55W2rdCmm8EN67Q9pGt9ZsHcNORhqgaDhj2NYlGLCQX1J/aVceZt1QjWiUyJkPSsShwZyLsk2VknjIF59rl5LKdMiv4szKf+JFdYoBx6MEXph84A6bCLZ2USP74UqXuYhm914t30wuho4hcy6ahlMibCoPYe5GSOA5+Rc4Z9sy8IQEFxtFVnpPhsFcKaETh3OuQ8ii3xpqOInE2un5ewZxh5g6Qw7QwF9wPNpE6JkEeScHZNqOym20m+bHmE5dHzJVyYTD7d3rhlOMshTW5yxgl3sxICXHKohkjoOvpzu8EGMee7IZgCUKrA/azoplYYa/oMAgqVeopp5oihLXGbnQH3JZSkHwAJmxQhMyoTlNfWv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SpQ2G3NIinSS7Y+/380kzu1tt1iis6Tsxr2xIPZmWF6GPo184CH6UdARhf7LqnWz03vVV8kmf6G1Lkr/0dVh/6dJczOrXNF1BueVlX+q+pBHmbp7U/mrTZY5N6W2KgEme0tlcsrJwjytPi6Bip/ECA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae698900-e297-4459-765f-08d97f79aa89 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:58.0592 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 09/11] avcodec/avcodec: Remove redundant assert 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: X48X3F+rpfaD It is now checked by FATE that no encoder capable of flushing uses frame threads, so this now redundant runtime check can be removed. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 97eb1ec431..5d85ed234b 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -390,9 +390,6 @@ void avcodec_flush_buffers(AVCodecContext *avctx) "that doesn't support it\n"); return; } - - // We haven't implemented flushing for frame-threaded encoders. - av_assert0(!(caps & AV_CODEC_CAP_FRAME_THREADS)); } avci->draining = 0; From patchwork Fri Sep 24 16:37:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1699533iob; Fri, 24 Sep 2021 09:38:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGAjcNcJviK4KnSo2wWYpjd9rSS5QazTEzlcLuHK4jTJn1tLB1jFpCR7Zq03gi+VmhsQXz X-Received: by 2002:a17:906:6547:: with SMTP id u7mr12186329ejn.544.1632501537475; Fri, 24 Sep 2021 09:38:57 -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 v2si10022820ejv.739.2021.09.24.09.38.57; Fri, 24 Sep 2021 09:38:57 -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=UIddT1dP; 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 6AF0D68A7C2; Fri, 24 Sep 2021 19:38:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071017.outbound.protection.outlook.com [40.92.71.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC19968A79C for ; Fri, 24 Sep 2021 19:38:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cVtTywzXo2k21CwcSHKagPlnjTQQBAgaHn7yi4YJ6UmHNt2Sy90k/zwCGP3+D261wf7JQfNz0moeLNm2v65kdXdjyCoFTd9zqjs3cN9OcZiozO0LP1+7uNYqRiAZODDXJTgq3LgP2VL7Rok7lOsnnglCgbBM0kAQBva7b3ccs4fBt9iKZfqXI9ZlGAtsoZ6P5DRFIn+kglz6i8Chkkr4HQG/p/vlq1C5jTv9lHb0P3CWSsRuSAbKQkgZjoTUAb7LDMVC6VmghaBAj/9ZNHiKBXXBh1qrZo4NAq+1R5WyTL+f+l8vKcLsuaEtCltgUTUq/klQjKgp7MBYvrlK+bNHwQ== 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; bh=6E6UCfvTwAQ+LQ3zzcg1tbK5gyTnHu2vzORypd7aF9Y=; b=Nh1BoKwaHhdTsp9+AWuHQud10Q6gUcpTVFVD2Zdvq/4G06O6MGjN+5u3qfikxtgWaHt8ZiYbk/+i8+zl9DJRBPbo6ybYwAlBR/pxSrHV4tle+488nP3IB66YmjO09kSjNI+zIxAECdv0d5bUfiS4LgfCAmgAaUgpxheToaoDzQKBKm0fgeYjNqQi6oj1IHvSMLndtu+XFKCQQr+giWABdprbb18B9MhYHd3qmsRno26G4Ssyveig8ifN+Cf7+ldN/CL3dtODtGjiUYgSZj+DnukwGdJ/d8+hfEN0OjQfNbyIu/h93Y+yCnrjls2bhR4wB1Ro+gX6y+iMiN7QuZHtkw== 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=6E6UCfvTwAQ+LQ3zzcg1tbK5gyTnHu2vzORypd7aF9Y=; b=UIddT1dP3nOUJOrO9C5UAhaSaZhja5KWUtf9M1TWE8/TACbrbB+8VUmLQL3K3C6iULmifOieRuVRHu1mXhfmEmK/rNJ4l8VpoWPBkE+IaYz2dwHbIm/DnWlOdQH7qFRZ0gRORdcIl4O8F9LsXMpYeyCube4cOFz1QbVnMtBncaEq4mKyo68MMq5HqThtjAixNk//QI+GERt6242tjtDBNEsLK0D/osMsmNSSvWKYbFVW/Qnt3iNrlOZaY7+xHDVcxQZ+mnQ77c7zn1i727TtAKQAVxEK+18mtE3t3gVH/fcWEfIEs6XJyt7mnCKHZhzKGdPOkqfnJBgOZ1FSyINCmw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:38:00 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:38:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [cZThDPANB1CrKK9/57ZuUVrY4eBshejb] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:38:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e3b9367-a772-40cd-7aa0-08d97f79ac12 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WACm0S28irvxy4XNN9g0Yr6EgG5x9mKGupYYFWvD1odeUVNSypej96Wbd1ok5OGcjLscnpmOvGVrVAVzydq9+wkZUnxZ/mwcM7vdIgIyTNpiaaV4T+s3lcIw3A5cQNB6kNDjDv0vIMvQDPdIILU2lDwc9G85BXapfor+b6wttmD6vsxgbEmZm/KA/n1RUkl258N/Omt8L2mS7hljqvkTWh3LnKt+A/RWQekI8lZNxz97AeaywAr7GDeB8X6WcBjU3qCKMFLKg3mp+9XKf1vYo7dNQ8gShgBn7ZzRBs0d+1pw4+OQJAKKZIq88tvU9JgSE6nDw44Yl8GfGM9EcZKleEzG5yjxyCtN4DlGbtHqYKwd3dZYhzQ7AHDifp+OSNBCRd7+0CvlyJa79pLyRhSvO9vil7tfq46Qk6JK1sOrX/GUN1zdlY/w6boZqL85B3c0r9LUY2D0JOXGrqnnMw7jM6AQ182anApY7DqLiJCLloCpqNaaaadQa9kt+bwqDAeakTqJcx1xkRC17JLJEpvQrQF7HkU8UK3lKPAS852u6v1crauBbk1mu1Uw/tXOJas45LPrhsatZDxIMYu+2t/10XCM4PZ4Zk9z0CVeIvPS3P/tcZN7d5Y4ZIZPGabKFMMJ6YLrlMjDzvjyzTEDdlnwbKUSsmL4sZYOTYQZCh0RyVimjZjy4WSgLaUVuqatScICfuQGjJH4VHFd0= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4kDAMsvzTPGtHgITKw4ULfxS9k9xdrNLMxCNie5qkVkejy/HczIvoZjWbSI63m03I8yMM5HPXZA10RhetnpZxUqaYN4q5vXwYJ07OPEgWyNqQX736/0DE1ICEiYbP6Zj1+sadyUJXVTbDoS9dYezm7APZX6AL79sE+VuGptOz9MX9yxlLw4vcsUZsFz2fyHm8mfjezsqAExr02RUlBlrWjn5tDPvRJ15Ge8vXS1rBbsId926nWofA5aP6fuzpdPBSw+B38aLmPyZ7miUn5iLRRGdfCyyRTWAX6FS9KGmv2LwU0QJeceNsbFju4IPeSj9vid45HHYLwfFFivY8myr9kaoR31298s/U3M6nftbe/LMLRe9qUx0sGkCM4pYOHpyAlJ3gqoss+HhqTZNcoLK1bjhHpcYE4iIbXLTGzJE+ksifWHE7FdQdGLFAE6il526 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YWNM/OG+7ftOiI48YiamM4wfNEsSIld/VthSj0GHGiRUnDS6Kzkw4++O39rYJnd4+CohJ9QH4XIOF1R57NXlhoU6kIMPFhHGaT6ezxVboxTgWqEWUP8FsDAjiatyJVJRq1aYH9Oe5m6GplaTG01osQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e3b9367-a772-40cd-7aa0-08d97f79ac12 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:38:00.6339 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 10/11] avcodec/avcodec: Simplify check for flushing of bsf 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: I8mDknVQZUpH Just check for the existence of the bsf. This is equivalent to the old criterion of the AVCodecContext being a decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 5d85ed234b..ff3d73e237 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -418,7 +418,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx) avctx->pts_correction_last_pts = avctx->pts_correction_last_dts = INT64_MIN; - if (av_codec_is_decoder(avctx->codec)) + if (avci->bsf) av_bsf_flush(avci->bsf); } From patchwork Fri Sep 24 16:37:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30563 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1699716iob; Fri, 24 Sep 2021 09:39:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPuc1LaW09OnK2fyzpp5zwK8gDTBCYQe7S3c7yFM4d1RMY17qo8Y2fTyVmVOfmSRoPSRcF X-Received: by 2002:a17:906:8a41:: with SMTP id gx1mr12733314ejc.507.1632501547414; Fri, 24 Sep 2021 09:39:07 -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 mc5si9595042ejb.224.2021.09.24.09.39.07; Fri, 24 Sep 2021 09:39:07 -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=ETdHW1M3; 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 58B3368A787; Fri, 24 Sep 2021 19:38:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071017.outbound.protection.outlook.com [40.92.71.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 177D368A7A1 for ; Fri, 24 Sep 2021 19:38:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a42/ElmHsxQmdPu3vm+UxmYhiyjuLFtZPVmrKaYrUO+YehIWsPWQ1UotWJ/IOFVXZic20tIGv8UJq6eiGGy/YnBgHxSjo582JKNfVmwZcEQNbIww2vumxxUr8XJZFZsuxgv6cQwSiQtVt37AzdhyGdiYRRxsGHnO6pQDI7l1bgvkY9n0XtO1plsjr7zvsl4DO/Ud+PreLUxWDe1HskGjrebhZVLJKXAfQ03HpaZhSPi9bDwHCXvtBeAEHRHtGCjSvjV9sLw2iH0vezOvAaljIaPjKSwp7h7Yza9QqHZawAvdhQKAs7/MZjnbyxqwzd+Rs1W9Sh66UsKZrox9TKun3g== 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; bh=R0TZJcw2CmDbiWX0gTdxpVdJHgEH00quY3qys5dVoqc=; b=HtJ0GK6XQ+5pZVBUAsxkRZt+KnMTJzTmA/ohtMFSxXtNA3APi0kdZEX4Q4UKWtkMPP7b8xqh4ya+TUQfy6pmXuXvU1g2Qs01Y9bUrg0fiePf6V5XUrjY4bWoZc64nuJxUvgxvbFxbQraL4esefFqCv0UHqzi2EHZkaaTE0jdnroGoS/zHP9w1F1wtnEQaLRZLo8PKjaMRHFaZOaq/pVW+b0LCzmpKSNia8KjCfiND1509Z6U8cmfKpGzsRWAR0NVDJDgpM8Xazh6yeL+TuS9yRg1tyf9K/psFPLdEqGcsl0Rn5VYh9wJa0DCVYJkdjDaE6eJaSwbADMAUpCVI+0qzA== 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=R0TZJcw2CmDbiWX0gTdxpVdJHgEH00quY3qys5dVoqc=; b=ETdHW1M3UiEI95LJjPN4aqf4z3JMbf3ltWUTPGHqQcGsHhvmha8UEMcAusNp4I+I4XpLN7/i/DY4piHx+/Z8ROclLp3B+JmMgF+JxBz5FwvCv0bVm82PkAe9dOjWc7Qs/3qk3tXFunE2pzHX+cMYOunv9dO2A8cjr3u3roaLgFWvxnrxGjCbp2Y7hlwV0Iwgg7pKSV1j/dECsKnGvo4MTV97EFOf47Qb9ve3Y+VKRVD29wJkTTO2bHX5bua1ldFfAhgPqp31u2Up2diWkuRa6eo552zopfuy++HcgtwNC8vjduIVJgABKX4Ww4IB/SPwLJifIEmJUhDZq3UmuW8wxA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:38:02 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:38:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [IH9T2Ykg0HRIWtN4YwkXcbSdiJVnAP0Q] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:38:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 781150ac-404c-4486-4bfb-08d97f79ad01 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WAB81bYgL8RlN2pK+tfZ5MXyQrptKZ0WhwNFwNALmFATFvN9sGGVXRAUH/xcsicI7qQb4OUQpd+NmyRfQWdLZ1tUk0Et2FgimJYBajsnIZmT5heu2nYDkJ/WDhKnmCXYZZcRzNIufJ+uHtKm59XQJ2z5EAC8/nJokkvYf9zoHctKudsyyOrpvCEKtF2AYcR8z3pP76XjQI/+PvQqlLvj2YQYki1lCJaTAC8JwvxHZ2FNrUFYVDN75Rgpq+Cmw+4m4zW/LONQz5/Qm4vc+NO2ta23BXVtR/8fCRTm7tn09XvRxv6ZmzpcrRNIdXI6qDD+yyRrWwBd//3SsRDAO4lAxnfsOv2x4yskQyIvfMIXPjrFsIkVRZRVb5xZJA5TJNmppUmTnw0FKosfNhcfZn1N3Y7z05hSI/e+XT+gxsXE5AocdRGpYENh0Rvw8S0kZpfi4F1kjFjnE3vD1hI0IJA/WOQM7jwpCwIFkfOYIrlYWGS/0BsLQmyLJjUxbxL4JnQ7ewGhMvn4Hz99ORWEKFW7uhCXKf3mEAD6RHJpZCf2fhjaY2ECiGvcAxRO1EMcVfVllbo3SZ70FWeGWK2c0dgI6UbSO+3f+6PtOvBRdRdtrnCPiuJugb885b+cMRjFEo0N0Kpsu1p384LSESTz0xSMYYmwxRysmUYZ/LZqhR15RMaiPgjYxXSsUx4EJf8dEJlW68qnBW63OhxZo= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4s9UZHXYGDhxDGqcYNpLy6kc7tlDdokn8ntGMiMD6LbIwhYdpMtKV96nKt5XYMFCMdEmGDBYZMb0Y3/z30pXs3f4bzshHuaqAaSCGLE7fs8N8hD2/7sTFNMbyZr+WtUKk91wbjFG5bKcr8uugmjVzorckPmvgG0eohtrJ23pM2LjGY1cTiFwucVzyhP02zd3BGXEXXGdJ+99f2nYXHiImKjBirKn6nN/568OfODRkFU4mj5XM3XPrjhWPCvgVwPfIU54W+yosVjEbGB8Wa6XwG4rxQgS9IoLqLhT6JNStSn0cJG3R10tjVPqyPt2/dElUI+Scylnp2CJtUjYFENqD9DbHh8wbApfhLlbPcOX5+LSn8oaqnj+FOJVKueCoSvdzPPC4YtQDbAJtkBbCGsvQpzVwNcTRYzzWdcAD6ex6xBh04C8pSyIwRNFiX2y7Tpi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yZeruLlLvF5Olbc3M/wZm/kOSzme+1ZGdb6k+8S7ev5KdsGx/e9ws4FUC8yVnDQ9EDkwMgnHJirITEniyHH4H2s7V4UN0gWVswO1Q2Qjr6IYEfcgd3bCKrJs77vvT1ftKQ1gEa1zILgxvYVgrdGfjQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 781150ac-404c-4486-4bfb-08d97f79ad01 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:38:02.2000 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 11/11] avcodec/internal: Update AVCodecInternal.is_copy documentation 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: nPsmaHWYhx/I Forgotten in 1f4cf92cfbd3accbae582ac63126ed5570ddfd37. Signed-off-by: Andreas Rheinhardt --- libavcodec/internal.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index dc60e4bf08..2111f2b9ae 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -122,10 +122,8 @@ typedef struct EncodeSimpleContext { typedef struct AVCodecInternal { /** - * Whether the parent AVCodecContext is a copy of the context which had - * init() called on it. - * This is used by multithreading - shared tables and picture pointers - * should be freed from the original context only. + * When using frame-threaded decoding, this field is set for the first + * worker thread (e.g. to decode extradata just once). */ int is_copy;