[MPlayer-dev-eng] [PATCH] further dvr-ms playback improvements

[Dominik 'Rathann' Mierzejewski]

On Saturday, 16 September 2006 at 18:28, John Donaghy wrote:
[...]
> Index: libmpdemux/video.c
> ===================================================================
> --- libmpdemux/video.c	(revision 19837)
> +++ libmpdemux/video.c	(working copy)
> @@ -581,19 +581,21 @@
>        case DEMUXER_TYPE_VIVO:
>        case DEMUXER_TYPE_OGG:
>        case DEMUXER_TYPE_ASF: {
> -        float next_pts = ds_get_next_pts(d_video);
> -        float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1;
> -        if(d>=0){
> -          if(d>0){
> -            if((int)sh_video->fps==1000)
> -              mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps             \n",(int)(1.0f/d));
> -	    sh_video->frametime=d; // 1ms
> -            sh_video->fps=1.0f/d;
> -	  }
> -          frame_time = d;
> -        } else {
> -          mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value (%5.3f/%5.3f => %5.3f). Defaulting to %5.3f sec.\n",d_video->pts,next_pts,d,frame_time);
> -          // frame_time = 1/25.0;
> +        if((int)sh_video->fps==1000){
> +          float next_pts = ds_get_next_pts(d_video);
> +          float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1;
> +          if(d>=0){
> +            if(d>0){
> +              //if((int)sh_video->fps==1000)
> +              //  mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps             \n",(int)(1.0f/d));
> +              sh_video->frametime=d; // 1ms
> +              //sh_video->fps=1.0f/d;
> +            }
> +            frame_time = d;
> +          } else {
> +            mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value (%5.3f/%5.3f => %5.3f). Defaulting to %5.3f sec.\n",d_video->pts,next_pts,d,frame_time);
> +            // frame_time = 1/25.0;
> +          }
>          }
>        }
>        break;

There's a lot of cosmetic changes here. Please send them in a separate patch.

Regards,
R.

-- 
MPlayer developer and RPMs maintainer: http://rpm.greysector.net/mplayer/
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
	-- from "Collected Sayings of Muad'Dib" by the Princess Irulan