comparison mpeg12.c @ 1891:f403b3e286b3 libavcodec

use pan_scan to remove some weight, proper pan_scan offset reading

1890:a07406ac4725

typedef struct Mpeg1Context {
    MpegEncContext mpeg_enc_ctx;
    int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
    int repeat_field; /* true if we must repeat the field */
    int display_weight;
    int display_height;
    AVPanScan pan_scan; /** some temporary storage for the panscan */
    int slice_count;
    int swap_uv;//indicate VCR2
    int save_aspect_info;

                frame_rate_tab[s->frame_rate_index].num * (s->frame_rate_ext_n+1),
                frame_rate_tab[s->frame_rate_index].den * (s->frame_rate_ext_d+1),
                1<<30);
        //mpeg2 aspect
            if(s->aspect_ratio_info > 1){
                if( (s1->display_weight == 0 )||(s1->display_height == 0) ){
                    s->avctx->sample_aspect_ratio= 
                        av_div_q(
                         mpeg2_aspect[s->aspect_ratio_info], 
                         (AVRational){s->width, s->height}
                         );
                }else{
                    s->avctx->sample_aspect_ratio= 
                        av_div_q(
                         mpeg2_aspect[s->aspect_ratio_info], 
                         (AVRational){s1->display_weight, s1->display_height}
                        );
        	}
            }else{
                s->avctx->sample_aspect_ratio= 
                    mpeg2_aspect[s->aspect_ratio_info];

    h= get_bits(&s->gb, 14);
    skip_bits(&s->gb, 1); //marker
    
    s1->pan_scan.width= 16*w;
    s1->pan_scan.height=16*h;
    
    s1->display_weight = w;
    s1->display_height = h;

    
    if(s->avctx->debug & FF_DEBUG_PICT_INFO)
        av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h);
}

static void mpeg_decode_picture_display_extension(Mpeg1Context *s1)
{
    MpegEncContext *s= &s1->mpeg_enc_ctx;
    int i;

    for(i=0; i<1; i++){ //FIXME count
        s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16);
        skip_bits(&s->gb, 1); //marker
        s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16);
        skip_bits(&s->gb, 1); //marker
    }

1891:f403b3e286b3

typedef struct Mpeg1Context {
    MpegEncContext mpeg_enc_ctx;
    int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
    int repeat_field; /* true if we must repeat the field */
    AVPanScan pan_scan; /** some temporary storage for the panscan */
    int slice_count;
    int swap_uv;//indicate VCR2
    int save_aspect_info;

                frame_rate_tab[s->frame_rate_index].num * (s->frame_rate_ext_n+1),
                frame_rate_tab[s->frame_rate_index].den * (s->frame_rate_ext_d+1),
                1<<30);
        //mpeg2 aspect
            if(s->aspect_ratio_info > 1){
                if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) ){
                    s->avctx->sample_aspect_ratio= 
                        av_div_q(
                         mpeg2_aspect[s->aspect_ratio_info], 
                         (AVRational){s->width, s->height}
                         );
                }else{
                    s->avctx->sample_aspect_ratio= 
                        av_div_q(
                         mpeg2_aspect[s->aspect_ratio_info], 
                         (AVRational){s1->pan_scan.width, s1->pan_scan.height}
                        );
        	}
            }else{
                s->avctx->sample_aspect_ratio= 
                    mpeg2_aspect[s->aspect_ratio_info];

    h= get_bits(&s->gb, 14);
    skip_bits(&s->gb, 1); //marker
    
    s1->pan_scan.width= 16*w;
    s1->pan_scan.height=16*h;
        
    if(s->avctx->debug & FF_DEBUG_PICT_INFO)
        av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h);
}

static void mpeg_decode_picture_display_extension(Mpeg1Context *s1)
{
    MpegEncContext *s= &s1->mpeg_enc_ctx;
    int i,nofco;

    nofco = 1;
    if(s->progressive_sequence){
        if(s->repeat_first_field){
	    nofco++;
	    if(s->top_field_first)
	        nofco++;	
	}
    }else{
        if(s->picture_structure == PICT_FRAME){
            nofco++;
	    if(s->repeat_first_field)
	        nofco++;
	}
    }
    for(i=0; i<nofco; i++){
        s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16);
        skip_bits(&s->gb, 1); //marker
        s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16);
        skip_bits(&s->gb, 1); //marker
    }