comparison mpeg12.c @ 1389:da0b3a50d209 libavcodec

rate distortion mb decision support fix decoding of old %16!=0 divx fix assertion failure in motion_est.c

1388:b5c65adac96a

    }
    
    s->resync_mb_x= s->mb_x;
    s->resync_mb_y= s->mb_y = start_code;
    s->mb_skip_run= 0;

    for(;;) {
	s->dsp.clear_blocks(s->block[0]);

        ret = mpeg_decode_mb(s, s->block);

            s->motion_val[xy + wrap][1] = motion_y;
            s->motion_val[xy + 1 + wrap][0] = motion_x;
            s->motion_val[xy + 1 + wrap][1] = motion_y;
        }
        
        MPV_decode_mb(s, s->block);

        if (++s->mb_x >= s->mb_width) {
            if(s->avctx->codec_tag == ff_get_fourcc("VCR2"))
                exchange_uv((AVFrame*)s->current_picture_ptr);

            ff_draw_horiz_band(s, 16*s->mb_y, 16);

                    fprintf(stderr, "end missmatch left=%d\n", left);
                    return -1;
                }else
                    goto eos;
            }
        }

        /* skip mb handling */
        if (s->mb_skip_run == -1) {
            /* read again increment */

1389:da0b3a50d209

    }
    
    s->resync_mb_x= s->mb_x;
    s->resync_mb_y= s->mb_y = start_code;
    s->mb_skip_run= 0;
    ff_init_block_index(s);

    for(;;) {
	s->dsp.clear_blocks(s->block[0]);

        ret = mpeg_decode_mb(s, s->block);

            s->motion_val[xy + wrap][1] = motion_y;
            s->motion_val[xy + 1 + wrap][0] = motion_x;
            s->motion_val[xy + 1 + wrap][1] = motion_y;
        }
        
        s->dest[0] += 16;
        s->dest[1] += 8;
        s->dest[2] += 8;

        MPV_decode_mb(s, s->block);
        
        if (++s->mb_x >= s->mb_width) {
            if(s->avctx->codec_tag == ff_get_fourcc("VCR2"))
                exchange_uv((AVFrame*)s->current_picture_ptr);

            ff_draw_horiz_band(s, 16*s->mb_y, 16);

                    fprintf(stderr, "end missmatch left=%d\n", left);
                    return -1;
                }else
                    goto eos;
            }
            
            ff_init_block_index(s);
        }

        /* skip mb handling */
        if (s->mb_skip_run == -1) {
            /* read again increment */