From patchwork Tue Feb 1 13:06:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp601401iov; Tue, 1 Feb 2022 05:08:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpxsswNfD7W07aPx3SYUx0UML4fxJeSGcWQ3O7xHEBKyk1+n+0Xu8xGcEGsM+b5VIyMEEN X-Received: by 2002:a05:6402:520b:: with SMTP id s11mr25308757edd.365.1643720923635; Tue, 01 Feb 2022 05:08:43 -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 v2si1101047edc.280.2022.02.01.05.08.42; Tue, 01 Feb 2022 05:08:43 -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=JRG7w2e+; 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 8D87168B2DA; Tue, 1 Feb 2022 15:07:40 +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-db8eur05olkn2063.outbound.protection.outlook.com [40.92.89.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED64068B2BB for ; Tue, 1 Feb 2022 15:07:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gbz6IzaOb+X4Yd9UwAmDZqRHAyvHyOAeFDacouHIKPH7vX6+kqBSz+3RBvxlPo35RRpcTTho7KXSo8EwY+sv2fgEeq40XWszunts7OkVrGLxNGgqEzpqAfsdW86IoKSfQiBJl+rz2VEam46QpQ7f5Tjc8WOjHTQNsPG4WGQeGFSVO1/GExI2M9e55mOlv+dttSHfQOyqEpMA9CNdze/uZL3EmQ6wpn61ReAwkOGNTDuiImxWuWDsiZI+IAVa467lTV42f6NhbyrNyolitdHRXY66/7waVjTK0laRef+teXwhMfWnZtylY6VQ18+7egJufY12jnbsfZslUZWG7ItiOw== 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=ef6sq/kMFI0NY+lRVqTS9aSe3yZPbeRYp3YLKw+LLvI=; b=YdTEIEzL8hH1NiGKLtg2ay+m35WMFrhwOsYpLeCjsEvmYMIa5IGG6/lnCNvbt7z12nC3ClieBhPYsvzugMjr8R4OeIlONxg4zsStotLbfewwIA9ylaMrTySdb30K+m2OHcUxCkaSwKH32Bc0WewKK0vkA5mL+enKhNqJ2r4lI3A35ARPrS+GiFvfyao7fzhBQ2e2M57+fzx9bBCWtDfkuLsG9I8JdvcPf9bpNePa9bxW6fMPnROhsju9X7TbAQzd2NzP9X/cEdgyyaCigcnfd6YrC3j24P3ARu4Yb7kE5QRZyrZAa5bms3x1Fe2UH+AP+CciOxtK0ajKEwJ0OA3r6Q== 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=ef6sq/kMFI0NY+lRVqTS9aSe3yZPbeRYp3YLKw+LLvI=; b=JRG7w2e+JaBEJ3pVaspxjxGV+MXkv7HBj8Zu+TY9QzR6xapDholcvfbZ0sOQ/OrHtNBsLRdzpFyRCyz0tckDPo8DJEycBt0VmSShvCQjEoMu3zSx/tj0mj2wh+yNJWd9CUv+ZWGCyVW89PCa15A7k0y3wDWpnUjqwea4E2iWN52OvNcTnA7mFOuR/HfHoeZ6RdK5/ipms9chSDV6MvUwHW9+rBZg61IX8/88q2A7S7sgxHFSiKZTVPu44ZBLuC9QZbJ9WO3ubbAvS8VYpTReGhL51rW0rMlknB7auu0R7Qfd+z1WqbYCYb75oyMSrUq0N8j56YsnIy7lZRFDib9/pQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR03MB3046.eurprd03.prod.outlook.com (2603:10a6:6:34::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.21; Tue, 1 Feb 2022 13:07:27 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [MecIm1QsBpRtFLM9HxcW30he4ng541wG] 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-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cebdbdd6-c411-4822-522c-08d9e583cc12 X-MS-TrafficTypeDiagnostic: DB6PR03MB3046:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n5aK0I+aJ1J6qV/LhD465IEzAW9jLN7lda7/a9xgkTfHnbAgnrclssh9Fq0wATSuMQ2f+Y1KtfIWqFXexmmvxmmtvelUeE+S5b4gA/5aoBOd3Dj3XLw/68R9xbGHf3CaK3Y3OV1RCLXWichS4M8ko3vIgcRFz+onPEhW1yY1OwpYojuZmtScg3vqwofkDnQVwIT0uJz5CdpoNFSxWFTAxyEKUZBTsUWAygPNeL946+gYmcoxSIEps/jgcaZQ2Rwo6k+7Bs5aqQW8h2W8sgP2ibmb9P5J25Nz0ACmJnYRJznKI7y1bw5GqVplUdJkapS2tn2LtzlxhuQuAPmIOsyIpl0aVNdVx4Yex+jkOyg5pqIZ77KvkCkdJQSDnrVX5fU/Lw/p0loBF6LZ+I+MBEfcSJdVFU+HG6k6mWt1KLakxxfLNmguhDTN70vk3vCor8OvPszwUkzbmbHVxWws5zhWbbEaLZi76RDqQ72HYpk8zjf2efgogxTXR/UhTJn6QPUxFO074hlpngEnPnouNE7BDVhpHFbHEGakdgy49BbvcB1DMT3RxHY767mFqwKoAnBu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cyFb1zqkTrVHbra3KXAN4mNG2UzYnOh1vq3ozBR7w4BSqvs408ZLmG/dR/ic/TogxqYAs34SGE/CVLbUMO9G17ZROIyblwSeqr0gLU4wbykfQoZe0KWSjexnDBN4RS1XBQBFXpdvK4XLZwAuoOHprJIvKhMqHimY7v6pPNuu66znHoV4Z+TkqPZUECrjChvhnFgTrozufUlvKy3KPBIo/s28jDIzM0NBwSDlfgQcjET/N3K5At7Z9C4HnwoFY7VlIV+o9De2TU80mPcPZIj4oGlaAoZFqqLF5P/Egk8JPo5INnGTDHYYA3dzIsOHnOlaRFZidqeYEaFjH5BZKdQSxC/peEJWjOj3k6a/v8p/AV4YnX2Hr532KKTUMbrUygm/C1Eo6wZryS77PuEITUsanalQ4YZE0iL6mNxGoWl+XtwL3t6Xl4skEPp2YSXvImct3WQ0rXpBmn5TiFbQrXS17YIhHtWMTeoYqMWmh5zzWWDufANmHRa+aZ9pjPGiCGfX9NoNF43F0sykSDbnivyQddCEFVCu1dN35/7jqamJQUZQ1CATj3ozDRXnKq/1iX2Ub1F50JrNvijU/PswGcB1PlHzz+d2tq91+LZsycxM8GNOSZTspzR3elWH+lBttMrHUjVh1wei9wPIMRlnwB1XzHl20Kd1LgI2/q95lxHvTVlB6WU+lW+k1tdHnQlvUOs6yj02ruhZ4mRKl3cH4ty6mUKzUd0tc1FMIbUCGRjmzRZFYeOsZMLsSdIDi9Y6U8pfjZM1yqvWf00SEXf7Th+YeeUOqrrRyCZmkoTpTEOMcdVITq5ZxBQ02OzQtm7JtTsEpEV6ieaUdFhM0pZgR8L3uakcFdKgpV9+n2mPZi8tl+s4HhZfpGJ+45Xrtz+9CwsHDbkvAA3Cl4P/LhAZMUaa/kGILQ6Bo1cRO9WVEAdVvEV03JMdfrVC+M6ryedqeoAWGUGzW5ZF/th7kDMRatQ82Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cebdbdd6-c411-4822-522c-08d9e583cc12 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:27.7802 (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: DB6PR03MB3046 Subject: [FFmpeg-devel] [PATCH v2 07/69] avcodec/h261: Move encoder-only stuff to a new header 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: axgcrP8iS/mN Signed-off-by: Andreas Rheinhardt --- libavcodec/h261.h | 7 ------- libavcodec/h261enc.c | 1 + libavcodec/h261enc.h | 40 ++++++++++++++++++++++++++++++++++++++ libavcodec/mpegvideo_enc.c | 2 +- 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 libavcodec/h261enc.h diff --git a/libavcodec/h261.h b/libavcodec/h261.h index ff1903e508..67c362be93 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -51,11 +51,4 @@ extern RLTable ff_h261_rl_tcoeff; void ff_h261_loop_filter(MpegEncContext *s); -int ff_h261_get_picture_format(int width, int height); -void ff_h261_reorder_mb_index(MpegEncContext *s); -void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], - int motion_x, int motion_y); -void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number); -void ff_h261_encode_init(MpegEncContext *s); - #endif /* AVCODEC_H261_H */ diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 13fe5bbfb2..f1cd51ec2f 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -32,6 +32,7 @@ #include "mpegutils.h" #include "mpegvideo.h" #include "h261.h" +#include "h261enc.h" #include "mpegvideodata.h" static uint8_t uni_h261_rl_len [64*64*2*2]; diff --git a/libavcodec/h261enc.h b/libavcodec/h261enc.h new file mode 100644 index 0000000000..0a01858be5 --- /dev/null +++ b/libavcodec/h261enc.h @@ -0,0 +1,40 @@ +/* + * H.261 encoder + * Copyright (c) 2002-2004 Michael Niedermayer + * Copyright (c) 2004 Maarten Daniels + * + * 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 + */ + +/** + * @file + * H.261 encoder header. + */ + +#ifndef AVCODEC_H261ENC_H +#define AVCODEC_H261ENC_H + +#include "mpegvideo.h" + +int ff_h261_get_picture_format(int width, int height); +void ff_h261_reorder_mb_index(MpegEncContext *s); +void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], + int motion_x, int motion_y); +void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_h261_encode_init(MpegEncContext *s); + +#endif diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6df2a46eaa..bb8d3bc908 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -48,7 +48,7 @@ #include "mpeg12data.h" #include "mpegvideo.h" #include "mpegvideodata.h" -#include "h261.h" +#include "h261enc.h" #include "h263.h" #include "h263data.h" #include "mjpegenc_common.h"