generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add xvmc_internal.h that contains all internal xvmc function declarations.

Browse Source 
This allows getting rid of a bunch of ugly forward declarations.

Originally committed as revision 17280 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-02-14 20:37:14 +00:00
parent 6e2803405d
commit 4440bd0da4
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpeg12.c
View File

@ -35,6 +35,7 @@
#include "mpeg12decdata.h" #include "mpeg12decdata.h"
#include "bytestream.h" #include "bytestream.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
#include "xvmc_internal.h"
//#undef NDEBUG //#undef NDEBUG
//#include <assert.h> //#include <assert.h>
@ -61,11 +62,6 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *bloc
static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
static void exchange_uv(MpegEncContext *s); static void exchange_uv(MpegEncContext *s);
int ff_xvmc_field_start(MpegEncContext *s, AVCodecContext *avctx);
int ff_xvmc_field_end(MpegEncContext *s);
void ff_xvmc_pack_pblocks(MpegEncContext *s,int cbp);
void ff_xvmc_init_block(MpegEncContext *s);//set s->block
static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
PIX_FMT_XVMC_MPEG2_IDCT, PIX_FMT_XVMC_MPEG2_IDCT,
PIX_FMT_XVMC_MPEG2_MC, PIX_FMT_XVMC_MPEG2_MC,

5
libavcodec/mpegvideo.c
View File

@ -34,6 +34,7 @@
#include "mjpegenc.h" #include "mjpegenc.h"
#include "msmpeg4.h" #include "msmpeg4.h"
#include "faandct.h" #include "faandct.h"
#include "xvmc_internal.h"
#include <limits.h> #include <limits.h>
//#undef NDEBUG //#undef NDEBUG
@ -54,10 +55,6 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s,
static void dct_unquantize_h263_inter_c(MpegEncContext *s, static void dct_unquantize_h263_inter_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale); DCTELEM *block, int n, int qscale);
int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx);
void ff_xvmc_field_end(MpegEncContext *s);
void ff_xvmc_decode_mb(MpegEncContext *s);
/* enable all paranoid tests for rounding, overflows, etc... */ /* enable all paranoid tests for rounding, overflows, etc... */
//#define PARANOID //#define PARANOID

1
libavcodec/mpegvideo_xvmc.c
View File

@ -29,6 +29,7 @@
#include <assert.h> #include <assert.h>
#include "xvmc.h" #include "xvmc.h"
#include "xvmc_internal.h"
//set s->block //set s->block
void ff_xvmc_init_block(MpegEncContext *s) void ff_xvmc_init_block(MpegEncContext *s)

33
libavcodec/xvmc_internal.h Normal file
View File

@ -0,0 +1,33 @@
/*
* XVideo Motion Compensation internal functions
*
* 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_INTERNAL_XVMC_H
#define AVCODEC_INTERNAL_XVMC_H
#include "avcodec.h"
#include "mpegvideo.h"
void ff_xvmc_init_block(MpegEncContext *s);
void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp);
int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx);
void ff_xvmc_field_end(MpegEncContext *s);
void ff_xvmc_decode_mb(MpegEncContext *s);
#endif /* AVCODEC_INTERNAL_XVMC_H */