*/
#include <limits.h>
+#include <X11/extensions/XvMC.h>
#include "avcodec.h"
#include "dsputil.h"
struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
assert(render && render->xvmc_id == AV_XVMC_ID);
- s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
+ s->block = (DCTELEM (*)[64])(render->data_blocks + render->next_free_data_block_num * 64);
}
/**
- * Fill individual block pointers, so there are no gaps in the data_block array
+ * Fills individual block pointers, so there are no gaps in the data_block array
* in case not all blocks in the macroblock are coded.
*/
void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
cbp <<= 12-mb_block_count;
for (i = 0; i < mb_block_count; i++) {
if (cbp & (1 << 11))
- s->pblocks[i] = (short *)(&s->block[j++]);
+ s->pblocks[i] = &s->block[j++];
else
s->pblocks[i] = NULL;
cbp += cbp;
}
/**
- * Find and store the surfaces that are used as reference frames.
+ * Finds and stores the surfaces that are used as reference frames.
* This function should be called for every new field and/or frame.
* It should be safe to call the function a few times for the same field.
*/
assert(avctx);
if (!render || render->xvmc_id != AV_XVMC_ID ||
- !render->data_blocks || !render->mv_blocks) {
+ !render->data_blocks || !render->mv_blocks ||
+ (unsigned int)render->allocated_mv_blocks > INT_MAX/(64*6) ||
+ (unsigned int)render->allocated_data_blocks > INT_MAX/64 ||
+ !render->p_surface) {
av_log(avctx, AV_LOG_ERROR,
"Render token doesn't look as expected.\n");
return -1; // make sure that this is a render packet
}
/**
- * Complete frame/field rendering by passing any remaining blocks.
+ * Completes frame/field rendering by passing any remaining blocks.
* Normally ff_draw_horiz_band() is called for each slice, however,
* some leftover blocks, for example from error_resilience(), may remain.
* It should be safe to call the function a few times for the same field.
}
/**
- * Synthesize the data needed by XvMC to render one macroblock of data.
- * Fill all relevant fields, if necessary do IDCT.
+ * Synthesizes the data needed by XvMC to render one macroblock of data.
+ * Fills all relevant fields, if necessary do IDCT.
*/
void ff_xvmc_decode_mb(MpegEncContext *s)
{
if (s->flags & CODEC_FLAG_GRAY) {
if (s->mb_intra) { // intra frames are always full chroma blocks
for (i = 4; i < blocks_per_mb; i++) {
- memset(s->pblocks[i], 0, sizeof(short)*64); // so we need to clear them
+ memset(s->pblocks[i], 0, sizeof(*s->pblocks[i])); // so we need to clear them
if (!render->unsigned_intra)
- s->pblocks[i][0] = 1 << 10;
+ *s->pblocks[i][0] = 1 << 10;
}
} else {
cbp &= 0xf << (blocks_per_mb - 4);
if (s->block_last_index[i] >= 0) {
// I do not have unsigned_intra MOCO to test, hope it is OK.
if (s->mb_intra && (render->idct || (!render->idct && !render->unsigned_intra)))
- s->pblocks[i][0] -= 1 << 10;
+ *s->pblocks[i][0] -= 1 << 10;
if (!render->idct) {
- s->dsp.idct(s->pblocks[i]);
+ s->dsp.idct(*s->pblocks[i]);
/* It is unclear if MC hardware requires pixel diff values to be
* in the range [-255;255]. TODO: Clipping if such hardware is
* ever found. As of now it would only be an unnecessary
// copy blocks only if the codec doesn't support pblocks reordering
if (s->avctx->xvmc_acceleration == 1) {
memcpy(&render->data_blocks[render->next_free_data_block_num*64],
- s->pblocks[i], sizeof(short)*64);
+ s->pblocks[i], sizeof(*s->pblocks[i]));
}
render->next_free_data_block_num++;
}