comparison dv.c @ 8131:c30bdda1adb1 libavcodec

Taking advantage of the new ->execute API

8130:c45366b01126

    return size;
}

static int dv_init_dynamic_tables(const DVprofile *d)
{
    int j,i,c,s,p;

    if (d->work_chunks[dv_work_pool_size(d)-1])
        return 0;

    p = i = 0;
    for (c=0; c<d->n_difchan; c++) {
        for (s=0; s<d->difseg_size; s++) {
            p += 6;
            for (j=0; j<27; j++) {
                 p += !(j%3);
                 if (!(DV_PROFILE_IS_1080i50(d) && c != 0 && s == 11) &&
                     !(DV_PROFILE_IS_720p50(d) && s > 9)) {
                     d->work_chunks[i++] = (void*)(size_t)((p<<18)|(c << 16)|(s << 8)|j);
                 }
                 p += 5;
            }
        }
    }

    if (bits_left > 0) {
        put_bits(pb, bits_left, get_bits(gb, bits_left));
    }
}

static inline void dv_calculate_mb_xy(DVVideoContext *s, int work_chunk, int m, int *mb_x, int *mb_y)
{
     int i, chan, seg, slot;

     chan = (work_chunk>>16)&0x03;
     seg  = (work_chunk>>8)&0xff;
     slot = (work_chunk)&0xff;

     i = (chan*s->sys->difseg_size+seg)*27*5 + slot*5 + m;
     *mb_x = s->sys->video_place[i] & 0xff;
     *mb_y = s->sys->video_place[i] >> 8;

     /* We work with 720p frames split in half. The odd half-frame (chan==2,3) is displaced :-( */
     if (s->sys->height == 720 && !(s->buf[1]&0x0C)) {
         *mb_y -= (*mb_y>17)?18:-72; /* shifting the Y coordinate down by 72/2 macro blocks */
     }
}

/* mb_x and mb_y are in units of 8 pixels */
static inline void dv_decode_video_segment(DVVideoContext *s, int work_chunk)
{
    int quant, dc, dct_mode, class1, j;
    int mb_index, mb_x, mb_y, last_index;
    int y_stride, linesize;
    DCTELEM *block, *block1;

    assert((((int)vs_bit_buffer) & 7) == 0);

    memset(sblock, 0, sizeof(sblock));

    /* pass 1 : read DC and AC coefficients in blocks */
    buf_ptr = &s->buf[(work_chunk>>18)*80];
    block1  = &sblock[0][0];
    mb1     = mb_data;
    init_put_bits(&vs_pb, vs_bit_buffer, 5 * 80);
    for (mb_index = 0; mb_index < 5; mb_index++, mb1 += s->sys->bpm, block1 += s->sys->bpm * 64) {
        /* skip header */

            }
        }
    }
}

static inline void dv_encode_video_segment(DVVideoContext *s, int work_chunk)
{
    int mb_index, i, j;
    int mb_x, mb_y, c_offset, linesize;
    uint8_t*  y_ptr;
    uint8_t*  data;

    int       vs_bit_size = 0;
    int       qnos[5];

    assert((((int)block) & 15) == 0);

    dif = &s->buf[(work_chunk>>18)*80];
    enc_blk = &enc_blks[0];
    pb = &pbs[0];
    for (mb_index = 0; mb_index < 5; mb_index++) {
        dv_calculate_mb_xy(s, work_chunk, mb_index, &mb_x, &mb_y);
        y_ptr    = s->picture.data[0] + ((mb_y * s->picture.linesize[0] + mb_x) << 3);

       flush_put_bits(&pbs[j]);
}

static int dv_decode_mt(AVCodecContext *avctx, void* sl)
{
    dv_decode_video_segment((DVVideoContext *)avctx->priv_data, *(size_t*)sl);
    return 0;
}

#ifdef CONFIG_DVVIDEO_ENCODER
static int dv_encode_mt(AVCodecContext *avctx, void* sl)
{
    dv_encode_video_segment((DVVideoContext *)avctx->priv_data, *(size_t*)sl);
    return 0;
}
#endif

#ifdef CONFIG_DVVIDEO_DECODER

    s->picture.interlaced_frame = 1;
    s->picture.top_field_first  = 0;

    s->buf = buf;
    avctx->execute(avctx, dv_decode_mt, s->sys->work_chunks, NULL,
                   dv_work_pool_size(s->sys), sizeof(void*));

    emms_c();

    /* return image */
    *data_size = sizeof(AVFrame);

    s->picture.key_frame = 1;
    s->picture.pict_type = FF_I_TYPE;

    s->buf = buf;
    c->execute(c, dv_encode_mt, s->sys->work_chunks, NULL,
               dv_work_pool_size(s->sys), sizeof(void*));

    emms_c();

    dv_format_frame(s, buf);

8131:c30bdda1adb1

    return size;
}

