diff mbox series

[FFmpeg-devel,v2,18/69] avcodec/mpeg4video.h: Move encoder-only parts in a new file

Message ID AM7PR03MB66608080B27F357573D25E748F269@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 876d0afe1f220586217a56fdfb21900c7156246e
Headers show
Series [FFmpeg-devel,v2,01/69] avcodec/avcodec: Avoid MpegEncContext in AVHWAccel.decode_mb | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Feb. 1, 2022, 1:06 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 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 mbox series

Patch

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 <stdint.h>
 
-#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 <michaelni@gmx.at>
+ *
+ * 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 <stdint.h>
+
+#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"