comparison h263dec.c @ 750:4adadf210b3b libavcodec

better padding bug detection

749:07e58dc635a5

                if(ret==SLICE_END){
//printf("%d %d %06X\n", s->mb_x, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24));
                    s->error_status_table[xy]|= AC_END;
                    if(!s->partitioned_frame)
                        s->error_status_table[xy]|= MV_END|DC_END;
                    
                    if(++s->mb_x >= s->mb_width){
                        s->mb_x=0;
                        ff_draw_horiz_band(s);
                        s->mb_y++;
                    }

        s->mb_x= 0;
    }
    
    assert(s->mb_x==0 && s->mb_y==s->mb_height);

    // handle formats which dont have unique end markers
    if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
        int left= s->gb.size*8 - get_bits_count(&s->gb);
        int max_extra=7;
        

        }else
            s->error_status_table[s->mb_num-1]|= AC_END|MV_END|DC_END;
        
        return 0;
    }
        
    fprintf(stderr, "slice end not reached but screenspace end (%d left %06X)\n", 
            s->gb.size*8 - get_bits_count(&s->gb),
            show_bits(&s->gb, 24));
    return -1;
}

                
        if(s->avctx->fourcc == ff_get_fourcc("UMP4")){
            s->workaround_bugs|= FF_BUG_UMP4;
            s->workaround_bugs|= FF_BUG_AC_VLC;
        }
        
        if(s->divx_version==500)
            s->workaround_bugs|= FF_BUG_NO_PADDING;

        /* very ugly XVID padding bug detection FIXME/XXX solve this differently
         * lets hope this at least works

           && s->codec_id==CODEC_ID_MPEG4 && s->vo_type==0)
            s->workaround_bugs|= FF_BUG_NO_PADDING;
        
        if(s->lavc_build && s->lavc_build<4609) //FIXME not sure about the version num but a 4609 file seems ok
            s->workaround_bugs|= FF_BUG_NO_PADDING;
    }
    

#if 0 // dump bits per frame / qp / complexity
{

750:4adadf210b3b

                if(ret==SLICE_END){
//printf("%d %d %06X\n", s->mb_x, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24));
                    s->error_status_table[xy]|= AC_END;
                    if(!s->partitioned_frame)
                        s->error_status_table[xy]|= MV_END|DC_END;

                    s->padding_bug_score--;
                        
                    if(++s->mb_x >= s->mb_width){
                        s->mb_x=0;
                        ff_draw_horiz_band(s);
                        s->mb_y++;
                    }

        s->mb_x= 0;
    }
    
    assert(s->mb_x==0 && s->mb_y==s->mb_height);

    /* try to detect the padding bug */
    if(      s->codec_id==CODEC_ID_MPEG4
       &&   (s->workaround_bugs&FF_BUG_AUTODETECT) 
       &&    s->gb.size*8 - get_bits_count(&s->gb) >=0
       &&    s->gb.size*8 - get_bits_count(&s->gb) < 48
       &&   !s->resync_marker
       &&   !s->data_partitioning){
        
        const int bits_count= get_bits_count(&s->gb);
        const int bits_left = s->gb.size*8 - bits_count;
        
        if(bits_left==0 || bits_left>8){
            s->padding_bug_score++;
        } else {
            int v= show_bits(&s->gb, 8);
            v|= 0x7F >> (7-(bits_count&7));
                
            if(v==0x7F)
                s->padding_bug_score--;
            else
                s->padding_bug_score++;            
        }
        
        if(s->padding_bug_score > -2)
            s->workaround_bugs |=  FF_BUG_NO_PADDING;
        else
            s->workaround_bugs &= ~FF_BUG_NO_PADDING;
    }

    // handle formats which dont have unique end markers
    if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
        int left= s->gb.size*8 - get_bits_count(&s->gb);
        int max_extra=7;
        

        }else
            s->error_status_table[s->mb_num-1]|= AC_END|MV_END|DC_END;
        
        return 0;
    }

    fprintf(stderr, "slice end not reached but screenspace end (%d left %06X)\n", 
            s->gb.size*8 - get_bits_count(&s->gb),
            show_bits(&s->gb, 24));
    return -1;
}

                
        if(s->avctx->fourcc == ff_get_fourcc("UMP4")){
            s->workaround_bugs|= FF_BUG_UMP4;
            s->workaround_bugs|= FF_BUG_AC_VLC;
        }
//printf("padding_bug_score: %d\n", s->padding_bug_score);
#if 0
        if(s->divx_version==500)
            s->workaround_bugs|= FF_BUG_NO_PADDING;

        /* very ugly XVID padding bug detection FIXME/XXX solve this differently
         * lets hope this at least works

           && s->codec_id==CODEC_ID_MPEG4 && s->vo_type==0)
            s->workaround_bugs|= FF_BUG_NO_PADDING;
        
        if(s->lavc_build && s->lavc_build<4609) //FIXME not sure about the version num but a 4609 file seems ok
            s->workaround_bugs|= FF_BUG_NO_PADDING;
#endif
    }
    

#if 0 // dump bits per frame / qp / complexity
{