comparison mpegvideo_xvmc.c @ 8871:199e9809eb5a libavcodec

some more K&R whitespace cosmetics

8870:c5112df7f8b8

#include "xvmc.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++) {

// 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);

    assert(render->filled_mv_blocks_num == 0);

    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);

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);
}

void ff_xvmc_decode_mb(MpegEncContext *s)
{
    XvMCMacroBlock * mv_block;
    struct xvmc_render_state * render;
    int i,cbp,blocks_per_mb;

    const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;


    if (s->encoding) {

    s->current_picture.qscale_table[mb_xy] = s->qscale;

    // start of XVMC-specific code
    render = (struct xvmc_render_state*)s->current_picture.data[2];
    assert(render);
    assert(render->magic==AV_XVMC_RENDER_MAGIC);
    assert(render->mv_blocks);

    // take the next free macroblock
    mv_block = &render->mv_blocks[render->start_mv_blocks_num +
                                  render->filled_mv_blocks_num ];

        mv_block->motion_vertical_field_select = 0;

        // set correct field references
        if (s->mv_type == MV_TYPE_FIELD || s->mv_type == MV_TYPE_16X8) {
            mv_block->motion_vertical_field_select |= s->field_select[0][0];
            mv_block->motion_vertical_field_select |= s->field_select[1][0]<<1;
            mv_block->motion_vertical_field_select |= s->field_select[0][1]<<2;
            mv_block->motion_vertical_field_select |= s->field_select[1][1]<<3;
        }
    } // !intra
    // time to handle data blocks
    mv_block->index = render->next_free_data_block_num;

    }

    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)*8*8); // so we need to clear them
                if (!render->unsigned_intra)
                    s->pblocks[i][0] = 1 << 10;
            }
        } else {
            cbp &= 0xf << (blocks_per_mb - 4);

    assert(render->filled_mv_blocks_num     <= render->total_number_of_mv_blocks);
    assert(render->next_free_data_block_num <= render->total_number_of_data_blocks);


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

8871:199e9809eb5a

#include "xvmc.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++) {

// 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);

    assert(render->filled_mv_blocks_num == 0);

    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);

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);
}

void ff_xvmc_decode_mb(MpegEncContext *s)
{
    XvMCMacroBlock *mv_block;
    struct xvmc_render_state *render;
    int i, cbp, blocks_per_mb;

    const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;


    if (s->encoding) {

    s->current_picture.qscale_table[mb_xy] = s->qscale;

    // start of XVMC-specific code
    render = (struct xvmc_render_state*)s->current_picture.data[2];
    assert(render);
    assert(render->magic == AV_XVMC_RENDER_MAGIC);
    assert(render->mv_blocks);

    // take the next free macroblock
    mv_block = &render->mv_blocks[render->start_mv_blocks_num +
                                  render->filled_mv_blocks_num ];

        mv_block->motion_vertical_field_select = 0;

        // set correct field references
        if (s->mv_type == MV_TYPE_FIELD || s->mv_type == MV_TYPE_16X8) {
            mv_block->motion_vertical_field_select |= s->field_select[0][0];
            mv_block->motion_vertical_field_select |= s->field_select[1][0] << 1;
            mv_block->motion_vertical_field_select |= s->field_select[0][1] << 2;
            mv_block->motion_vertical_field_select |= s->field_select[1][1] << 3;
        }
    } // !intra
    // time to handle data blocks
    mv_block->index = render->next_free_data_block_num;

    }

    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)*8*8); // so we need to clear them
                if (!render->unsigned_intra)
                    s->pblocks[i][0] = 1 << 10;
            }
        } else {
            cbp &= 0xf << (blocks_per_mb - 4);

    assert(render->filled_mv_blocks_num     <= render->total_number_of_mv_blocks);
    assert(render->next_free_data_block_num <= render->total_number_of_data_blocks);


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