[Mplayer-cvslog] CVS: main mplayer.c,1.462,1.463

[Felix Buenemann]

On Thursday 11 April 2002 17:05, Atmosfear wrote:
> Update of /cvsroot/mplayer/main
> In directory mplayer:/var/tmp.root/cvs-serv17396
>
> Modified Files:
> 	mplayer.c
> Log Message:
> Fix dvdsub duration that got broke by fix for vobsub duration.
>
>
> Index: mplayer.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/mplayer.c,v
> retrieving revision 1.462
> retrieving revision 1.463
> diff -u -r1.462 -r1.463
> --- mplayer.c	7 Apr 2002 18:00:40 -0000	1.462
> +++ mplayer.c	11 Apr 2002 15:05:51 -0000	1.463
> @@ -2889,9 +2889,9 @@
>      current_module="spudec";
>      while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
>        mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d  v_pts=%5.3f 
> s_pts=%5.3f  \n",len,d_video->pts,d_dvdsub->pts); -     
> spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts);
> +      spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts/1024);
>      }
> -    spudec_heartbeat(vo_spudec,90000*d_video->pts);
> +    spudec_heartbeat(vo_spudec,90000*d_video->pts/1024);
>
>      /* Don't know how to detect wether the sub has changed or not */
>      vo_osd_changed(1);
>

This is FIX because you in rev 1.458 wrongly applied a patch, see your commits 
comments:
fixed SPU pts, it's 1024/90000 based instead of 1/100

but you changed:
@@ -2700,15 +2695,14 @@
     current_module="spudec";
     while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
       mp_msg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d  v_pts=%5.3f  s_pts=%5.3f  
\n",len,d_video->pts,d_dvdsub->pts);
-      spudec_assemble(vo_spudec,packet,len,100*d_dvdsub->pts);
+      spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts);
     }
-    spudec_heartbeat(vo_spudec,100*d_video->pts);
+    spudec_heartbeat(vo_spudec,90000*d_video->pts);

note that in the original patch it was:
-    spudec_heartbeat(vo_spudec,100*d_video->pts);
+    spudec_heartbeat(vo_spudec,90000*d_video->pts/1024);

-- 
Best Regards,
        Atmos
____________________________________________
- MPlayer Developer - http://mplayerhq.hu/ -
____________________________________________