From patchwork Tue Feb 1 13:06:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33992 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp603621iov; Tue, 1 Feb 2022 05:11:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCR88jrw6QIqCcSqvxZqpU8T3/62FhUfnxw0NMuebhvabm3NmyLSS87GA31iLYkYuxCenD X-Received: by 2002:a05:6402:c15:: with SMTP id co21mr24920845edb.185.1643721065775; Tue, 01 Feb 2022 05:11:05 -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 l14si10040741edb.241.2022.02.01.05.11.05; Tue, 01 Feb 2022 05:11:05 -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=iez+QnVC; 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 D6B3E68B325; Tue, 1 Feb 2022 15:07:49 +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-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ABC568B2FD for ; Tue, 1 Feb 2022 15:07:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ninVxk0u3Tvw6/IYXwhPOnJ9DxGZJ/dIgequ6xY0B+JvsyueFeSx9YqxR6T6Apc5IkuEocUVhMJ7Ta28E9ZnnurkCJh9Z06F7oOrmg2G4fbZEO48yNA8vA1me00LOYIEk8aPfQJ5CO1sbpOzy3m1Z+64kCOACpySvKhDvx8J4u50xTxGIDIOBmG0T/3oWxtnMsAVaeXVE/C+buZnkpAtsgf3406TkmZyyL/Th0Dyq9yX+KiUFURVgpEcXUG+5e/J+rbsgA1cB65S2PVKEITEmbti+hVZr5TJ4scvUIsFdhhVe2VhPUjGFbG6d3TJXYnUrsjVD2ScoLJ1WBGhzIKVMA== 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=7hRxEg/aUINXVBmqu5B2bb7WRImR9T+bKSPNSoeRJLw=; b=g6PRQ+grI1ARSdxZqmIfE2jZxJRpg5UT0bYxOMhIkbj/5AVAxuT28NRCJ8j2UrrF+IL42PQiyztho98W7Iz7WnJzOsfvMJSGzIHNj2Sz5BGY1oYkk8uF6Sp/4fihm/fosssBGQxl+k94fXCEbWv+8VuzSGc4YbHxquqDlYnZWnCsaOTlFQ1EGMzCZ686d3THknVDhEVjUhsPqd5DtjmzDfraLFpFyys6+TaTJtHNkIvwq5TfBq6M3LTdKAg/0VUM/PidaGa0H5wCeywZH/V/bb7zye9wHTyBZBVCXMXOzvPmDRpTjVgw27ns6jGPHiiR9E6quYNosRcSKq9zJlysVw== 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=7hRxEg/aUINXVBmqu5B2bb7WRImR9T+bKSPNSoeRJLw=; b=iez+QnVC+UxG8nauBfvHdPpLKV1jIpin2pEyrAfIstFql/AGsR3hqZ4EJ9vuRIrSAi5AOoYs0ZOqKra0g0J4RK3fn4DoH1gXtHJfRc6KbX0sd0Ei4ZYwz7/IFVD3iM+712FC5chhXhOLxs14WZB88Bx3r43upZsACin1UEYNtmBTtdRC9CKdUkvjx6EbHyP5/DUsi3Ldn2hcbmplWV2Y+IzG8/eL3g7KAhhqTbNX7e+vYmjUc3Q5pJ/gMYf9hSsTjjTyuGB4G9zZvVxelzFCxcd0Ze+n4u1tkoSNDYTuW1ycxG7gFyp/KzoHAuTYAgQP06csF8juVLfbyjuT12/PUQ== 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:42 +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:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:15 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [jk85MIXY+MyemMvnMenmOWyZyzwMFIOL] 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-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 097e398b-bc7c-48b8-22e9-08d9e583d49b X-MS-TrafficTypeDiagnostic: AM0PR03MB5700:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BvzqYQwJnUh4cVKSH/EMBM+mxWAnmo3C8FT8h2TO9QEpWkVllgnnnXQ1THKTTk+dZa20p2ef+2sv6gysmS4bdPhPe+55NrsbQm/W2UmHpRGkDfXWcwkbLX2HpHR/kZTdcfWSV2zoMlJkj7DrzgjbltpDBEbHZNrE0XG2Ii/xmgkR0u9pi3IZyqdZtdZiaNAuLPNmB5Rljl6MSpnUeXFE6PjiR7ymlvQjnu9viM1C4qADrPk6BQmyF7ltSXpXTThEUm/xok8aNCp1ocOVG1ih7tTNN+EcYtdblG1nnCzJ1YIDNrbaxzFy0ZZ/zn6bRIz7cUtxcQD89FnYAwO5EF6sIC8iuDCaLV9i1MH5hvVmftCeJsK79XN7tha92gp21HsVy1I3zkGcatqSOnSqa1Kav8qfvjPRJ8r6qsF5wI4r5b2xIoG8ct5tqpPD2SC+KuEjtR7BPJg1DxwPc1bSW4ItJpzv1wwb5lYLYCcJzHDqceZKJTxJ7XKIPxhTfBomB7fxXrPHihoVo9e+wPbNWDrkZQSLj+S1Y/m+JOP0duAMEN0y0tdvdHLY3s9YYvURmaP6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OgnVIiQWA/UhIMv0lBmBaC53DrUVLy2Vs5ZlWlWeDzgEhl0uOCeG1900X3+cfOMnLp8Sq0ikSUWY+9i8j92dWZp9nozpa1EHSecjNH5E7Wy40JFBcq4KNL8rXap2ue9mzGy98aHEURx1y0a45BU8/BLiQoXC6v3GW7A4Z0syxlfItX9UJj+gMy90FQ9Vf5QMH60NPS2QVYKtK4GQzFk0yWzqhmevYGTc3RqqZa9keI3IanHoZMfeyttvA/eIjw3BiqbsZq4MRqv6YXO4zc62zu9zPVL5NPR7V1RCRYWuj1hp+fVsRaQYSd+2DMN5KhhCh5rPBtiZoDAZyomwvvrSybm45gq0xik14m18G8Cr7mSRiOddaniEGz6FYsbti6XeqVeuGSvI+Hnq70kb45j9/x83TutS2QGLwNdiUU8v5o9jL77Fp5uIL2vERxdhkWLBJH+BM0CYaIvAeu04VYjycINM1hU5NO1e7JYp+SbmE19CVxCosgq1HKI5/v0cjWB6vlMKgOTG4WnoV003DcjyLVtsSqm5y8fh9pFgz8Bne1hCfgKA6s0neif0aj+iIxo4ztGoGeZ4xsNxtHFuEotUWkemhDJAsTvDegPHxZJeNlxuf/YEslgc+MAhcqgBEVM3T1zEk40vJr9kX4gaYuMHr20yNOH9OjSaf2tM+cnaDebV6+B2yUs+3/WBEkZafEKqOT5a46tR+qfGdJxkmmVnQ5eAz7Sz7vXV017pnNSx1BklwOG79F1cD4yaf2NcDvwGY/T24kvAtypgLFXmBB0JOkR7lT+ySTjgDWQTAHVz7JUNXRDbcz4KmSvmGUf68AdvtToRw06n5ey1mdCQVmwn+3dzXVLMIVQpvR/cT9LHUsruwmFDmh/KQq6+v7mE2sgadCHlf/GBScsT/PlAps13FobLa40o4lqoiUhKY7CWbR3EfTGpgA0nph/Ix/6tT5nGjlYANxWw3SWukh3DgQ3LdA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 097e398b-bc7c-48b8-22e9-08d9e583d49b 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:42.0986 (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 18/69] avcodec/mpeg4video.h: Move encoder-only parts in a new file 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: gFPa592XXuNv Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4video.h | 12 ----------- libavcodec/mpeg4videoenc.c | 1 + libavcodec/mpeg4videoenc.h | 43 ++++++++++++++++++++++++++++++++++++++ libavcodec/mpegvideo_enc.c | 1 + 4 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 libavcodec/mpeg4videoenc.h diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index bee52b2c29..ab65280756 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -25,7 +25,6 @@ #include -#include "get_bits.h" #include "mpegvideo.h" // shapes @@ -70,18 +69,7 @@ /* smaller packets likely don't contain a real frame */ #define MAX_NVOP_SIZE 19 -void ff_mpeg4_encode_mb(MpegEncContext *s, - int16_t block[6][64], - int motion_x, int motion_y); -void ff_set_mpeg4_time(MpegEncContext *s); -int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); - -void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); void ff_mpeg4_clean_buffers(MpegEncContext *s); -void ff_mpeg4_stuffing(PutBitContext *pbc); -void ff_mpeg4_init_partitions(MpegEncContext *s); -void ff_mpeg4_merge_partitions(MpegEncContext *s); -void ff_clean_mpeg4_qscales(MpegEncContext *s); int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s); void ff_mpeg4_init_direct_mv(MpegEncContext *s); diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 8a1a6cbcc8..d55667c1a6 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -30,6 +30,7 @@ #include "h263enc.h" #include "mpeg4video.h" #include "mpeg4videodata.h" +#include "mpeg4videoenc.h" #include "profiles.h" /* The uni_DCtab_* tables below contain unified bits+length tables to encode DC diff --git a/libavcodec/mpeg4videoenc.h b/libavcodec/mpeg4videoenc.h new file mode 100644 index 0000000000..243cd297a2 --- /dev/null +++ b/libavcodec/mpeg4videoenc.h @@ -0,0 +1,43 @@ +/* + * MPEG-4 encoder internal header. + * Copyright (c) 2000,2001 Fabrice Bellard + * Copyright (c) 2002-2010 Michael Niedermayer + * + * 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_MPEG4VIDEOENC_H +#define AVCODEC_MPEG4VIDEOENC_H + +#include + +#include "mpegvideo.h" +#include "put_bits.h" + +void ff_mpeg4_encode_mb(MpegEncContext *s, + int16_t block[6][64], + int motion_x, int motion_y); +void ff_set_mpeg4_time(MpegEncContext *s); +int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); + +void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); +void ff_mpeg4_stuffing(PutBitContext *pbc); +void ff_mpeg4_init_partitions(MpegEncContext *s); +void ff_mpeg4_merge_partitions(MpegEncContext *s); +void ff_clean_mpeg4_qscales(MpegEncContext *s); + +#endif diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a57de01944..460462d997 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -66,6 +66,7 @@ #include "flv.h" #include "mpeg4video.h" #include "mpeg4videodata.h" +#include "mpeg4videoenc.h" #include "internal.h" #include "bytestream.h" #include "wmv2enc.h"