[FFmpeg-devel] [PATCH 02/21] avcodec/h263: Move decoding-only stuff to a new header h263dec.h

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Soon to be followed by a H263DecContext.

 libavcodec/flvdec.c        |  2 +-
 libavcodec/h263.h          | 40 -----------------------
 libavcodec/h263dec.c       |  1 +
 libavcodec/h263dec.h       | 65 ++++++++++++++++++++++++++++++++++++++
 libavcodec/intelh263dec.c  |  3 +-
 libavcodec/ituh263dec.c    |  1 +
 libavcodec/mpeg4videodec.c |  1 +
 libavcodec/msmpeg4dec.c    |  1 +
 libavcodec/rv10.c          |  1 +
 libavcodec/wmv2dec.c       |  2 +-
 10 files changed, 74 insertions(+), 43 deletions(-)
 create mode 100644 libavcodec/h263dec.h

diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c
index 2ddcf021fd..2bd86b5b47 100644
--- a/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@ -21,7 +21,7 @@
 #include "libavutil/imgutils.h"
 
 #include "flv.h"
-#include "h263.h"
+#include "h263dec.h"
 #include "mpegvideo.h"
 #include "mpegvideodata.h"
 
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index 31836ebb95..6dd5d2295a 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -22,41 +22,14 @@
 
 #include <stdint.h>
 #include "libavutil/rational.h"
-#include "get_bits.h"
 #include "mpegvideo.h"
 #include "h263data.h"
-#include "rl.h"
 
 #define FF_ASPECT_EXTENDED 15
-#define INT_BIT (CHAR_BIT * sizeof(int))
-
-// The defines below define the number of bits that are read at once for
-// reading vlc values. Changing these may improve speed and data cache needs
-// be aware though that decreasing them may need the number of stages that is
-// passed to get_vlc* to be increased.
-#define H263_MV_VLC_BITS     9
-#define INTRA_MCBPC_VLC_BITS 6
-#define INTER_MCBPC_VLC_BITS 7
-#define CBPY_VLC_BITS 6
-#define TEX_VLC_BITS 9
 
 #define H263_GOB_HEIGHT(h) ((h) <= 400 ? 1 : (h) <= 800 ? 2 : 4)
 
-extern VLC ff_h263_intra_MCBPC_vlc;
-extern VLC ff_h263_inter_MCBPC_vlc;
-extern VLC ff_h263_cbpy_vlc;
-extern VLC ff_h263_mv_vlc;
-
-extern const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[];
-
-
-int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code);
 av_const int ff_h263_aspect_to_info(AVRational aspect);
-int ff_h263_decode_init(AVCodecContext *avctx);
-int ff_h263_decode_frame(AVCodecContext *avctx,
-                             void *data, int *got_frame,
-                             AVPacket *avpkt);
-int ff_h263_decode_end(AVCodecContext *avctx);
 void ff_h263_encode_mb(MpegEncContext *s,
                        int16_t block[6][64],
                        int motion_x, int motion_y);
@@ -65,27 +38,14 @@ void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line);
 int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
                              int *px, int *py);
 void ff_h263_encode_init(MpegEncContext *s);
-void ff_h263_decode_init_vlc(void);
 void ff_h263_init_rl_inter(void);
-int ff_h263_decode_picture_header(MpegEncContext *s);
 void ff_h263_update_motion_val(MpegEncContext * s);
 void ff_h263_loop_filter(MpegEncContext * s);
-int ff_h263_decode_mba(MpegEncContext *s);
 void ff_h263_encode_mba(MpegEncContext *s);
 void ff_init_qscale_tab(MpegEncContext *s);
 
 
-/**
- * Print picture info if FF_DEBUG_PICT_INFO is set.
- */
-void ff_h263_show_pict_info(MpegEncContext *s);
-
-int ff_intel_h263_decode_picture_header(MpegEncContext *s);
-int ff_h263_decode_mb(MpegEncContext *s,
-                      int16_t block[6][64]);
-
 void ff_clean_h263_qscales(MpegEncContext *s);
