virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

use ff_xvmc for function names instead of XVMC_

Browse Source 
Originally committed as revision 17254 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ivan Kalvachev 2009-02-14 18:25:41 +00:00
parent c1a5aa2953
commit 78f9a87830
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/mpeg12.c
View File

@ -61,10 +61,10 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *bloc
static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
static void exchange_uv(MpegEncContext *s);
int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx);
int XVMC_field_end(MpegEncContext *s);
void XVMC_pack_pblocks(MpegEncContext *s,int cbp);
void XVMC_init_block(MpegEncContext *s);//set s->block
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[] = {
PIX_FMT_XVMC_MPEG2_IDCT,
@ -304,7 +304,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
#if CONFIG_MPEG_XVMC_DECODER
//if 1, we memcpy blocks in xvmcvideo
if(s->avctx->xvmc_acceleration > 1){
XVMC_pack_pblocks(s,-1);//inter are always full blocks
ff_xvmc_pack_pblocks(s,-1);//inter are always full blocks
if(s->swap_uv){
exchange_uv(s);
}
@ -517,7 +517,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
#if CONFIG_MPEG_XVMC_DECODER
//if 1, we memcpy blocks in xvmcvideo
if(s->avctx->xvmc_acceleration > 1){
XVMC_pack_pblocks(s,cbp);
ff_xvmc_pack_pblocks(s,cbp);
if(s->swap_uv){
exchange_uv(s);
}
@ -1652,7 +1652,7 @@ static int mpeg_field_start(MpegEncContext *s){
// MPV_frame_start will call this function too,
// but we need to call it on every field
if(s->avctx->xvmc_acceleration)
XVMC_field_start(s,avctx);
ff_xvmc_field_start(s,avctx);
#endif
return 0;
@ -1742,7 +1742,7 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y,
#if CONFIG_MPEG_XVMC_DECODER
//If 1, we memcpy blocks in xvmcvideo.
if(s->avctx->xvmc_acceleration > 1)
XVMC_init_block(s);//set s->block
ff_xvmc_init_block(s);//set s->block
#endif
if(mpeg_decode_mb(s, s->block) < 0)
@ -1923,7 +1923,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict)
#if CONFIG_MPEG_XVMC_DECODER
if(s->avctx->xvmc_acceleration)
XVMC_field_end(s);
ff_xvmc_field_end(s);
#endif
/* end of slice reached */
if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) {

4
libavcodec/mpegvideo.c
View File

@ -56,7 +56,7 @@ static void dct_unquantize_h263_inter_c(MpegEncContext *s,
int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx);
void XVMC_field_end(MpegEncContext *s);
void XVMC_decode_mb(MpegEncContext *s);
void ff_xvmc_decode_mb(MpegEncContext *s);
/* enable all paranoid tests for rounding, overflows, etc... */
@ -1738,7 +1738,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
#if CONFIG_MPEG_XVMC_DECODER
if(s->avctx->xvmc_acceleration){
XVMC_decode_mb(s);//xvmc uses pblocks
ff_xvmc_decode_mb(s);//xvmc uses pblocks
return;
}
#endif

10
libavcodec/mpegvideo_xvmc.c
View File

@ -36,7 +36,7 @@
#include "xvmc.h"
//set s->block
void XVMC_init_block(MpegEncContext *s)
void ff_xvmc_init_block(MpegEncContext *s)
{
struct xvmc_render_state * render;
render = (struct xvmc_render_state*)s->current_picture.data[2];
@ -48,7 +48,7 @@ void XVMC_init_block(MpegEncContext *s)
s->block = (DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64);
}
void XVMC_pack_pblocks(MpegEncContext *s, int cbp)
void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
{
int i,j;
const int mb_block_count = 4 + (1 << s->chroma_format);
@ -67,7 +67,7 @@ void XVMC_pack_pblocks(MpegEncContext *s, int cbp)
//These functions should be called on every new field and/or frame.
//They should be safe if they are called a few times for the same field!
int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx)
int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
{
struct xvmc_render_state * render, * last, * next;
@ -112,7 +112,7 @@ int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx)
return -1;
}
void XVMC_field_end(MpegEncContext *s)
void ff_xvmc_field_end(MpegEncContext *s)
{
struct xvmc_render_state * render;
render = (struct xvmc_render_state*)s->current_picture.data[2];
@ -122,7 +122,7 @@ void XVMC_field_end(MpegEncContext *s)
ff_draw_horiz_band(s,0,0);
}
void XVMC_decode_mb(MpegEncContext *s)
void ff_xvmc_decode_mb(MpegEncContext *s)
{
XvMCMacroBlock * mv_block;
struct xvmc_render_state * render;