comparison mpegvideo.c @ 925:7fccaa0d699d libavcodec

AVVideoFrame -> AVFrame

924:3814e9115672

    }else{
        int r;
        
        assert(!pic->data[0]);
        
        r= s->avctx->get_buffer(s->avctx, (AVVideoFrame*)pic);
        
        if(r<0 || !pic->age || !pic->type || !pic->data[0]){
            fprintf(stderr, "get_buffer() failed (%d %d %d %X)\n", r, pic->age, pic->type, (int)pic->data[0]);
            return -1;
        }

 */
static void free_picture(MpegEncContext *s, Picture *pic){
    int i;

    if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){
        s->avctx->release_buffer(s->avctx, (AVVideoFrame*)pic);
    }

    av_freep(&pic->mb_var);
    av_freep(&pic->mc_mb_var);
    av_freep(&pic->mb_mean);

                     + (toupper((s->avctx->fourcc>>16)&0xFF)<<16) 
                     + (toupper((s->avctx->fourcc>>24)&0xFF)<<24);

    CHECKED_ALLOCZ(s->edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance

    s->avctx->coded_picture= (AVVideoFrame*)&s->current_picture;

    if (s->encoding) {
        int mv_table_size= (s->mb_width+2)*(s->mb_height+2);

        /* Allocate MV tables */

/* generic function for encode/decode called before a frame is coded/decoded */
int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
{
    int i;
    AVVideoFrame *pic;

    s->mb_skiped = 0;
    
    /* mark&release old frames */
    if (s->pict_type != B_TYPE && s->last_picture.data[0]) {
        for(i=0; i<MAX_PICTURE_COUNT; i++){
//printf("%8X %d %d %X %X\n", s->picture[i].data[0], s->picture[i].type, i, s->next_picture.data[0], s->last_picture.data[0]);
            if(s->picture[i].data[0] == s->last_picture.data[0]){
//                s->picture[i].reference=0;
                avctx->release_buffer(avctx, (AVVideoFrame*)&s->picture[i]);
                break;
            }    
        }
        assert(i<MAX_PICTURE_COUNT);

        /* if(mpeg124/h263) */
        if(!s->encoding){
            for(i=0; i<MAX_PICTURE_COUNT; i++){
                if(s->picture[i].data[0] && s->picture[i].data[0] != s->next_picture.data[0] && s->picture[i].reference){
                    fprintf(stderr, "releasing zombie picture\n");
                    avctx->release_buffer(avctx, (AVVideoFrame*)&s->picture[i]);                
                }
            }
        }
    }
alloc:
    if(!s->encoding){
        i= find_unused_picture(s, 0);
    
        pic= (AVVideoFrame*)&s->picture[i];
        pic->reference= s->pict_type != B_TYPE;
        pic->coded_picture_number= s->current_picture.coded_picture_number+1;
        
        alloc_picture(s, (Picture*)pic, 0);

    assert(i<MAX_PICTURE_COUNT);

    /* release non refernce frames */
    for(i=0; i<MAX_PICTURE_COUNT; i++){
        if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/)
            s->avctx->release_buffer(s->avctx, (AVVideoFrame*)&s->picture[i]);
    }
}

static int get_sae(uint8_t *src, int ref, int stride){
    int x,y;

    }
    return acc;
}


static int load_input_picture(MpegEncContext *s, AVVideoFrame *pic_arg){
    AVVideoFrame *pic;
    int i;
    const int encoding_delay= s->max_b_frames;
    int direct=1;

    if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0;

//    printf("%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize);
    
    if(direct){
        i= find_unused_picture(s, 1);

        pic= (AVVideoFrame*)&s->picture[i];
        pic->reference= 1;
    
        for(i=0; i<4; i++){
            pic->data[i]= pic_arg->data[i];
            pic->linesize[i]= pic_arg->linesize[i];
        }
        alloc_picture(s, (Picture*)pic, 1);
    }else{
        i= find_unused_picture(s, 0);

        pic= (AVVideoFrame*)&s->picture[i];
        pic->reference= 1;

        alloc_picture(s, (Picture*)pic, 0);

        if(   pic->data[0] == pic_arg->data[0] 

int MPV_encode_picture(AVCodecContext *avctx,
                       unsigned char *buf, int buf_size, void *data)
{
    MpegEncContext *s = avctx->priv_data;
    AVVideoFrame *pic_arg = data;
    int i;

    init_put_bits(&s->pb, buf, buf_size, NULL, NULL);

    s->picture_in_gop_number++;

925:7fccaa0d699d

    }else{
        int r;
        
        assert(!pic->data[0]);
        
        r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic);
        
        if(r<0 || !pic->age || !pic->type || !pic->data[0]){
            fprintf(stderr, "get_buffer() failed (%d %d %d %X)\n", r, pic->age, pic->type, (int)pic->data[0]);
            return -1;
        }

 */
static void free_picture(MpegEncContext *s, Picture *pic){
    int i;

    if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){
        s->avctx->release_buffer(s->avctx, (AVFrame*)pic);
    }

    av_freep(&pic->mb_var);
    av_freep(&pic->mc_mb_var);
    av_freep(&pic->mb_mean);

                     + (toupper((s->avctx->fourcc>>16)&0xFF)<<16) 
                     + (toupper((s->avctx->fourcc>>24)&0xFF)<<24);

    CHECKED_ALLOCZ(s->edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance

    s->avctx->coded_frame= (AVFrame*)&s->current_picture;

    if (s->encoding) {
        int mv_table_size= (s->mb_width+2)*(s->mb_height+2);

        /* Allocate MV tables */

/* generic function for encode/decode called before a frame is coded/decoded */
int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
{
    int i;
    AVFrame *pic;

    s->mb_skiped = 0;
    
    /* mark&release old frames */
    if (s->pict_type != B_TYPE && s->last_picture.data[0]) {
        for(i=0; i<MAX_PICTURE_COUNT; i++){
//printf("%8X %d %d %X %X\n", s->picture[i].data[0], s->picture[i].type, i, s->next_picture.data[0], s->last_picture.data[0]);
            if(s->picture[i].data[0] == s->last_picture.data[0]){
//                s->picture[i].reference=0;
                avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
                break;
            }    
        }
        assert(i<MAX_PICTURE_COUNT);

        /* if(mpeg124/h263) */
        if(!s->encoding){
            for(i=0; i<MAX_PICTURE_COUNT; i++){
                if(s->picture[i].data[0] && s->picture[i].data[0] != s->next_picture.data[0] && s->picture[i].reference){
                    fprintf(stderr, "releasing zombie picture\n");
                    avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);                
                }
            }
        }
    }
alloc:
    if(!s->encoding){
        i= find_unused_picture(s, 0);
    
        pic= (AVFrame*)&s->picture[i];
        pic->reference= s->pict_type != B_TYPE;
        pic->coded_picture_number= s->current_picture.coded_picture_number+1;
        
        alloc_picture(s, (Picture*)pic, 0);

    assert(i<MAX_PICTURE_COUNT);

    /* release non refernce frames */
    for(i=0; i<MAX_PICTURE_COUNT; i++){
        if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/)
            s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]);
    }
}

static int get_sae(uint8_t *src, int ref, int stride){
    int x,y;

    }
    return acc;
}


static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){
    AVFrame *pic;
    int i;
    const int encoding_delay= s->max_b_frames;
    int direct=1;

    if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0;

//    printf("%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize);
    
    if(direct){
        i= find_unused_picture(s, 1);

        pic= (AVFrame*)&s->picture[i];
        pic->reference= 1;
    
        for(i=0; i<4; i++){
            pic->data[i]= pic_arg->data[i];
            pic->linesize[i]= pic_arg->linesize[i];
        }
        alloc_picture(s, (Picture*)pic, 1);
    }else{
        i= find_unused_picture(s, 0);

        pic= (AVFrame*)&s->picture[i];
        pic->reference= 1;

        alloc_picture(s, (Picture*)pic, 0);

        if(   pic->data[0] == pic_arg->data[0] 

int MPV_encode_picture(AVCodecContext *avctx,
                       unsigned char *buf, int buf_size, void *data)
{
    MpegEncContext *s = avctx->priv_data;
    AVFrame *pic_arg = data;
    int i;

    init_put_bits(&s->pb, buf, buf_size, NULL, NULL);

    s->picture_in_gop_number++;