-int ff_h263_resync(MpegEncContext *s);
 void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);
 
 
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index ac48acf47a..3466027286 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -33,6 +33,7 @@
 #include "error_resilience.h"
 #include "flv.h"
 #include "h263.h"
+#include "h263dec.h"
 #if FF_API_FLAG_TRUNCATED
 #include "h263_parser.h"
 #endif
diff --git a/libavcodec/h263dec.h b/libavcodec/h263dec.h
new file mode 100644
index 0000000000..8d5f9a7add
--- /dev/null
+++ b/libavcodec/h263dec.h
@@ -0,0 +1,65 @@
+/*
+ * H.263 decoder internal header
+ *
+ * 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_H263DEC_H
+#define AVCODEC_H263DEC_H
+
+#include "mpegvideo.h"
+#include "vlc.h"
+
+// The defines below define the number of bits that are read at once for
+// reading vlc values. Changing these may improve speed and data cache needs
+// be aware though that decreasing them may need the number of stages that is
+// passed to get_vlc* to be increased.
+#define H263_MV_VLC_BITS     9
+#define INTRA_MCBPC_VLC_BITS 6
+#define INTER_MCBPC_VLC_BITS 7
+#define CBPY_VLC_BITS 6
+#define TEX_VLC_BITS 9
+
+extern VLC ff_h263_intra_MCBPC_vlc;
+extern VLC ff_h263_inter_MCBPC_vlc;
+extern VLC ff_h263_cbpy_vlc;
+extern VLC ff_h263_mv_vlc;
+
+extern const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[];
+
+int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code);
+int ff_h263_decode_init(AVCodecContext *avctx);
+int ff_h263_decode_frame(AVCodecContext *avctx,
+                             void *data, int *got_frame,
+                             AVPacket *avpkt);
+int ff_h263_decode_end(AVCodecContext *avctx);
+void ff_h263_decode_init_vlc(void);
+int ff_h263_decode_picture_header(MpegEncContext *s);
+int ff_h263_decode_gob_header(MpegEncContext *s);
+int ff_h263_decode_mba(MpegEncContext *s);
+
+/**
+ * Print picture info if FF_DEBUG_PICT_INFO is set.
+ */
+void ff_h263_show_pict_info(MpegEncContext *s);
+
+int ff_intel_h263_decode_picture_header(MpegEncContext *s);
+int ff_h263_decode_mb(MpegEncContext *s,
+                      int16_t block[6][64]);
+
+int ff_h263_resync(MpegEncContext *s);
+
+#endif
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index 58c1b63c0a..9dde247298 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -20,7 +20,8 @@
 
 #include "mpegutils.h"
 #include "mpegvideo.h"
-#include "h263.h"
+#include "h263data.h"
+#include "h263dec.h"
 #include "mpegvideodata.h"
 
 /* don't understand why they choose a different header ! */
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 5329e62a5e..0a032ea54c 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -39,6 +39,7 @@
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h263data.h"
+#include "h263dec.h"
 #include "internal.h"
 #include "mathops.h"
 #include "mpegutils.h"
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 737689b35b..162048b604 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -36,6 +36,7 @@
 #include "mpeg4video.h"
 #include "mpeg4videodata.h"
 #include "h263.h"
+#include "h263dec.h"
 #include "profiles.h"
 #include "thread.h"
 #include "xvididct.h"
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index f302509589..3d2dcb9429 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -29,6 +29,7 @@
 #include "msmpeg4.h"
 #include "libavutil/imgutils.h"
 #include "h263.h"
+#include "h263dec.h"
 #include "mpeg4video.h"
 #include "msmpeg4data.h"
 #include "vc1data.h"
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 0dc2c87335..4dfaa3460d 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -34,6 +34,7 @@
 #include "error_resilience.h"
 #include "h263.h"
 #include "h263data.h"
+#include "h263dec.h"
 #include "internal.h"
 #include "mpeg_er.h"
 #include "mpegutils.h"
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index f7745c5a83..7518088b6a 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -19,7 +19,7 @@
  */
 
 #include "avcodec.h"
-#include "h263.h"
+#include "h263dec.h"
 #include "internal.h"
 #include "intrax8.h"
 #include "mathops.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".