From patchwork Thu Aug 25 16:33:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37485 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp452528pzh; Thu, 25 Aug 2022 09:37:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR7RmgI/bCXC3jFT7YmwRn11Ign8S8Mf2dQ0GPuxoWJpjcwvtAnaECmfyUmdz072mjvu4Fdz X-Received: by 2002:a17:907:3d94:b0:731:744f:63ab with SMTP id he20-20020a1709073d9400b00731744f63abmr2922230ejc.541.1661445441367; Thu, 25 Aug 2022 09:37:21 -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 cw17-20020a170906479100b0073094a56feesi4221184ejc.546.2022.08.25.09.37.20; Thu, 25 Aug 2022 09:37:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Jm1FNFBc; 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 D3FFC68B9D2; Thu, 25 Aug 2022 19:37:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2027.outbound.protection.outlook.com [40.92.59.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B38268B721 for ; Thu, 25 Aug 2022 19:37:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mbqc4u+5jnv4pf4+Zt1h8FHOwXSxBT4wzNPfWSeIJnkoH6R5U+7FnWptGt16tpB0/RD/mIqSMg3U3cZ2Lf+/OB0Il3u9VIXk8+uKiN4rA8RvBiubxrPOTTIXWbWq/QYVHma/o/8JqI2v79NYuNYmz5hvllzH3mkiIFP49uXEqXvZW94lAxT4Nu4Q5ETE0usvc0wF/z0RDhR54QSFTdQ8ThY7bGO50g3m+9lIdMlCYBL4RPYp8IOVswoA0OD2U/1GYs0LXMVrpHTxCau+SifVTHecaWivvSBtjqe/b19n7k8ljoOPzca2KMEIi2SkdLTeRPODR8XrLaDpL1kw/sTx8Q== 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=cR8Pzqz33XlC4DDcZcsPeudRSWsNE9qWcP/a3R8Ah44=; b=B5RIajJt8fKkq5IogmIKdhkzvcPKnlBwZvAE8914ANibQLdTTEnw5KEb8ZqtMcAxb3IiDUsjPGBGRJWjeAsLDKgbbhmmfKj4H8XVcn94EFFfQmKAsJXwRkAwV5yB+8wD830nhs3tnYgaZi6tGSa8/YNcrGnzuXs0xeYh6xA5xyD8XMyHjZQ5EfPAIF0wVtl1BYqBJbYBhW2hdWAHQbNDHxcya44DQ4pL8L9RL8eO+gzMnK438aUYew/bIWcZqrg10fy8eCS5Q6DqsIEDXK8lEKM4kqT8QBhGacKkzNSwS3C92zy4vT+9upG2kWpkiu6AudfKDAhLdriUmI3o4YgeAw== 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=cR8Pzqz33XlC4DDcZcsPeudRSWsNE9qWcP/a3R8Ah44=; b=Jm1FNFBcii2l/yvBcr/0wlWQuqvkypQIotjkB3iPv6eMMP1vizzyNBF46ZkNzK90Qe+iPDc08BqeHsCpyN+U1xxX/LvXaugG6y2uXfS/RkEfEhRDFacAJIJdjDtvIALHetR/WMdjpMBO8lmi5jaAD4uttbFFTZM9jam7LLF4oOC0BwUpWEkp/B1hMSztFQKK6ahBetdSZjn8amB9X3L9KgHjOwqlqljVAbZoMQuul7eTdgILGR1Alr6jYnhSdtQ1CPKPo365HUE1WcBHccaoLcygfQY51TiQMhkepnOxEPyoQlW3i4g209kTclwms7n7uT2cE2wq6YyBLxtTmouSsA== 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:37:15 +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:37:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2022 18:33:58 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rhGFsgszN9AcdbMmPvVTsEX1yNkXFCoW] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51426c67-f992-4f85-7541-08da86b811a7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWxJUMtMcNsrDd7vkjDy+zOtmqSvdYWp8609sLhKa2l7JUf+vi7L/2C5cVHAUJjKEyqCoDApQHTfXiadmM9czXdfnB3QbT2e/7CsZeVmCN5foSfICu/ukmOeFxEeIPbLLkCI1hpBCqK/LyMEuTs7+ED26e5FpBumswgapyQETsogEg7UgMIjTmQDlCtp4yQFMXEIpv8nXpS5Xo18SOM7zsLErBL8AXHEikRj4jk/kh1mNW8Tnp8MtzEn5plfLeFmFN5NUSiGVRXvuMjNxUitDFsi82CzE1XhdPXGCehMFfYequslGEn6Gm2IXRmmsZG2cWbhpCB3PbSgr3NihmCv50ME+fwcznufrXs4woRb/RBnwdWDqBfwLOeeglT1KWYncPxON5ynNrwOX/lQbGc6vJy9XsbflD+p5apSqkLtRH0rnAs2J6vcFbZRHJjaIG71ksw8xYbj9OKeY2A9swrSBTNDyGJgJNvVarsjWjTHURzXiLR4OWii1tk+UoxY8opQWQaDaDq0nOcK7dSoEk4u1ZvQbjIDp//SilE7Ib/Zv5oTuKlgQ36cEalAsf5vEUrtGa5AYz7kV5V1h6VY/qKpPwRPYthD9eNfurtbfWu/5UpyAbd617DyoeFYFCj0tJx6guebUJw/Ja0DCsxMOKwWBLmhyad2jQM2wArBjupOttE9Gae7YfXOSnJylkVunbXUD62GRyf4TZgGSQpdWdTKb4VX5NUt8MRf1o= X-MS-TrafficTypeDiagnostic: PR3PR01MB7017:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ag1fyuXo/MJ+zVr2pvr3JfCndQGg2u31MA1CPCBWpK1DsYB/N9SovxbF5t0TmNMvgXWCayOONhvIVpVy9HzfmziLRLvARyzmIKSnUIYS7ZGd+rru/GILChnBVk+0ve4oSubAmETKNT3vwdCBRWxr1miKJa+dPpM5p4n45IEoAfy+11LZpfZ6juTeT7ALM+bR8p8PI4ykk5Ldg05FTBUgTMwsZTYC7uJVkxn5jpYMPeE19y847e/O2fLahSXa+YKSQPwVm79TUAtgco0G2JaHjklcMqLGmRdLgcm9sEO7aMLZSDjuCveRVO1l3ILX4gd2/PKZsmx083TP7PilIyAp9NDFz+ONR2oQMXXGwCGnB0L5xqCMCuvCn0CNuj5XYwDgEm50uuusNnBKUSXznsf+YpG7NMSwUC0UvTy6p30OOLJeQladkBmkSn5Fd6R/unS9ds0qe+WDgpgYzh5AOrTI+TIbYHraYYzxix/4EV2PUnaLX4nXFA5J7FD2QkK9LKzD27XYAY9dRCaURYYQjW7dOazqUH+gUUntvVA4fEnb2vSeI7LuDBhredDMjQ0lnk6b1gJjaY3Cx5fyLSWv66R/bvBTsEquotI6PgZCW9aF10NxwwfXWpxZUWbypcddCImNS5WqCx/NC6f206e+CNbKEA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nc41LorIMYl3FxmC3p5Y04TjbNA+wITxx877trnG7LFknPiXvW5JjLuU3R6xwxn8j9OJfeAmuJVTIgYGAdQDiy9UucwdICM6HvmXIcBatNQIjmbD4eJ0bMR5LMLGD4axZ6yLZcTffDh6woV0jQx5EXP/gnXtMFKIGdQBHz+XBBxJjbFar4xzuUuqFfslFwrjQdDBOQ0m03idQr1WktB1bVouTe6ZDHkvIXYHYKj73xAKvnXR2LaQ657UuOptTG/kL+BJrow7sQ/mjIoKzRiyqFIPjNjx8Qh5J6LJdwRHrJ0SaAWUOkm/CTRnQCaizxD7GTsRFEoC6vlOnVlpGz07UJCEM4f4RcFadENvyYT+Uw67nHoNH6e3MV4HBe6R3FSNwUklJvNE1Agpr6RhTPjzll0hutUmNu8OMFSST0eGzYg1friw9Kii6bjQJd0t18gNSsfGCDJWOyqRIbdeMhfLOu3gT5EkPGfKF1gI849fMbz6dJ8EDdnOcJtjTU7Y0xBDMFz89tOjeyBB431nyPOOJonpPIf0DviHatIIPrjAZPxFjEhHH5GOkTf1DS/7sfZwboGqX+GESva7aVRn7/BT9/UTvTINV/nQgxkZ04NJA44fe75MhNFT6sFFKqOy8E/ZCBsRHXvXTDPn2IpzENuPWSf4BZJimRmcOImB8NJNfEXNow0axOvp1mFmMMz7O/f7e70Tfb85xeZWZcBy74cuje6SPlnELCC547EpJqGyRDJEZA+nQ+zD6B2HS78oqj7DuinfoiUGUGlXqCN6uyHz4FC1zGro3r0k+GYeu5MAK7zPJgFwIPKEsAadX/yt+ytW4fP1wJFOsvi7bvYTBw90lbwXpjsVFmIKiK+yt2F/tbgOaZw9miUSlAKvV5UIjzpxPzk+65M6NcWMZn9PIzvgIhpbDt9dMIxlsMblUMHYR8Ig9XlMCrZnAsap3IN6axSNmeB869m/M0RP3k4RJqMTFUqkam6JgAFtFw97lMTcHsMGnlrygkv57zEYOjJJyao5tbp/5LhIXzp0rjbV94v/3Z2b4K3D/H5wcdTlmCjytTBySl9n4QUwJ6PfKRVeDSq/yY36R9Q4+2DUxYliL/U0DltieTBUku83ilhKcBWqTTIj8wEbrwtKiyPvDjh/QBti4OlY8NqNw83V5XiWIlJvmvH6+TJVHcKE7uBbP7L9DH4m0wJVWciK5qhW4NucgiwfR5sBHEb93p1qvSBBPSU0mcTAGarnG9nMzxT0w83Gu1v7jKLA2OlSPhDGv1tIYCywunVyytlsaFmDI1MDGJSSQRCRFigwUbtTj42SQOgvXzA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51426c67-f992-4f85-7541-08da86b811a7 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:37:15.7919 (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 19/21] avcodec/internal: Move ff_side_data_update_matrix_encoding 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: bQYVNCToWEMJ Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3dec.c | 1 - libavcodec/dca_core.c | 1 - libavcodec/dca_lbr.c | 1 - libavcodec/dca_xll.c | 1 - libavcodec/decode.h | 6 ++++++ libavcodec/internal.h | 6 ------ libavcodec/mlpdec.c | 3 --- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index b1db3dc9e6..5d0add40fe 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -38,7 +38,6 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "bswapdsp.h" -#include "internal.h" #include "aac_ac3_parser.h" #include "ac3_parser_internal.h" #include "ac3dec.h" diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index b181171104..1655116eed 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -26,7 +26,6 @@ #include "dcamath.h" #include "dca_syncwords.h" #include "decode.h" -#include "internal.h" #if ARCH_ARM #include "arm/dca.h" diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c index ec55404c7b..5343bcde8a 100644 --- a/libavcodec/dca_lbr.c +++ b/libavcodec/dca_lbr.c @@ -29,7 +29,6 @@ #include "dca_syncwords.h" #include "bytestream.h" #include "decode.h" -#include "internal.h" #define AMP_MAX 56 diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index 242c3a13fe..fe2c766d98 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -24,7 +24,6 @@ #include "dcamath.h" #include "dca_syncwords.h" #include "decode.h" -#include "internal.h" #include "unary.h" static int get_linear(GetBitContext *gb, int n) diff --git a/libavcodec/decode.h b/libavcodec/decode.h index d40327d5ab..5d95369b5e 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -138,4 +138,10 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags); */ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame, int flags); +/** + * Add or update AV_FRAME_DATA_MATRIXENCODING side data. + */ +int ff_side_data_update_matrix_encoding(AVFrame *frame, + enum AVMatrixEncoding matrix_encoding); + #endif /* AVCODEC_DECODE_H */ diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 2c67bff1d4..e63d985091 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -205,12 +205,6 @@ int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx); int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec); -/** - * Add or update AV_FRAME_DATA_MATRIXENCODING side data. - */ -int ff_side_data_update_matrix_encoding(AVFrame *frame, - enum AVMatrixEncoding matrix_encoding); - /** * Add a CPB properties side data to an encoding context. */ diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index dba2b9ac34..bfd0091323 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -38,9 +38,6 @@ #include "codec_internal.h" #include "decode.h" #include "get_bits.h" -#include "internal.h" -#include "libavutil/crc.h" -#include "parser.h" #include "mlp_parse.h" #include "mlpdsp.h" #include "mlp.h"