From patchwork Thu Aug 25 16:33:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37488 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp459410pzh; Thu, 25 Aug 2022 09:51:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR4+5aySh4grGc7hnVDBNW+3a+4iLsVVWKnh/t4+1vhfI37KifDY7Ky9l476lq7TknDhZ9Em X-Received: by 2002:a17:907:a06c:b0:73d:a12c:754 with SMTP id ia12-20020a170907a06c00b0073da12c0754mr3024378ejc.110.1661446286909; Thu, 25 Aug 2022 09:51:26 -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 nb30-20020a1709071c9e00b00732fd03ab1fsi4402806ejc.492.2022.08.25.09.51.26; Thu, 25 Aug 2022 09:51:26 -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=oLe4OmiF; 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 56BDD68B680; Thu, 25 Aug 2022 19:51:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2068.outbound.protection.outlook.com [40.92.89.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70F0768B378 for ; Thu, 25 Aug 2022 19:51:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AlqZFJdimscaG2pm7BIP39w2jm1BJ0qZCf4w0d+amjxXjjHejGGjFsoiJaM7JA4xW/sRPsPl3gT2tQDsjZ/fwBPvXDoMcnbS6XbQccd2gC0LI5lpwMbhtyV0tGjgfmR1AFxweT+11SvQQtnbCfjH5Om1t/1m1HHGFAPS8Ikh3c9YhA+n7T8yct30u1RQxwVwqKnO+nE8qG5ESdrsol68b4z6F7XzxXkcePeCES4C+DPZzjStkFHlL2LL6PvT6iCkb4mFQkqWVDgIKcmdPO6pVUwkX3c5XWSLgxu5pfVHRC8szAQGiucvVRl1MDEe+RqcHfZZXw4cjslK905QPeqfWQ== 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=JY6EdybPkrLnrmYvQUuG2nPHI7pKFS+3h4ItAMx5RX8=; b=RhOb63s1mfb+u+uLzmPtGmXS3l0K3aXCjtf66OfMqLoaF4tw1oVQbByF14J8S0Ywao6FPvqxEtNENbzPC2/PAHuPWGiVeWKkQAl+KdI+oKL/XS0/CYPwE7SG9m1KR5IbhhCd3emgPt6meOhFsp4qHLS2Atne0todL+/QZVUEiPri8S9KC4PydAOLgQI/iVwEG0IhMinbalXZixVDevOoxugb8GZXpwQG/s8DVLMe4wv9AUVsEUEgRTy+wYNfHsc5pM6LrNR/uHrC924UNVyUsIc4UdVX88KxEqDhhRmhJ6DhhCV3pwVW1bbfb0TtXYWoeqMEvrRQgbsEm+CnMgsatw== 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=JY6EdybPkrLnrmYvQUuG2nPHI7pKFS+3h4ItAMx5RX8=; b=oLe4OmiF0VF7nB/6HhOSdxdFfToXLhId4r74pEiiTVOy+3KGo73ci+5wwN8C/ZOxqxxNXuNw3t6ZKEQyn6iKKI1cR7AvvVljPM6ktcguy1SUJ7rbbBmDQdiv3u3fLiCobzItSKQxMkobT09ExftkCF4z15P4HNRxzdiJ/tSpDwkZpJ4jzxOuWxZQqiVBHD7U3iqkV24MrQDRSjcyrsECJt6hQuAvr3E1ZA5PUbe0M/7BaJGOuzhc3iyu6DU7IT66JNGtCTOJ9JBsB7oBJ+hLzQQh2FU1l+3B43Hgham4QMYKYoEMomAccVzTte5B68VCjwizZVTqQy+zdoWtwR3GxQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PR3PR01MB7017.eurprd01.prod.exchangelabs.com (2603:10a6:102:79::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Thu, 25 Aug 2022 16:35:37 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Thu, 25 Aug 2022 16:35:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2022 18:33:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [3PNnzDpbqTcTtgscXlY00ni+D2b5rLnG] X-ClientProxiedBy: ZR0P278CA0051.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::20) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220825163400.420541-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28e83241-576e-4aa0-5cca-08da86b7d716 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UImNawVT7mOnYqU2GyR7YVu0mYUxVVRw7MZL4daFSRdQ13h4l1sYlZsEYVv1fGOBkdxOIXqK6fHoxfk05w76TfyRrqqYd/PE2lrYLlXRR8bGyQQVeLN+/5Ho4R+8/C26bK9Yfa3lmuIOC+3JrFlFRqmdGDRfI3+YwlqTBGaRzxz96GWaJZwS7vaYbKngUOQqXR9k6n3Qjm4W2acUeUljbrPEeaPBedKBejH7dSV+OV8z2ZxAcTs37tg05dUwPDrMWk/98+NyedPfuQ5VvrWPEiOfBDaYCxd2zdYl15cX+Zstcz/rTlMMgLg1QFK78RTjfDNiC1BPNRUTKX/eybDc0hfbUTpCTtMqXQA5L42e6dfnxcX4Oo81fj7T4j96x8HqbNlWF8w1J79qFKQhmdTao06OqTjdE0LvC+dQQmJbvD/iuRArcM4NM5/0qRilwgXJxTOFrc2ob+AJMzdU4nlcHNA/fTf6rUgqmnvbp+5RfQiqacIgeoi1Afx+u3D8IjS4C6EHYaYvJkGwM75CZjT5Y7fPbOSqdhVGfc0mllKs4VeT9hbh/UbFDvk1qBtDw8kuOhVSQr3QQccn629YvWnAiUBzs4/MHpRjbo2DmFGqVlk44kpU45E0aTWthX9YPx+t508fGSIVm21h5clI+JU0vr8Vo+3RzEgGXE/XvaZbLtbuWT+rFl74JfNiMcQuAJbHf3xSJX0eSKDCg== X-MS-TrafficTypeDiagnostic: PR3PR01MB7017:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LJPfTqJdM30NG4p5ixp2/iAvAU9ZU9wJuNJ5hNBLcCTZ5OEsfHcuV0gZUbROFSzL2AvFkRN6tgA2Ivq3eBsNf0obVsgS3ltyZ7y0PER+jVphg9q2Q2DczBh0F1qZfeQ11L+sCmtXAIg8c0GZFpvDZZ8eym01NFpeHW0wdj+kyisTyU1tG96v9xengyE3B+jg88QdFSR62l05xDUFMqUQTruBvmwnZYm29zy6YVIuLU5cagRbP9Pa5f09cz4J+2RKppTCytjaqjPNjY5lmDhFqtMSlSi3P/eNrQfCOkiNXjR/ZW9l8ZSiTF44mNkvA36+KaLaLyIrp9eGm6KlMEmzvy+l25cUPE0UsVCCv9reKtoLN4hIv3oWyVvhOiBRELOSSuo5WgtAaNcnXXVz4AuxsbokCiEdh9y7T44A4w3skKcbPxs9HlaN6CnjzuvFv0i6yCvkKQdpM5HMsyBeZSEsqX/3V21cthcAn2Tddtunt5zyoVREhqIY3b3Ldwb7FeUGp+zvU6UGRk9pk1cGgSl/b3NweROJMXDv2V7DhVGx2+R9GMnVPbrTk14uMe3WmT7/k36tImKazKpz4l5GSmwhTQIRfa8DB3ObCSup/fdO7knYa5NxtlV7JO7gd7iz+phsYkGt3IkCWmNrh4BHe0/9Sg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SrYyDaxRdwB+gDqgRjQvssFqNRKIcewZx8SRebzSs7nOgPu3z4lx/RZ7+JUxWRqRPJ7NUUjylsFRI3nzggWphkfwki+on3lSzTD5ax7VqDuroMr4VFJQf7otuHikIZ8/3XwKsf8iamNkRMlGqA0VSDEul7+we19kFB9JzAti3BtpIwZ3jChVQiDkzDgw/zCiatabxkO7YSWvsFpyVD1pOiNOiHKiHMrO4Z8X+fpSCgUC4XJxkvmFl8hgdWlOuZOTakTRP2Bhn0gfTWixdOxdMPgmIio2UtNP48eWxHu0vX54+fV7EuD/MLzcKbk6R3Uw0he21790898zDQ3k/e6hmwmzyn6b1X/tOpbedjpmzKCvKLz/1ah8/mY/2UBUvaBCod5DfHW+D9j3YkFB/E1U+J8QZbriGhFZ4yVvXZIQV0hYGchFmEclh8e5Lirsdt3QM1HaIiTpIx9J5Qvq8jO73iCcp7FQ7AGANOHUcT6N9gn684p747krrp0o98r0NshJilGbhSQQuc1sNp0lhW5n89mrQO7KCVJQx+3sx65suT02hKE7tioskb1lo8AOQERtfzgxwuzB/eMiSwGwzGIvzmI0gdd/NSbT8tau9AV500IAA/AzGiI755pwtz7yCD/OBYhqY8Mpsm+ZxP0zQovEAud6wTcfWH3ZTS8N9XdqipYxThcUGMZxn7I1ZplelEXBx4INc/gfEYdGAp8UFxY33mlFqpeIj4zLzJYOlbemH+tyi6d9zF2xNwee1msd/zFO3Dw/2UzQHAU/uYPpNYUjsM/xcAyACFPhjc4vxhQWVwho+lwxz4Fuz8dBgfvXadT35HD9LNF9ZZkoawkZ/wmrliEtsuzls9/jC5fKQhALazI2QOL3/+j8TtkK6rPTMMG/xzLo+FKjVW7/efx77hkwid6kUz7faj+wfci4zVw62yyG0X5Y/CEkKYVufX5Ei2VY/Nt/dou2cHMMoKNM67J5V71NE6pB4V4OFwFV/G8ig393t320u6P8qCV5+cjWOOBN2Uj9eB5b+uvV8SsyF5+ZeYkpLr8+tWwaSnNV7rv+GlNll/MIlbBa/7NaOq6gCricprgPIEm7sYQZQR1SfGrJEyNg/J8popgCHrmu8pscvibA2IlyJVqponcs7AuOjiGfK/3fJw7VvhPBTiArv2z2YpE68t86eqVDnY5qFOE4S9Eo7uQO2r2mPYFW+l+VZXRgYRADKXIHThptMjqCZ3q4w+8v7X6zvb6I8y0xaY935qIZzyusd6gOgIFbl6K5CPt1SpN97H8Z8TZbzkeE7rs+JYLlGu8zjazdEz3LnBMroKM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28e83241-576e-4aa0-5cca-08da86b7d716 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2022 16:35:37.4706 (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: PR3PR01MB7017 Subject: [FFmpeg-devel] [PATCH 16/21] avcodec/internal: Move ff_set_sar() to decode.h 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: PHk4B2cbRC2D Only used by decoders, as the SAR has to be set by the user when encoding. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 1 + libavcodec/decode.h | 6 ++++++ libavcodec/dvdec.c | 1 + libavcodec/exr.c | 1 + libavcodec/h264_slice.c | 1 + libavcodec/hevcdec.c | 1 + libavcodec/internal.h | 6 ------ libavcodec/vc1.c | 1 + libavcodec/vp3.c | 1 + 9 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 8abb7b3b34..7b5b2c996a 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -27,6 +27,7 @@ #include "av1dec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "hwconfig.h" #include "internal.h" #include "profiles.h" diff --git a/libavcodec/decode.h b/libavcodec/decode.h index 25db4a9e4d..b82d953516 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -99,6 +99,12 @@ int ff_copy_palette(void *dst, const AVPacket *src, void *logctx); */ int ff_decode_preinit(AVCodecContext *avctx); +/** + * Check that the provided sample aspect ratio is valid and set it on the codec + * context. + */ +int ff_set_sar(AVCodecContext *avctx, AVRational sar); + /** * Select the (possibly hardware accelerated) pixel format. * This is a wrapper around AVCodecContext.get_format() and should be used diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index f7423580aa..d1de9cd9e2 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -44,6 +44,7 @@ #include "avcodec.h" #include "codec_internal.h" +#include "decode.h" #include "dv.h" #include "dv_profile_internal.h" #include "dvdata.h" diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 859dd6fedd..a62cc95d28 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -51,6 +51,7 @@ #endif #include "codec_internal.h" +#include "decode.h" #include "exrdsp.h" #include "get_bits.h" #include "internal.h" diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8f9d0a6231..6f0a7c1fb7 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -36,6 +36,7 @@ #include "internal.h" #include "cabac.h" #include "cabac_functions.h" +#include "decode.h" #include "error_resilience.h" #include "avcodec.h" #include "h264.h" diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 477d6d9d36..ed6cef6bfb 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -42,6 +42,7 @@ #include "bytestream.h" #include "cabac_functions.h" #include "codec_internal.h" +#include "decode.h" #include "golomb.h" #include "hevc.h" #include "hevc_data.h" diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 0c581a4cf3..13d33f0ad3 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -223,12 +223,6 @@ int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec); */ int ff_set_dimensions(AVCodecContext *s, int width, int height); -/** - * Check that the provided sample aspect ratio is valid and set it on the codec - * context. - */ -int ff_set_sar(AVCodecContext *avctx, AVRational sar); - /** * Add or update AV_FRAME_DATA_MATRIXENCODING side data. */ diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 1070b8ca90..d46f551020 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -30,6 +30,7 @@ #include "libavutil/thread.h" #include "internal.h" #include "avcodec.h" +#include "decode.h" #include "mpegvideo.h" #include "vc1.h" #include "vc1data.h" diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 3f6b0100d9..0f040c338f 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -41,6 +41,7 @@ #include "avcodec.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "hpeldsp.h" #include "internal.h"