comparison dv.c @ 1221:867d8f0bede6 libavcodec

* fixing NTSC frame rate for DV streams * let ffmpeg preserve 'aspect_ratio' for recoding. Do we want to make it tweakable from the command line ?

1220:78a51075aacb

    
    /* init size */
    width = 720;
    if (dsf) {
        avctx->frame_rate = 25;
        packet_size = PAL_FRAME_SIZE;
        height = 576;
        nb_dif_segs = 12;
    } else {
        avctx->frame_rate = 30;
        packet_size = NTSC_FRAME_SIZE;
        height = 480;
        nb_dif_segs = 10;
    }
    avctx->frame_rate_base= 1;
    /* NOTE: we only accept several full frames */
    if (buf_size < packet_size)
        return -1;
    
    /* NTSC[dsf == 0] is always 720x480, 4:1:1

    if (quant > 1)
	return -1; /* Unsupported quantization */

    avctx->sample_rate = dv_audio_frequency[freq];
    avctx->channels = 2;
    // What about:
    // avctx->bit_rate = 
    // avctx->frame_size =
   
    *data_size = (dv_audio_min_samples[sys][freq] + smpls) * 
	         avctx->channels * 2;

1221:867d8f0bede6

    
    /* init size */
    width = 720;
    if (dsf) {
        avctx->frame_rate = 25;
	avctx->frame_rate_base = 1;
        packet_size = PAL_FRAME_SIZE;
        height = 576;
        nb_dif_segs = 12;
    } else {
        avctx->frame_rate = 30000;
	avctx->frame_rate_base = 1001;
        packet_size = NTSC_FRAME_SIZE;
        height = 480;
        nb_dif_segs = 10;
    }
    /* NOTE: we only accept several full frames */
    if (buf_size < packet_size)
        return -1;
    
    /* NTSC[dsf == 0] is always 720x480, 4:1:1

    if (quant > 1)
	return -1; /* Unsupported quantization */

    avctx->sample_rate = dv_audio_frequency[freq];
    avctx->channels = 2;
    avctx->bit_rate = avctx->channels * avctx->sample_rate * 16;
    // What about:
    // avctx->frame_size =
   
    *data_size = (dv_audio_min_samples[sys][freq] + smpls) * 
	         avctx->channels * 2;