Attachment #70548 for bug #105586

View | Details | Raw Unified | Return to bug 105586
Collapse All | Expand All





    switch (vob->ex_frc) {
	case 1: // 23.976
	    lavc_venc_context->time_base.den      = 24000;
	    lavc_venc_context->time_base.num = 1001;
	    break;
	case 2: // 24.000
	    lavc_venc_context->time_base.den      = 24000;
	    lavc_venc_context->time_base.num = 1000;
	    break;
	case 3: // 25.000
	    lavc_venc_context->time_base.den      = 25000;
	    lavc_venc_context->time_base.num = 1000;
	    break;
	case 4: // 29.970
	    lavc_venc_context->time_base.den      = 30000;
	    lavc_venc_context->time_base.num = 1001;
	    break;
	case 5: // 30.000
	    lavc_venc_context->time_base.den      = 30000;
	    lavc_venc_context->time_base.num = 1000;
	    break;
	case 6: // 50.000
	    lavc_venc_context->time_base.den      = 50000;
	    lavc_venc_context->time_base.num = 1000;
	    break;
	case 7: // 59.940
	    lavc_venc_context->time_base.den      = 60000;
	    lavc_venc_context->time_base.num = 1001;
	    break;
	case 8: // 60.000
	    lavc_venc_context->time_base.den      = 60000;
	    lavc_venc_context->time_base.num = 1000;
	    break;
	case 0: // not set
	default:
		if((vob->ex_fps > 29) && (vob->ex_fps < 30))
		{
	    	lavc_venc_context->time_base.den      = 30000;
	    	lavc_venc_context->time_base.num = 1001;
		}
		else
		{
	    	lavc_venc_context->time_base.den      = (int)(vob->ex_fps*1000.0);
	    	lavc_venc_context->time_base.num = 1000;
		}
	    break;
    }

    {
        switch (lavc_param_fps_code) {
	    case 1: // 23.976
	        lavc_venc_context->time_base.den      = 24000;
	        lavc_venc_context->time_base.num = 1001;
	        break;
	    case 2: // 24.000
	        lavc_venc_context->time_base.den      = 24000;
	        lavc_venc_context->time_base.num = 1000;
	        break;
	    case 3: // 25.000
	        lavc_venc_context->time_base.den      = 25000;
	        lavc_venc_context->time_base.num = 1000;
	        break;
	    case 4: // 29.970
	        lavc_venc_context->time_base.den      = 30000;
	        lavc_venc_context->time_base.num = 1001;
	        break;
	    case 5: // 30.000
    	    lavc_venc_context->time_base.den      = 30000;
	        lavc_venc_context->time_base.num = 1000;
	        break;
	    case 6: // 50.000
	        lavc_venc_context->time_base.den      = 50000;
	        lavc_venc_context->time_base.num = 1000;
	        break;
	    case 7: // 59.940
	        lavc_venc_context->time_base.den      = 60000;
	        lavc_venc_context->time_base.num = 1001;
	        break;
	    case 8: // 60.000
	        lavc_venc_context->time_base.den      = 60000;
	        lavc_venc_context->time_base.num = 1000;
	        break;
	    case 0: // not set
	    default:
	        //lavc_venc_context->time_base.den      = (int)(vob->ex_fps*1000.0);
	        //lavc_venc_context->time_base.num = 1000;
	    break;
        }
    }

Return to bug 105586

Lines 674-721 Link Here

