comparison truemotion2.c @ 8723:0acc958e87b0 libavcodec

Make TM2 decoder byteswap input into separate buffer instead of doing it in-place.

8722:ad457492fd92

                        const uint8_t *buf, int buf_size)
{
    TM2Context * const l = avctx->priv_data;
    AVFrame * const p= (AVFrame*)&l->pic;
    int i, skip, t;

    p->reference = 1;
    p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
    if(avctx->reget_buffer(avctx, p) < 0){
        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
        return -1;
    }

    l->dsp.bswap_buf((uint32_t*)buf, (const uint32_t*)buf, buf_size >> 2); //FIXME SERIOUS BUG
    skip = tm2_read_header(l, buf);

    if(skip == -1)
        return -1;

    for(i = 0; i < TM2_NUM_STREAMS; i++){
        t = tm2_read_stream(l, buf + skip, tm2_stream_order[i]);
        if(t == -1){
            return -1;
        }
        skip += t;
    }
    p->key_frame = tm2_decode_blocks(l, p);

        p->pict_type = FF_P_TYPE;

    l->cur = !l->cur;
    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = l->pic;

    return buf_size;
}

static av_cold int decode_init(AVCodecContext *avctx){

8723:0acc958e87b0

                        const uint8_t *buf, int buf_size)
{
    TM2Context * const l = avctx->priv_data;
    AVFrame * const p= (AVFrame*)&l->pic;
    int i, skip, t;
    uint8_t *swbuf;

    swbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
    if(!swbuf){
        av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
        return -1;
    }
    p->reference = 1;
    p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
    if(avctx->reget_buffer(avctx, p) < 0){
        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
        av_free(swbuf);
        return -1;
    }

    l->dsp.bswap_buf((uint32_t*)swbuf, (const uint32_t*)buf, buf_size >> 2);
    skip = tm2_read_header(l, swbuf);

    if(skip == -1){
        av_free(swbuf);
        return -1;
    }

    for(i = 0; i < TM2_NUM_STREAMS; i++){
        t = tm2_read_stream(l, swbuf + skip, tm2_stream_order[i]);
        if(t == -1){
            av_free(swbuf);
            return -1;
        }
        skip += t;
    }
    p->key_frame = tm2_decode_blocks(l, p);

        p->pict_type = FF_P_TYPE;

    l->cur = !l->cur;
    *data_size = sizeof(AVFrame);
    *(AVFrame*)data = l->pic;
    av_free(swbuf);

    return buf_size;
}

static av_cold int decode_init(AVCodecContext *avctx){