opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-03 14:36:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.

Browse Source 
Originally committed as revision 17339 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-02-15 17:42:08 +00:00
parent 11f8aa042d
commit f602b044b5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/mpegvideo_xvmc.c
View File

@ -37,7 +37,7 @@
*/ */
void ff_xvmc_init_block(MpegEncContext *s) void ff_xvmc_init_block(MpegEncContext *s)
{ {
struct xvmc_pixfmt_render *render = (struct xvmc_pixfmt_render*)s->current_picture.data[2]; struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
assert(render && render->unique_id == AV_XVMC_RENDER_MAGIC); assert(render && render->unique_id == AV_XVMC_RENDER_MAGIC);
s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64); s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
@ -64,7 +64,7 @@ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
*/ */
int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx) int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
{ {
struct xvmc_pixfmt_render *last, *next, *render = (struct xvmc_pixfmt_render*)s->current_picture.data[2]; struct xvmc_pix_fmt *last, *next, *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
const int mb_block_count = 4 + (1 << s->chroma_format); const int mb_block_count = 4 + (1 << s->chroma_format);
assert(avctx); assert(avctx);
@ -97,7 +97,7 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
case FF_I_TYPE: case FF_I_TYPE:
return 0; // no prediction from other frames return 0; // no prediction from other frames
case FF_B_TYPE: case FF_B_TYPE:
next = (struct xvmc_pixfmt_render*)s->next_picture.data[2]; next = (struct xvmc_pix_fmt*)s->next_picture.data[2];
if (!next) if (!next)
return -1; return -1;
if (next->unique_id != AV_XVMC_RENDER_MAGIC) if (next->unique_id != AV_XVMC_RENDER_MAGIC)
@ -105,7 +105,7 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
render->p_future_surface = next->p_surface; render->p_future_surface = next->p_surface;
// no return here, going to set forward prediction // no return here, going to set forward prediction
case FF_P_TYPE: case FF_P_TYPE:
last = (struct xvmc_pixfmt_render*)s->last_picture.data[2]; last = (struct xvmc_pix_fmt*)s->last_picture.data[2];
if (!last) if (!last)
last = render; // predict second field from the first last = render; // predict second field from the first
if (last->unique_id != AV_XVMC_RENDER_MAGIC) if (last->unique_id != AV_XVMC_RENDER_MAGIC)
@ -123,7 +123,7 @@ return -1;
*/ */
void ff_xvmc_field_end(MpegEncContext *s) void ff_xvmc_field_end(MpegEncContext *s)
{ {
struct xvmc_pixfmt_render *render = (struct xvmc_pixfmt_render*)s->current_picture.data[2]; struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
assert(render); assert(render);
if (render->filled_mv_blocks_num > 0) if (render->filled_mv_blocks_num > 0)
@ -133,7 +133,7 @@ void ff_xvmc_field_end(MpegEncContext *s)
void ff_xvmc_decode_mb(MpegEncContext *s) void ff_xvmc_decode_mb(MpegEncContext *s)
{ {
XvMCMacroBlock *mv_block; XvMCMacroBlock *mv_block;
struct xvmc_pixfmt_render *render; struct xvmc_pix_fmt *render;
int i, cbp, blocks_per_mb; int i, cbp, blocks_per_mb;
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
@ -160,7 +160,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
s->current_picture.qscale_table[mb_xy] = s->qscale; s->current_picture.qscale_table[mb_xy] = s->qscale;
// start of XVMC-specific code // start of XVMC-specific code
render = (struct xvmc_pixfmt_render*)s->current_picture.data[2]; render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
assert(render); assert(render);
assert(render->unique_id == AV_XVMC_RENDER_MAGIC); assert(render->unique_id == AV_XVMC_RENDER_MAGIC);
assert(render->mv_blocks); assert(render->mv_blocks);

2
libavcodec/xvmc.h
View File

@ -33,7 +33,7 @@
#define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */ #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */
// 1337 IDCT MCo // 1337 IDCT MCo
struct xvmc_pixfmt_render { struct xvmc_pix_fmt {
/** Set by calling application /** Set by calling application
Once set these values are not supposed to be modified. Once set these values are not supposed to be modified.
*/ */