(-)export_ffmpeg.c.orig (-38 / +38 lines)
674		674
675	switch (vob->ex_frc) {	675	switch (vob->ex_frc) {
676	case 1: // 23.976	676	case 1: // 23.976
677	lavc_venc_context->frame_rate = 24000;	677	lavc_venc_context->time_base.den = 24000;
678	lavc_venc_context->frame_rate_base = 1001;	678	lavc_venc_context->time_base.num = 1001;
679	break;	679	break;
680	case 2: // 24.000	680	case 2: // 24.000
681	lavc_venc_context->frame_rate = 24000;	681	lavc_venc_context->time_base.den = 24000;
682	lavc_venc_context->frame_rate_base = 1000;	682	lavc_venc_context->time_base.num = 1000;
683	break;	683	break;
684	case 3: // 25.000	684	case 3: // 25.000
685	lavc_venc_context->frame_rate = 25000;	685	lavc_venc_context->time_base.den = 25000;
686	lavc_venc_context->frame_rate_base = 1000;	686	lavc_venc_context->time_base.num = 1000;
687	break;	687	break;
688	case 4: // 29.970	688	case 4: // 29.970
689	lavc_venc_context->frame_rate = 30000;	689	lavc_venc_context->time_base.den = 30000;
690	lavc_venc_context->frame_rate_base = 1001;	690	lavc_venc_context->time_base.num = 1001;
691	break;	691	break;
692	case 5: // 30.000	692	case 5: // 30.000
693	lavc_venc_context->frame_rate = 30000;	693	lavc_venc_context->time_base.den = 30000;
694	lavc_venc_context->frame_rate_base = 1000;	694	lavc_venc_context->time_base.num = 1000;
695	break;	695	break;
696	case 6: // 50.000	696	case 6: // 50.000
697	lavc_venc_context->frame_rate = 50000;	697	lavc_venc_context->time_base.den = 50000;
698	lavc_venc_context->frame_rate_base = 1000;	698	lavc_venc_context->time_base.num = 1000;
699	break;	699	break;
700	case 7: // 59.940	700	case 7: // 59.940
701	lavc_venc_context->frame_rate = 60000;	701	lavc_venc_context->time_base.den = 60000;
702	lavc_venc_context->frame_rate_base = 1001;	702	lavc_venc_context->time_base.num = 1001;
703	break;	703	break;
704	case 8: // 60.000	704	case 8: // 60.000
705	lavc_venc_context->frame_rate = 60000;	705	lavc_venc_context->time_base.den = 60000;
706	lavc_venc_context->frame_rate_base = 1000;	706	lavc_venc_context->time_base.num = 1000;
707	break;	707	break;
708	case 0: // not set	708	case 0: // not set
709	default:	709	default:
710	if((vob->ex_fps > 29) && (vob->ex_fps < 30))	710	if((vob->ex_fps > 29) && (vob->ex_fps < 30))
711	{	711	{
712	lavc_venc_context->frame_rate = 30000;	712	lavc_venc_context->time_base.den = 30000;
713	lavc_venc_context->frame_rate_base = 1001;	713	lavc_venc_context->time_base.num = 1001;
714	}	714	}
715	else	715	else
716	{	716	{
717	lavc_venc_context->frame_rate = (int)(vob->ex_fps*1000.0);	717	lavc_venc_context->time_base.den = (int)(vob->ex_fps*1000.0);
718	lavc_venc_context->frame_rate_base = 1000;	718	lavc_venc_context->time_base.num = 1000;
719	}	719	}
720	break;	720	break;
721	}	721	}
Lines 732-772 Link Here
732	{	732	{
733	switch (lavc_param_fps_code) {	733	switch (lavc_param_fps_code) {
734	case 1: // 23.976	734	case 1: // 23.976
735	lavc_venc_context->frame_rate = 24000;	735	lavc_venc_context->time_base.den = 24000;
736	lavc_venc_context->frame_rate_base = 1001;	736	lavc_venc_context->time_base.num = 1001;
737	break;	737	break;
738	case 2: // 24.000	738	case 2: // 24.000
739	lavc_venc_context->frame_rate = 24000;	739	lavc_venc_context->time_base.den = 24000;
740	lavc_venc_context->frame_rate_base = 1000;	740	lavc_venc_context->time_base.num = 1000;
741	break;	741	break;
742	case 3: // 25.000	742	case 3: // 25.000
743	lavc_venc_context->frame_rate = 25000;	743	lavc_venc_context->time_base.den = 25000;
744	lavc_venc_context->frame_rate_base = 1000;	744	lavc_venc_context->time_base.num = 1000;
745	break;	745	break;
746	case 4: // 29.970	746	case 4: // 29.970
747	lavc_venc_context->frame_rate = 30000;	747	lavc_venc_context->time_base.den = 30000;
748	lavc_venc_context->frame_rate_base = 1001;	748	lavc_venc_context->time_base.num = 1001;
749	break;	749	break;
750	case 5: // 30.000	750	case 5: // 30.000
751	lavc_venc_context->frame_rate = 30000;	751	lavc_venc_context->time_base.den = 30000;
752	lavc_venc_context->frame_rate_base = 1000;	752	lavc_venc_context->time_base.num = 1000;
753	break;	753	break;
754	case 6: // 50.000	754	case 6: // 50.000
755	lavc_venc_context->frame_rate = 50000;	755	lavc_venc_context->time_base.den = 50000;
756	lavc_venc_context->frame_rate_base = 1000;	756	lavc_venc_context->time_base.num = 1000;
757	break;	757	break;
758	case 7: // 59.940	758	case 7: // 59.940
759	lavc_venc_context->frame_rate = 60000;	759	lavc_venc_context->time_base.den = 60000;
760	lavc_venc_context->frame_rate_base = 1001;	760	lavc_venc_context->time_base.num = 1001;
761	break;	761	break;
762	case 8: // 60.000	762	case 8: // 60.000
763	lavc_venc_context->frame_rate = 60000;	763	lavc_venc_context->time_base.den = 60000;
764	lavc_venc_context->frame_rate_base = 1000;	764	lavc_venc_context->time_base.num = 1000;
765	break;	765	break;
766	case 0: // not set	766	case 0: // not set
767	default:	767	default:
768	//lavc_venc_context->frame_rate = (int)(vob->ex_fps*1000.0);	768	//lavc_venc_context->time_base.den = (int)(vob->ex_fps*1000.0);
769	//lavc_venc_context->frame_rate_base = 1000;	769	//lavc_venc_context->time_base.num = 1000;
770	break;	770	break;
771	}	771	}
772	}	772	}