comparison mpegvideo_xvmc.c @ 8889:b4838c71d52a libavcodec

Merge some declarations and initializations.

8888:5b7c6ebb4a36

#include "xvmc_internal.h"

//set s->block
void ff_xvmc_init_block(MpegEncContext *s)
{
    struct xvmc_render_state *render;
    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
    }
    s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
}

void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
{
    int i, j;
    const int mb_block_count = 4 + (1 << s->chroma_format);

    j = 0;
    cbp <<= 12-mb_block_count;
    for (i = 0; i < mb_block_count; i++) {
        if (cbp & (1 << 11))
            s->pblocks[i] = (short *)(&s->block[j++]);
        else

// 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 ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
{
    struct xvmc_render_state *render, *last, *next;

    assert(avctx);

    render = (struct xvmc_render_state*)s->current_picture.data[2];
    assert(render);
    if (!render || render->magic != AV_XVMC_RENDER_MAGIC)
        return -1; // make sure that this is a render packet

    render->picture_structure = s->picture_structure;

return -1;
}

void ff_xvmc_field_end(MpegEncContext *s)
{
    struct xvmc_render_state *render;
    render = (struct xvmc_render_state*)s->current_picture.data[2];
    assert(render);

    if (render->filled_mv_blocks_num > 0)
        ff_draw_horiz_band(s, 0, 0);
}

8889:b4838c71d52a

#include "xvmc_internal.h"

//set s->block
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
    }
    s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
}

void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
{
    int i, j = 0;
    const int mb_block_count = 4 + (1 << s->chroma_format);

    cbp <<= 12-mb_block_count;
    for (i = 0; i < mb_block_count; i++) {
        if (cbp & (1 << 11))
            s->pblocks[i] = (short *)(&s->block[j++]);
        else

// 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 ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
{
    struct xvmc_render_state *last, *next, *render = (struct xvmc_render_state*)s->current_picture.data[2];

    assert(avctx);
    assert(render);
    if (!render || render->magic != AV_XVMC_RENDER_MAGIC)
        return -1; // make sure that this is a render packet

    render->picture_structure = s->picture_structure;

return -1;
}

void ff_xvmc_field_end(MpegEncContext *s)
{
    struct xvmc_render_state *render = (struct xvmc_render_state*)s->current_picture.data[2];
    assert(render);

    if (render->filled_mv_blocks_num > 0)
        ff_draw_horiz_band(s, 0, 0);
}