#include "xvmc.h"
#include "xvmc_internal.h"
-//set s->block
+/**
+ * Initializes the block field of the MpegEncContext pointer passed as
+ * parameter after making sure that the data is not corrupted.
+ * In order to implement something like direct rendering instead of decodeing
+ * coefficients in s->blocks and then copy them, do that directly
+ * into the data_blocks array provided by xvmc.
+ */
void ff_xvmc_init_block(MpegEncContext *s)
{
- struct xvmc_render_state *render = (struct xvmc_render_state*)s->current_picture.data[2];
- assert(render);
- if (!render || render->magic != AV_XVMC_RENDER_MAGIC) {
- assert(0);
- return; // make sure that this is a render packet
- }
+ struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
+ assert(render && render->xvmc_id == AV_XVMC_RENDER_MAGIC);
+
s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
}
+/**
+ * Fill individual block pointers, so there are no gaps in the data_block array
+ * in case not all blocks in MB are coded.
+ */
void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
{
int i, j = 0;
}
/**
+ * Find and store 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.
*/
int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
{
- struct xvmc_render_state *last, *next, *render = (struct xvmc_render_state*)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);
assert(avctx);
- assert(render);
- if (!render || render->magic != AV_XVMC_RENDER_MAGIC)
+ if (!render || render->xvmc_id != AV_XVMC_RENDER_MAGIC ||
+ !render->data_blocks || !render->mv_blocks) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Render token doesn't look as expected.\n");
return -1; // make sure that this is a render packet
-
- render->picture_structure = s->picture_structure;
- render->flags = s->first_field ? 0 : XVMC_SECOND_FIELD;
+ }
if (render->filled_mv_blocks_num) {
av_log(avctx, AV_LOG_ERROR,
- "Rendering surface contains %i unprocessed blocks\n",
+ "Rendering surface contains %i unprocessed blocks.\n",
render->filled_mv_blocks_num);
return -1;
}
+ if (render->total_number_of_mv_blocks < 1 ||
+ render->total_number_of_data_blocks < mb_block_count) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Rendering surface doesn't provide enough block structures to work with.\n");
+ return -1;
+ }
- render->p_future_surface = NULL;
- render->p_past_surface = NULL;
+ render->picture_structure = s->picture_structure;
+ render->flags = s->first_field ? 0 : XVMC_SECOND_FIELD;
+ render->p_future_surface = NULL;
+ render->p_past_surface = NULL;
switch(s->pict_type) {
case FF_I_TYPE:
return 0; // no prediction from other frames
case FF_B_TYPE:
- next = (struct xvmc_render_state*)s->next_picture.data[2];
- assert(next);
+ next = (struct xvmc_pix_fmt*)s->next_picture.data[2];
if (!next)
return -1;
- if (next->magic != AV_XVMC_RENDER_MAGIC)
+ if (next->xvmc_id != AV_XVMC_RENDER_MAGIC)
return -1;
render->p_future_surface = next->p_surface;
// no return here, going to set forward prediction
case FF_P_TYPE:
- last = (struct xvmc_render_state*)s->last_picture.data[2];
+ last = (struct xvmc_pix_fmt*)s->last_picture.data[2];
if (!last)
last = render; // predict second field from the first
- if (last->magic != AV_XVMC_RENDER_MAGIC)
+ if (last->xvmc_id != AV_XVMC_RENDER_MAGIC)
return -1;
render->p_past_surface = last->p_surface;
return 0;
}
/**
- * This function should be called for every new field and/or frame.
+ * Complete frame/field rendering by passing any remaining blocks.
+ * Normally ff_draw_horiz_band() is called on each slice, however
+ * there may be some remaining blocks, for example put by error_resilience.
* It should be safe to call the function a few times for the same field.
*/
void ff_xvmc_field_end(MpegEncContext *s)
{
- struct xvmc_render_state *render = (struct xvmc_render_state*)s->current_picture.data[2];
+ struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
assert(render);
if (render->filled_mv_blocks_num > 0)
ff_draw_horiz_band(s, 0, 0);
}
+/**
+ * Synthesize the data needed by XvMC to render one macroblock of data.
+ * Fill all relevent fields, if necessery do IDCT.
+ */
void ff_xvmc_decode_mb(MpegEncContext *s)
{
XvMCMacroBlock *mv_block;
- struct xvmc_render_state *render;
+ struct xvmc_pix_fmt *render;
int i, cbp, blocks_per_mb;
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
s->current_picture.qscale_table[mb_xy] = s->qscale;
// start of XVMC-specific code
- render = (struct xvmc_render_state*)s->current_picture.data[2];
+ render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
assert(render);
- assert(render->magic == AV_XVMC_RENDER_MAGIC);
+ assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC);
assert(render->mv_blocks);
// take the next free macroblock
* blocks. */
- if (render->filled_mv_blocks_num >= render->total_number_of_mv_blocks)
+ if (render->filled_mv_blocks_num == render->total_number_of_mv_blocks)
ff_draw_horiz_band(s, 0, 0);
}
projects / ffmpeg / blobdiff