mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/msmpeg4.h: Move encoder-only stuff to a new header
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
78087da47c
commit
9f2b566301
|
@ -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"
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
* MSMPEG4 encoder header
|
||||
* copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>
|
||||
*
|
||||
* 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
|
|
@ -22,6 +22,7 @@
|
|||
#include "h263.h"
|
||||
#include "mpegvideo.h"
|
||||
#include "msmpeg4.h"
|
||||
#include "msmpeg4enc.h"
|
||||
#include "msmpeg4data.h"
|
||||
#include "wmv2.h"
|
||||
#include "wmv2enc.h"
|
||||
|
|
Loading…
Reference in New Issue