mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
avcodec/wmv2.h: Move encoder- and decoder-only parts to new headers
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
cc90478967
commit
78087da47c
@ -49,7 +49,7 @@
|
|||||||
#include "msmpeg4.h"
|
#include "msmpeg4.h"
|
||||||
#include "qpeldsp.h"
|
#include "qpeldsp.h"
|
||||||
#include "thread.h"
|
#include "thread.h"
|
||||||
#include "wmv2.h"
|
#include "wmv2dec.h"
|
||||||
|
|
||||||
static enum AVPixelFormat h263_get_format(AVCodecContext *avctx)
|
static enum AVPixelFormat h263_get_format(AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
#include "mpegvideodata.h"
|
#include "mpegvideodata.h"
|
||||||
#include "qpeldsp.h"
|
#include "qpeldsp.h"
|
||||||
#include "threadframe.h"
|
#include "threadframe.h"
|
||||||
#include "wmv2.h"
|
#include "wmv2dec.h"
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
|
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
#include "mpeg4videodata.h"
|
#include "mpeg4videodata.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "bytestream.h"
|
#include "bytestream.h"
|
||||||
#include "wmv2.h"
|
#include "wmv2enc.h"
|
||||||
#include "rv10.h"
|
#include "rv10.h"
|
||||||
#include "packet_internal.h"
|
#include "packet_internal.h"
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#include "mpeg4video.h"
|
#include "mpeg4video.h"
|
||||||
#include "msmpeg4data.h"
|
#include "msmpeg4data.h"
|
||||||
#include "vc1data.h"
|
#include "vc1data.h"
|
||||||
#include "wmv2.h"
|
#include "wmv2dec.h"
|
||||||
|
|
||||||
#define DC_VLC_BITS 9
|
#define DC_VLC_BITS 9
|
||||||
#define V2_INTRA_CBPC_VLC_BITS 3
|
#define V2_INTRA_CBPC_VLC_BITS 3
|
||||||
|
@ -37,15 +37,6 @@ typedef struct WMV2Context {
|
|||||||
|
|
||||||
void ff_wmv2_common_init(MpegEncContext *s);
|
void ff_wmv2_common_init(MpegEncContext *s);
|
||||||
|
|
||||||
int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
|
|
||||||
int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);
|
|
||||||
void ff_wmv2_encode_mb(MpegEncContext * s, int16_t block[6][64],
|
|
||||||
int motion_x, int motion_y);
|
|
||||||
int ff_wmv2_decode_picture_header(MpegEncContext * s);
|
|
||||||
int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
|
|
||||||
void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64],
|
|
||||||
uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
|
|
||||||
|
|
||||||
void ff_mspel_motion(MpegEncContext *s,
|
void ff_mspel_motion(MpegEncContext *s,
|
||||||
uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
|
uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
|
||||||
uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
|
uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include "simple_idct.h"
|
#include "simple_idct.h"
|
||||||
#include "wmv2.h"
|
#include "wmv2.h"
|
||||||
#include "wmv2data.h"
|
#include "wmv2data.h"
|
||||||
|
#include "wmv2dec.h"
|
||||||
|
|
||||||
typedef struct WMV2DecContext {
|
typedef struct WMV2DecContext {
|
||||||
MpegEncContext s;
|
MpegEncContext s;
|
||||||
|
32
libavcodec/wmv2dec.h
Normal file
32
libavcodec/wmv2dec.h
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2002 The FFmpeg Project
|
||||||
|
*
|
||||||
|
* 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_WMV2DEC_H
|
||||||
|
#define AVCODEC_WMV2DEC_H
|
||||||
|
|
||||||
|
#include "mpegvideo.h"
|
||||||
|
|
||||||
|
int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
|
||||||
|
int ff_wmv2_decode_picture_header(MpegEncContext * s);
|
||||||
|
int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
|
||||||
|
void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64],
|
||||||
|
uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
|
||||||
|
|
||||||
|
#endif
|
@ -24,6 +24,7 @@
|
|||||||
#include "msmpeg4.h"
|
#include "msmpeg4.h"
|
||||||
#include "msmpeg4data.h"
|
#include "msmpeg4data.h"
|
||||||
#include "wmv2.h"
|
#include "wmv2.h"
|
||||||
|
#include "wmv2enc.h"
|
||||||
|
|
||||||
typedef struct WMV2EncContext {
|
typedef struct WMV2EncContext {
|
||||||
MpegEncContext s;
|
MpegEncContext s;
|
||||||
|
31
libavcodec/wmv2enc.h
Normal file
31
libavcodec/wmv2enc.h
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2002 The FFmpeg Project
|
||||||
|
*
|
||||||
|
* 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_WMV2ENC_H
|
||||||
|
#define AVCODEC_WMV2ENC_H
|
||||||
|
|
||||||
|
#include "mpegvideo.h"
|
||||||
|
|
||||||
|
int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);
|
||||||
|
void ff_wmv2_encode_mb(MpegEncContext * s, int16_t block[6][64],
|
||||||
|
int motion_x, int motion_y);
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user