From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6313D4073F for ; Sun, 30 Jan 2022 06:30:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE23D68B188; Sun, 30 Jan 2022 08:28:30 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074101.outbound.protection.outlook.com [40.92.74.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 307D368B167 for ; Sun, 30 Jan 2022 08:28:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUhcPG6TAeS8rIl842lEpKVQ8wNvYlcyyuukaqaLfbhx6ApB4+Sg6M5GAZiqZIsaAB1qXBQTpeX1r4qWT0eB4oJa2hvgHLqfS0x5rQbHt+vULOa8ravilxkwyejAJNmzI22IXZ/FFfVYdwQdDcCa8vd0oKy11brLPOc23taRWKnxFGVPQ4I4bZcYxKLS34+HWZD3nHjd/hhU7iyxrUMyEVXorcKzFaSkwyI4N63kZR+sL+UTqLh3ya6LB73xaSTH2ojL7mHu+m+uDEt1AsN2bPec+Mi5wr+xWufHMS5xRZ9x+FfM9UeJqu6DlFmnrBHuq4DTo7h1LwQm9laQalqrOg== 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=N5+65sZgwzhWD8Vc9gie2LatzSRNiLQeapJmzfMlDfs=; b=i0iB2cHF7atxpNXhHuhP6EkBpyT02UW3bZDr6QC0N7O5sqanNV5pJGn8O7qAX//NH/Wg9L2VJifkPd9ER1FW7ssE27XkF+eOsu9YnkjmtgO8C/LffacwTAvKKEqGu9hVWXyoyvkyu80Qxy61PsUeAYHrhzx1cOTohKIoqwbwO2w4s6PMiDHI5Saievqdqrt2TU+QGCSys8ZWvSUFcweBGqJ90zMnaGjnlfxvhP+t4W56B76nFnHtE1ns4JrpmgMHRTt6jmYhnH9Asj8qwEa+Lj+Uhg8U7VtCYTFtfSOLFWRr+qrP7ef37wWp6wK/mDuzAye+aL7K52X3UkUivTVQQA== 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=N5+65sZgwzhWD8Vc9gie2LatzSRNiLQeapJmzfMlDfs=; b=RUGyDO1+EMBVY20gRXYVCwjRQrJJWoNi2egSYePh4X1DduUaUat+NonSgHNzrkiWNbZfdEmP7OmnjuZNgJtCtMx/IyAnKnFDehXCejs8RfHLh5WG4AzED8jrtCmzvLkmwlxZViMyddXoqKviildK3IbfuOykIhGfvffARGLKWqyWDrJ2gBfhrlC/7YmoFBuN9DAVpSzE/g8j5ET6TnPZkLy0J0PMcvdL90I8Tp0K4seUU+RaozZzeKLuU542AI91EatYvX7O0WCx3s/sxyJiZcCd1Yw24be71Be9Vv3z9T7XaMo4NtyA+hj1P6wr4TC60/+f881QRvhtVvFFadb2ng== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4247.eurprd03.prod.outlook.com (2603:10a6:20b:7::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:28:23 +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.4930.021; Sun, 30 Jan 2022 06:28:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:18 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [uj3pMsBGxBThoKUoIVNu+CD5gEd5FLwK] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db7d7db1-e829-4d64-06e5-08d9e3b9b719 X-MS-TrafficTypeDiagnostic: AM6PR03MB4247:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9Tl8AQ/k4yL15JyjCN7gIuH+E9mOoVFvD8VByHBdHqfdIzSWrg8+jagOo5L2eDiv7MbAaJYOgfQjXMGJS2MtpyuM2dhvXhkKYxdP0qZcynlovV02rPeBIOLIuPwR+mPq8aU312UQhfXdOZBNbMOQYO+Qlt/mREn86Vh7GwSL6L+fdPhWczAjNMMlZRTanaSzNo0grke0Ait5cgevK3xYWAaZkb1KT+KMOqtfF6R34wd7Ttet2HP9UDi3fri3uzKu3SwCTiMeglvG1xR+AulIuKH2VBkEacAyUZpdXsgA4rd6FX6UMKTLYAKISq9bzg95b907AZDur8o0mBRvHjva4KyPUfBnl1SSr5+z7LTxWwa4KGXI2N5V05IOLqscJ/lvnYHjPXxDkK8ql9EpPqtF9sP4RyFsniNTVtnu4yglGc9fm38Tfef8JtzqdioYAhc3wkPHdrqPYLj1Ql720X/vI+ojhPUKFxXTQLFTEiGRtE07PYcNEdoffAtpMspb4PSKtHeuXsJ9l8tpInisScPSV1usRhDCovbbYwQNE/b1dHzDSmmjxl1WkCHe97XUtaZ2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KgDn4mwEQhulvwe+cpFWjGDE1PAusxZ0fPOI8KJoxHa3TCfGXbXVz6kKe6PE?= =?us-ascii?Q?dsGf87OUJz7F+hEr06jMmDDC5jb9/fE44FRD8sizMG0/2qeM65LUjky/dAgJ?= =?us-ascii?Q?nK32wMVsnjv/k0443trTYZMM5BzFnDNb/U2kuZb5ERR3GHswGEeao4B4fQVm?= =?us-ascii?Q?auxDnrfjVqQTf6173+iwv8tThkYVA1PcAjSjdHg83yWaqFu/jp6rJCFdISMG?= =?us-ascii?Q?RZIy5bG0Au0fRQshxri2yjTDt/lGUvdW4Ts0ScCrxmMXlYVfupuitOppyGZA?= =?us-ascii?Q?Djekx4+QGF4gxzLEKcQ8RdfZOPNAkkiR2EAPJAmEMczLwMYTEc906PojZHP1?= =?us-ascii?Q?AefcCCIWSivWphpc2mAkul/CFPXzOvoC1JzllLdEHB0JoE7vKRQBv1erVkjG?= =?us-ascii?Q?cQsmN6tVPrCKNGt7EqtUsS4JrLOkTMaKW8td9+0fXOP00IrC/50VWfD5GHNZ?= =?us-ascii?Q?+78+vZK+yF9aFTgrBFn3mwtIFNATTu2k8NO0zv74VfFhMcz6cYRH7zay3ucy?= =?us-ascii?Q?sQF2ACxLKTV3VTiNd2QoZ2azH/DdGDDdtIiU7OcgWKcM1mw5MwMAbOB8kYPh?= =?us-ascii?Q?AyiyLnCwz/P/9BIio4ssA4wYFtEQQeBPd4c8VhYCIibEJRl8YAcOHMu5ZhPI?= =?us-ascii?Q?SueQ++rt3XFWtoZKTpWtMTRk5bnNRNMN3indvw0Q4gYf0Jde/ynV8gg+iyF7?= =?us-ascii?Q?rnDN6DCrPffRYDL2wDkwU9tBBXWNGH6gL9y1YECt3UtQ15yRG9ypLSyCQjeA?= =?us-ascii?Q?VaaseFiVgmwq159x/TNxiWPwxySHvqAjG2xMJ6yUsPkf6Cxlu5TjST6fg1/E?= =?us-ascii?Q?TuzPg0ytQyY7Hs9PxNq1n+SSXI6dnqJkFGvrluvuULjbr+S8gGi3U2asWH/f?= =?us-ascii?Q?g0sCCPYf6M81qTmj6R+XG1QUQWm2AtCBBvYflswANhhly+JlKt+5z9IDUi33?= =?us-ascii?Q?tH61ROnAx8Ro/HJIJCjI7A=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: db7d7db1-e829-4d64-06e5-08d9e3b9b719 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:28:23.0753 (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: AM6PR03MB4247 Subject: [FFmpeg-devel] [PATCH 10/41] avcodec/msmpeg4.h: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 2 +- libavcodec/msmpeg4.h | 15 ------------- libavcodec/msmpeg4enc.c | 1 + libavcodec/msmpeg4enc.h | 45 ++++++++++++++++++++++++++++++++++++++ libavcodec/wmv2enc.c | 1 + 5 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 libavcodec/msmpeg4enc.h diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6df2a46eaa..4bc78841ac 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -56,7 +56,7 @@ #include "mpegutils.h" #include "mjpegenc.h" #include "speedhqenc.h" -#include "msmpeg4.h" +#include "msmpeg4enc.h" #include "pixblockdsp.h" #include "qpeldsp.h" #include "faandct.h" diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index 483c965b9d..dbe650cbbc 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -28,7 +28,6 @@ #include "avcodec.h" #include "mpegvideo.h" #include "msmpeg4data.h" -#include "put_bits.h" #define INTER_INTRA_VLC_BITS 3 #define MB_NON_INTRA_VLC_BITS 9 @@ -42,20 +41,10 @@ extern VLC ff_mb_non_intra_vlc[4]; extern VLC ff_inter_intra_vlc; -void ff_msmpeg4_code012(PutBitContext *pb, int n); void ff_msmpeg4_common_init(MpegEncContext *s); -void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n); -void ff_msmpeg4_handle_slices(MpegEncContext *s); -void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my); int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr); -void ff_msmpeg4_encode_init(MpegEncContext *s); -void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number); -void ff_msmpeg4_encode_ext_header(MpegEncContext *s); -void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], - int motion_x, int motion_y); - int ff_msmpeg4_decode_init(AVCodecContext *avctx); int ff_msmpeg4_decode_picture_header(MpegEncContext *s); int ff_msmpeg4_decode_ext_header(MpegEncContext *s, int buf_size); @@ -72,9 +61,5 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, CONFIG_WMV1_DECODER || \ CONFIG_WMV2_DECODER || \ CONFIG_VC1_DECODER) -#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \ - CONFIG_MSMPEG4V3_ENCODER || \ - CONFIG_WMV1_ENCODER || \ - CONFIG_WMV2_ENCODER) #endif /* AVCODEC_MSMPEG4_H */ diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 2c619e1210..31920b7f0d 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -39,6 +39,7 @@ #include "mpeg4video.h" #include "msmpeg4.h" #include "msmpeg4data.h" +#include "msmpeg4enc.h" #include "put_bits.h" #include "rl.h" #include "vc1data.h" diff --git a/libavcodec/msmpeg4enc.h b/libavcodec/msmpeg4enc.h new file mode 100644 index 0000000000..12f8f44232 --- /dev/null +++ b/libavcodec/msmpeg4enc.h @@ -0,0 +1,45 @@ +/* + * MSMPEG4 encoder header + * copyright (c) 2007 Aurelien Jacobs + * + * 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_MSMPEG4ENC_H +#define AVCODEC_MSMPEG4ENC_H + +#include "config.h" +#include "mpegvideo.h" +#include "put_bits.h" + +void ff_msmpeg4_encode_init(MpegEncContext *s); +void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_msmpeg4_encode_ext_header(MpegEncContext *s); +void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], + int motion_x, int motion_y); +void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n); +void ff_msmpeg4_handle_slices(MpegEncContext *s); +void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my); + +void ff_msmpeg4_code012(PutBitContext *pb, int n); + +#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \ + CONFIG_MSMPEG4V3_ENCODER || \ + CONFIG_WMV1_ENCODER || \ + CONFIG_WMV2_ENCODER) + +#endif diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index a7827f3194..6036a0dec9 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -22,6 +22,7 @@ #include "h263.h" #include "mpegvideo.h" #include "msmpeg4.h" +#include "msmpeg4enc.h" #include "msmpeg4data.h" #include "wmv2.h" -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".