From patchwork Tue Nov 9 18:01:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31357 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1495736iob; Tue, 9 Nov 2021 10:04:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7/hkMepZjMkrfbdjLQP/BsMyzAANBjDlOkdvGzn6dlTzxJl/S4bcGRLSmsF+LAMayprV2 X-Received: by 2002:aa7:c693:: with SMTP id n19mr12527803edq.101.1636481087811; Tue, 09 Nov 2021 10:04:47 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bd9si33096667edb.629.2021.11.09.10.04.47; Tue, 09 Nov 2021 10:04:47 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Fp70UkhV; 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 4A3D268AACC; Tue, 9 Nov 2021 20:03:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073100.outbound.protection.outlook.com [40.92.73.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87FD868AA82 for ; Tue, 9 Nov 2021 20:02:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LoVahWcL/peiV6q08Gpq12Zf19E/yxlX8VRRiZlTi7zS5gRMVepVzGRPYKzRC65ep8+NkJJdgjKg+IEMo5ub7qY02DtA00Y7u5iJunvGRuisowd6ZoWnMQWdNf1E7rEZRaqfrslmA6trabMhO2RlgPAMgFaYQBMkEiIX1plwp1DTswlm/stXfFMcjHi/ZS59uwKdOagr/sITFUCCQJpqNBCZdKTWEDbalSt6WC2b6b7tCJuNGmXHz9n05eKKcswCqiOFzCeYDx4rdCH6ZVSDdHHF1UGH3cLzy46vMoqbDizBKWEoVBYKuZv9Kd3YSfLd0nezMazqSvOMZB/DMIz1Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JWIqHyteqm/XZThXy3wAWcX0V2NcejrFtk7gvS52nQo=; b=CHgxmvFpbo8Sg+JFBf4XZvHrJq78krXgJewfklBGt632gzIWMDuZRp8ZQnbTHS4FfIwTa1cB1ArfCmiKUnr2HmIEWrOOEig3lQFdquXHOUKjz+ZHIOAu7X4lWljT7Gnki2ZROagWTQmekGpb8XyM4afdLPaQBV1L3akoud27+cZxB91tsWOuUkTpJ6VxymQ3OXbJmlQVKGVJqbZulQocrE43h9+J145SoXPeusmMt8EkxRTXLleIYWpVMfYJ4emX2h/sDqS03EIBJpoACVB1XQdGgcUTJ+Cpx7iFr62WWRhEhK+CLOwK3GtqGyZzxfZIRPrUaYcB6rS8uFowvIK0Wg== 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=JWIqHyteqm/XZThXy3wAWcX0V2NcejrFtk7gvS52nQo=; b=Fp70UkhVeqwlcyeGBzZZd5cXVMzHYE5rqW1al6AmoLFP7AhwTzimiVm0YepLm6+MjpCX6K711wDIlev8MmAUKvJWbM3geB1AvFb6wN0y9mm6I/og6h+jXtKu1xu8WGoPhMPEdl+zsk81IZYbiidX9xB/K05xeLCNYD6YMheHf+z6RAnaZiC3coG9O0XqXOuioIjeoA6m8nv/JIvfGlS0XLANfAB7hZ8EbzFvBR1lyOII2k1TGT91/mzraWUI0wnGZL0jcGSt3n6iZ2OXZ2Xiy5iWp1fP1MzOZh8yzS+kbJI98qjO9/OnQseegicQ/YKEzviECrpNsUxukSdP++oEFQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:57 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 18:02:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:52 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [78+CU5RI4bh2Abp9TmVsFLinJOp6db3a] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 198b42a8-c923-46fe-9e1e-08d9a3ab2947 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SydSUgiaNuKQmUtYmV44N9sN7R537TZf//2m/t39+TlRujlGiqMPFDUtgGhU2ZlQhU9nynGMyUQ9lQ0Ub8W7Sbq4JHxbRShRBVLoR1n8tWywv1o2ycFCOqvJnQ1zXbArfceKd81gErgNAZ6V/t+IXFXgfGnGHLl9mByXXKadKcIwgiBtXtsqIBOHx/0Rdhq81HY5KjHP8ScO8i0/S0nCyRvHuanYd/VcGF/wqxVifyo8V03/01CgWENF864leXXLzGkG3PcYYfNkrU7NUW1R6fxXAOlxiN4WqM6jxBcCmSRG0UL4pUeYk34hCn5X24RODVc/73pqvRZVzZeWvp6NrnOVsagKOWmtOUyZD86PPkvYh9/6eKw1/nmZzsT85Kkxf+VmIzASfGl1ZWDhYRv8euOtdrvWI8hRDX4YAQNjAr9r1kWDMD5rsXvN1cmgSlcpOAuKdU6mhZifpyhef9xRyXKdrt5L1NhZdcrG01QituVjt7NzmwuOGxrdpElxK+dBfhnNY699/XWeJm5LmjyAXTJf4gxnxo6AyHXq30b1FYLfNkQ5XIQBLQX4PvE24/RkLc84TJdrSVWDN2mJ0oZ2fnjX7/tyo/nOU5dv5BzmZReJFbpDvn0ZlDgdjQp+MNYgXZ/m8ao+VEyjnZg3RcXhV+DAo5+qBoyGahJgjtzX/HvM5Fg/rle+ODG/F+U1joOi9xJTXFVY+P0nKOJNpVh8yDk8broZHcHmg3EJh70EW8Aew= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lC0sPI5fqzzZQl3aOkxXaAVDBSvtUifP50iRFmaNhgEz0tBQ+wyO3MugzrVMDXBZOTHxbuz7A9o4QbbKZ+nNcykmqozjxL3CJ77EAllffBENVe98weDl3yJ+a1XuhJafBwiqmeli28FbXxl+9POoSZFmsxTzwHRZxDGOEiDjJsX25AbECnR/eJylS1sht8CepzF6p4O83WOPPf6nj8Dd1Y7ZcJtCESyeQ3NfLlLbhLuuWCa1jU6z3Hg5jhBgD9Lm+Opl/b/g2fBDagxe5zuiKpfVFUtMuCka6wFSAGGFpDkeLHe40xnmZiKC3EBi3Md0bXsTK8y4OOSRla17Z98E452vYyeAjdteUyQfdBZukjR7adQXcUMvTbGAzGL/EgaSsUgxR0njsPovFf5bjhLf/oaonjF0Hs+j63nzCOmyccSBUruC6ULnD0LxaAH0mmiWlKHQdnqZRlW1ba7KUX9m3mamRTM1CWXD1S2Yc3IUjTk/6LiE1MbpWloRLdiHxMYZovGKBMxI5fmjuUnZ7L1HAYBjfQdnaHn3McsKcYG7z/o= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G2eWG2XNSKQp1L38MkpWfJCg1PE3r6cWiAh0+DClR6C4BI3Ce14JlGK1J+kkMakMDnBZxvRtgD4t0U4tfgfgvRXvZ1K2xLpW9SK0E1Czb7Z2tIUGiPpwovqUtnQyPp2nZEdSQKtgS2Er0gAqto182k8Mq/nfjYdo5au8U+uoOMTkP6+KRITJVEyd3z9bfIeQVmeTt088NhRovZo81pHkYeDFNjPAUN4WqDF1lwCo2ctpnbFAx20TOXK6DEtFGVleBCNKJdtLgVEGoD26YAC8W/dBUWxbENouplfEiBL/VxD2C21fdjLX5nvTxSaysHQUlP3ZDvqRWx8/AF+SOwluMC4/Z6Ew/0mYSm7UwHT9i+H44E+/toKuK2gyUEybk8mSq/SMtGv82OL8DOF3du08xrp+LcrnEw+WVVDZ+jLPnxiaWM+bDx26XO7VA/bIX4YJTSog8ZZ/wxUsDGNpujFXT7wG3sOEBJnDVjmELBrgtyXpXitkd0zZ6T9iPzT9LDqKU38APhUcYwoFNhYTtsrsjI+f4CCuAjqluHBWy8H3jtIt3Q2gcGkXiJHfpF5rocL5X9n0weaYO3InXI2UJYJj60PMK3ULGKuQ6jaEzxAjeHZRookchTY0sNrKriIrbKNT5prQS/v+SuCns/TaS8DAMADPrd3WTHj/UUf9SkxFeQm7hq8Cj3DN5se06BUpRyD90NtPV/uRyzRf9zPoA2wFDg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 198b42a8-c923-46fe-9e1e-08d9a3ab2947 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:57.8901 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 14/17] avcodec/dnxhddata: Unavpriv dnxhd_get_(hr_|)_frame_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: LhDxFiJFNDX3 It is no longer used in libavformat. Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhd_parser.c | 4 ++-- libavcodec/dnxhddata.c | 4 ++-- libavcodec/dnxhddata.h | 4 ++-- libavcodec/dnxhdenc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 4ba619c9bb..631ac83860 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -73,9 +73,9 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, if (cid <= 0) continue; - remaining = avpriv_dnxhd_get_frame_size(cid); + remaining = ff_dnxhd_get_frame_size(cid); if (remaining <= 0) { - remaining = avpriv_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); + remaining = ff_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); if (remaining <= 0) continue; } diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index e3b260f328..cb3d4a4c72 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -1083,7 +1083,7 @@ const CIDEntry *ff_dnxhd_get_cid_table(int cid) return NULL; } -int avpriv_dnxhd_get_frame_size(int cid) +int ff_dnxhd_get_frame_size(int cid) { const CIDEntry *entry = ff_dnxhd_get_cid_table(cid); if (!entry) @@ -1091,7 +1091,7 @@ int avpriv_dnxhd_get_frame_size(int cid) return entry->frame_size; } -int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h) +int ff_dnxhd_get_hr_frame_size(int cid, int w, int h) { const CIDEntry *entry = ff_dnxhd_get_cid_table(cid); int result; diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index ecb1cd0b2d..861faca4ca 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -88,7 +88,7 @@ static av_always_inline uint64_t ff_dnxhd_parse_header_prefix(const uint8_t *buf return ff_dnxhd_check_header_prefix(prefix); } -int avpriv_dnxhd_get_frame_size(int cid); -int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h); +int ff_dnxhd_get_frame_size(int cid); +int ff_dnxhd_get_hr_frame_size(int cid, int w, int h); #endif /* AVCODEC_DNXHDDATA_H */ diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index ebfb85341d..ca67964330 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -463,7 +463,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->m.mb_num = ctx->m.mb_height * ctx->m.mb_width; if (ctx->cid_table->frame_size == DNXHD_VARIABLE) { - ctx->frame_size = avpriv_dnxhd_get_hr_frame_size(ctx->cid, + ctx->frame_size = ff_dnxhd_get_hr_frame_size(ctx->cid, avctx->width, avctx->height); av_assert0(ctx->frame_size >= 0); ctx->coding_unit_size = ctx->frame_size;