From patchwork Tue Feb 1 13:06:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp604333iov; Tue, 1 Feb 2022 05:12:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwf0sjXq94NQt8ODmqNbHmB90memSC+8pJIgCSv42fEwCfIYo441TiwJ3+fox6DqKML32uZ X-Received: by 2002:a05:6402:5186:: with SMTP id q6mr25187241edd.96.1643721122450; Tue, 01 Feb 2022 05:12:02 -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 ht18si4998679ejc.661.2022.02.01.05.12.02; Tue, 01 Feb 2022 05:12:02 -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=GkM+P7Yh; 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 DB9DC68B33C; Tue, 1 Feb 2022 15:07:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2035.outbound.protection.outlook.com [40.92.89.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E67468B329 for ; Tue, 1 Feb 2022 15:07:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nAounY4jqJCwMFAsqSbtdm2j3VKR3kW2rkdrRSS8IwDsg09twLj6cYTnuwm224D5cb4pZI3o0yynb/0lb/uNUKEzwS4BeP48jRcgzhZ+WLOU31DF7GUJ5w3t3fX8QoPRdtstazBRo4nYvxHUQO1/tXtMY73ejikuyBNMf8O6qCFyMiFW2v1hrMIce6A5OxezpK1HwmDkSzFfIFDX5kJwcE8QRoFaH6cIjJvA3zXrrU7uSXZqyMGaf2zyCYBoy4xM2UHccRKIDsle6ev3sjy/WIQHproB9eCuE8xuSQ4H2bGeDEQBGGHgn3Ckgg3H5SKq8SyjRF3qBmpggBeZPdFHxA== 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=7vLLFz4ZqLgAopJgskKDOI0Is2KP1Sja/AIiK00DVnU=; b=hp6ckRYCC/muMJS/3R6GinrLgyp0wKiNFWpqKu7HbqdkA+krJ0KUcRasAlwIQBum91OShxpwiH7aXQWbzBq3y7opws9ekrWdaRwuqP6U3oFEIIVZkE1bXn73n07eq8pieJQuN6uwMxJpvTaK4KuJZ65H2CuvLXG7Gc9zEhsUyKBvD4dxXOQEUKSd8KlR/xjrrln69Ihb8ncMtcIb9RUt4Gok36JwbKIImzOvQTwTW61b+FFjgcI/RfdOsm2c6ZIx4UK8fpdeppC20+/cDyu9dsnGr8yw4GG6T5arykhSOMOyE7d8bHujZ0eMzvlSPvIjZYnz/jSI9+KSviT0tWtsWQ== 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=7vLLFz4ZqLgAopJgskKDOI0Is2KP1Sja/AIiK00DVnU=; b=GkM+P7YhqmhxUf7GSDyMPSAZ92yVI3acywhaDLfyqJV1lnKs6k6z5zDe4vE91VbeN/q6wqL37JT8wV36bWpuUo3QAhSyMJ+D98YMhHHbFLd18uY2g5HNZTlN5gDpOgkmeTX7i9GMdUcKjmaj2PI4XAK50yvjIHeclY3kR5biVqO9YO0D+HNk2RsNVbuhU7JX3JlpPmnW8AkdS37Id+xwteXo1zoCZ0h2ddUGjxaoO/uJ3fBeK8AA1zINSfr+qLBmBcT3gv66m4wFzfWiCC+hl3AVdSF3/5Uo3xySwfAz3lzotGQda9YiglV3sDGEUuGpUbz7Tc/JGG3IPtYMgAHSUA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB5700.eurprd03.prod.outlook.com (2603:10a6:208:16f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:07:48 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:07:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:19 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Ld1EmUs8LaoU3FoCxNIkgDSMRQhLdON3] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb9794cc-7793-40a0-2222-08d9e583d810 X-MS-TrafficTypeDiagnostic: AM0PR03MB5700:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dvbbDdOFmUMgd8J0Nlwp2Q2EpOZl4DjtIjHZGmEg4V9W42zuzE+T9QJKx+DUfdLL3b+mKy+a2KnKc20AH6ijByuyTUPYUIkCh4RBH6gCO0HD2JWoMvbVS2Q2Ub36RpIbMcNAhUaraz/iKKEBTYgIA/DuiULHUtX5mWvaNfqeBgKb0zJYi6DOeMhMwpfneq0eNI8i7Kv/LhU3jgiNiDatHAUZgoFy4ynt8htzaKhwB9Vf6c5D+t3qVQR2QpXTqJ0NO3/UeAwV1b3LdqDQ4Gfjuhm93i3VNwUUPAi6N9PDLdF9Rvrnbb2f/aHpj/xM21Hf8lkVr5vGtO2JSHTmTU9wRpy6xmMa+xiY1YJfgQMQsoUTeKgzckPcd0jRk5udA/t9MA//n7yTdSai8NMIAbtaYP7UHR+38s+a/6OG+L7rn3tS35dTqaWKa9ti/N0f5kv4iehwgYDf2SpV9vV//lSfvOr318B06zFOC6020fyzMlG4oSKCBjQOWg+vGA+qI4XclfznkNn858DoDVniTGcBmXuvaRhzoBbRUEtTMeaEicJeBVDTpB53ym8zndImFvH9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GA9KORfuZPbf6yjGjTrEFU9c/+O/dxUv/AgFAOtHzguyQW4lOM8wGG6Soma68FOHiZmwQP9xt24MBF/uiciJWH4z/WtkrCTHkkEVODY+c+T5Ph6pmtozL01CN/kFgs+3QFk5EiiOH+RcU57E/EcIB4MELYIU/ylgPhfYVsq64k2GrznBshp9sVxsnkP0lt2MovVcAv75hmsot32/jSlkAgyDwyMY/PQoQC+q2EH7rS0fPX2c4w4BCFOHo2KTzCsxuFctT/irAhbMCZ/ojY20cWukXi28ZtPVcwNQrE3HuKNeiy6MSARmm+0J6huU8dSvR1eLqqR6XE8vPbeklrUtxFnAuUlLpc8ZkvdcZ8ZfF5dtEfhqHA0Ir4HO9CxdSTed+X/xVMEaimDpKO70U/BfpcGChM4f5JhBN6ZscZj+Wl5N5Ww0nwhBTLMD1myi4IUpWkkzB0guNaPCfTZIvUTEixMG8vSR7hspjqR9cYcgoOEB4LiCgIZIudgQbiXs7vsEDkI0PK5t0jasL2ix8/iB+3rVIBoZEThitPoHhL6Dw4io2KbJWBPxxn8XdgrWiOc5AmTvotTEfHE23vpDPk5/WgM9DIko5yPiQ3hSXDepBzDGadRForlcYoSwnVm42MmOext+rd+eBBl3WnFlBRAm5FHyyUp4fc9STp4u7Fx2f6Mk+pWiI3f4WWLD91DXmarcPKh+fi8hkhqd9jOz0nmxvD9awZX2WoF0NysnTqKepqQj5ZsUqpp7oHi7s/TMb6rYV0R3k4eiLEWb/ITvYRSFW/GUSCojxWAnqNbyQY2ftt3V7JcQEsDdVlt5BJ3M4L5fzl4bSeulRnMEDqQVIviqQuPW5kWV+46aOVA51mX/27STL/ZLaJZgMUI1l7CtkpMJE/Kx9QFe7AkDXuFNpZXzAKG7d0s0PmYl65wgQtK1llQ8qQ3yyIU87PnJIiSpp10e58+BGUNI1Dp3o80xsfBQjg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb9794cc-7793-40a0-2222-08d9e583d810 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:07:47.8985 (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: AM0PR03MB5700 Subject: [FFmpeg-devel] [PATCH v2 22/69] avcodec/rv10.h: Split header into decoder- and encoder-only parts 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: iu8lQ0XKuG6A Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263dec.c | 2 +- libavcodec/mpegvideo_enc.c | 2 +- libavcodec/rv10.c | 2 +- libavcodec/rv10dec.h | 28 ++++++++++++++++++++++++++++ libavcodec/rv10enc.c | 2 +- libavcodec/{rv10.h => rv10enc.h} | 12 ++++-------- libavcodec/rv20enc.c | 2 +- 7 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 libavcodec/rv10dec.h rename libavcodec/{rv10.h => rv10enc.h} (85%) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 5588840c3d..77ca0d7e40 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -42,7 +42,7 @@ #include "mathops.h" #include "mpegutils.h" #include "unary.h" -#include "rv10.h" +#include "rv10dec.h" #include "mpeg4video.h" #include "mpegvideodata.h" #include "mpeg4videodec.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index aaa1488977..a8146c6473 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -71,7 +71,7 @@ #include "internal.h" #include "bytestream.h" #include "wmv2enc.h" -#include "rv10.h" +#include "rv10enc.h" #include "packet_internal.h" #include #include "sp5x.h" diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 4dfaa3460d..241ee53442 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -41,7 +41,7 @@ #include "mpegvideo.h" #include "mpeg4video.h" #include "mpegvideodata.h" -#include "rv10.h" +#include "rv10dec.h" #define RV_GET_MAJOR_VER(x) ((x) >> 28) #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF) diff --git a/libavcodec/rv10dec.h b/libavcodec/rv10dec.h new file mode 100644 index 0000000000..daa6b8d653 --- /dev/null +++ b/libavcodec/rv10dec.h @@ -0,0 +1,28 @@ +/* + * RV10/RV20 decoder + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_RV10DEC_H +#define AVCODEC_RV10DEC_H + +#include "mpegvideo.h" + +int ff_rv_decode_dc(MpegEncContext *s, int n); + +#endif /* AVCODEC_RV10DEC_H */ diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 72b25e0c55..dbc7a370f4 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -27,7 +27,7 @@ #include "mpegvideo.h" #include "put_bits.h" -#include "rv10.h" +#include "rv10enc.h" int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) { diff --git a/libavcodec/rv10.h b/libavcodec/rv10enc.h similarity index 85% rename from libavcodec/rv10.h rename to libavcodec/rv10enc.h index 364270e76a..66672f8087 100644 --- a/libavcodec/rv10.h +++ b/libavcodec/rv10enc.h @@ -1,5 +1,5 @@ /* - * RV10/RV20 decoder + * RV10/RV20 encoder * * This file is part of FFmpeg. * @@ -18,16 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_RV10_H -#define AVCODEC_RV10_H - -#include +#ifndef AVCODEC_RV10ENC_H +#define AVCODEC_RV10ENC_H #include "mpegvideo.h" -int ff_rv_decode_dc(MpegEncContext *s, int n); - int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number); -#endif /* AVCODEC_RV10_H */ +#endif /* AVCODEC_RV10ENC_H */ diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 204cd03a24..892107f1f8 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -30,7 +30,7 @@ #include "h263data.h" #include "h263enc.h" #include "put_bits.h" -#include "rv10.h" +#include "rv10enc.h" void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){ put_bits(&s->pb, 2, s->pict_type); //I 0 vs. 1 ?