static int dv_init_dynamic_tables(const DVprofile *d)
{
    int j,i,c,s,p,k;

    if (d->work_chunks[dv_work_pool_size(d)-1].buf_offset)
        return 0;

    p = i = 0;
    for (c=0; c<d->n_difchan; c++) {
        for (s=0; s<d->difseg_size; s++) {
            p += 6;
            for (j=0; j<27; j++) {
                 p += !(j%3);
                 if (!(DV_PROFILE_IS_1080i50(d) && c != 0 && s == 11) &&
                     !(DV_PROFILE_IS_720p50(d) && s > 9)) {
                     for (k=0; k<5; k++)
                         d->work_chunks[i].mb_coordinates[k] = d->video_place[(c*d->difseg_size+s)*27*5 + j*5 + k];
                     d->work_chunks[i++].buf_offset = p;
                 }
                 p += 5;
            }
        }
    }

    if (bits_left > 0) {
        put_bits(pb, bits_left, get_bits(gb, bits_left));
    }
}

static inline void dv_calculate_mb_xy(DVVideoContext *s, DVwork_chunk *work_chunk, int m, int *mb_x, int *mb_y)
{
     *mb_x = work_chunk->mb_coordinates[m] & 0xff;
     *mb_y = work_chunk->mb_coordinates[m] >> 8;

     /* We work with 720p frames split in half. The odd half-frame (chan==2,3) is displaced :-( */
     if (s->sys->height == 720 && !(s->buf[1]&0x0C)) {
         *mb_y -= (*mb_y>17)?18:-72; /* shifting the Y coordinate down by 72/2 macro blocks */
     }
}

/* mb_x and mb_y are in units of 8 pixels */
static inline void dv_decode_video_segment(DVVideoContext *s, DVwork_chunk *work_chunk)
{
    int quant, dc, dct_mode, class1, j;
    int mb_index, mb_x, mb_y, last_index;
    int y_stride, linesize;
    DCTELEM *block, *block1;

    assert((((int)vs_bit_buffer) & 7) == 0);

    memset(sblock, 0, sizeof(sblock));

    /* pass 1 : read DC and AC coefficients in blocks */
    buf_ptr = &s->buf[work_chunk->buf_offset*80];
    block1  = &sblock[0][0];
    mb1     = mb_data;
    init_put_bits(&vs_pb, vs_bit_buffer, 5 * 80);
    for (mb_index = 0; mb_index < 5; mb_index++, mb1 += s->sys->bpm, block1 += s->sys->bpm * 64) {
        /* skip header */

            }
        }
    }
}

static inline void dv_encode_video_segment(DVVideoContext *s, DVwork_chunk *work_chunk)
{
    int mb_index, i, j;
    int mb_x, mb_y, c_offset, linesize;
    uint8_t*  y_ptr;
    uint8_t*  data;

    int       vs_bit_size = 0;
    int       qnos[5];

    assert((((int)block) & 15) == 0);

    dif = &s->buf[work_chunk->buf_offset*80];
    enc_blk = &enc_blks[0];
    pb = &pbs[0];
    for (mb_index = 0; mb_index < 5; mb_index++) {
        dv_calculate_mb_xy(s, work_chunk, mb_index, &mb_x, &mb_y);
        y_ptr    = s->picture.data[0] + ((mb_y * s->picture.linesize[0] + mb_x) << 3);

       flush_put_bits(&pbs[j]);
}

static int dv_decode_mt(AVCodecContext *avctx, void* sl)
{
    dv_decode_video_segment((DVVideoContext *)avctx->priv_data, (DVwork_chunk*)sl);
    return 0;
}

#ifdef CONFIG_DVVIDEO_ENCODER
static int dv_encode_mt(AVCodecContext *avctx, void* sl)
{
    dv_encode_video_segment((DVVideoContext *)avctx->priv_data, (DVwork_chunk*)sl);
    return 0;
}
#endif

#ifdef CONFIG_DVVIDEO_DECODER

    s->picture.interlaced_frame = 1;
    s->picture.top_field_first  = 0;

    s->buf = buf;
    avctx->execute(avctx, dv_decode_mt, s->sys->work_chunks, NULL,
                   dv_work_pool_size(s->sys), sizeof(DVwork_chunk));

    emms_c();

    /* return image */
    *data_size = sizeof(AVFrame);

    s->picture.key_frame = 1;
    s->picture.pict_type = FF_I_TYPE;

    s->buf = buf;
    c->execute(c, dv_encode_mt, s->sys->work_chunks, NULL,
               dv_work_pool_size(s->sys), sizeof(DVwork_chunk));

    emms_c();

    dv_format_frame(s, buf);