[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[277] mplayerxp

[<nic...@us...>]

Revision: 277
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=277&view=rev
Author:   nickols_k
Date:     2012-11-02 07:05:34 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
simplify code

Modified Paths:
--------------
    mplayerxp/libvo/video_out.c
    mplayerxp/libvo/video_out.h
    mplayerxp/postproc/vf_vo.c

Modified: mplayerxp/libvo/video_out.c
===================================================================
--- mplayerxp/libvo/video_out.c	2012-11-01 17:11:30 UTC (rev 276)
+++ mplayerxp/libvo/video_out.c	2012-11-02 07:05:34 UTC (rev 277)
@@ -511,13 +511,12 @@
     pthread_mutex_unlock(&priv->surfaces_mutex);
 }
 
-uint32_t __FASTCALL__ vo_get_surface(vo_data_t*vo,mp_image_t* mpi, unsigned decoder_idx)
+uint32_t __FASTCALL__ vo_get_surface(vo_data_t*vo,mp_image_t* mpi)
 {
     vo_priv_t* priv=(vo_priv_t*)vo->vo_priv;
     int width_less_stride;
     MSG_DBG2("dri_vo_dbg: vo_get_surface type=%X flg=%X\n",mpi->type,mpi->flags);
     width_less_stride = 0;
-    mpi->xp_idx = decoder_idx;
     if(mpi->flags & MP_IMGFLAG_PLANAR)
     {
 	width_less_stride = mpi->w <= priv->dri.cap.strides[0] &&
@@ -555,9 +554,9 @@
 	if((((mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE) && width_less_stride) || priv->dri.planes_eq) && priv->dri.dr)
 	{
 	    vo_lock_surfaces(vo);
-	    mpi->planes[0]=priv->dri.surf[decoder_idx].planes[0]+priv->dri.off[0];
-	    mpi->planes[1]=priv->dri.surf[decoder_idx].planes[1]+priv->dri.off[1];
-	    mpi->planes[2]=priv->dri.surf[decoder_idx].planes[2]+priv->dri.off[2];
+	    mpi->planes[0]=priv->dri.surf[mpi->xp_idx].planes[0]+priv->dri.off[0];
+	    mpi->planes[1]=priv->dri.surf[mpi->xp_idx].planes[1]+priv->dri.off[1];
+	    mpi->planes[2]=priv->dri.surf[mpi->xp_idx].planes[2]+priv->dri.off[2];
 	    mpi->stride[0]=priv->dri.cap.strides[0];
 	    mpi->stride[1]=priv->dri.cap.strides[1];
 	    mpi->stride[2]=priv->dri.cap.strides[2];

Modified: mplayerxp/libvo/video_out.h
===================================================================
--- mplayerxp/libvo/video_out.h	2012-11-01 17:11:30 UTC (rev 276)
+++ mplayerxp/libvo/video_out.h	2012-11-02 07:05:34 UTC (rev 277)
@@ -263,7 +263,7 @@
 
 extern void		vo_lock_surfaces(vo_data_t* vo);
 extern void		vo_unlock_surfaces(vo_data_t* vo);
-extern uint32_t	 __FASTCALL__ vo_get_surface(vo_data_t* vo,mp_image_t* mpi,unsigned decoder_idx);
+extern uint32_t	 __FASTCALL__ vo_get_surface(vo_data_t* vo,mp_image_t* mpi);
 
 extern int		vo_check_events(vo_data_t* vo);
 extern unsigned	 __FASTCALL__ vo_get_num_frames(vo_data_t* vo);

Modified: mplayerxp/postproc/vf_vo.c
===================================================================
--- mplayerxp/postproc/vf_vo.c	2012-11-01 17:11:30 UTC (rev 276)
+++ mplayerxp/postproc/vf_vo.c	2012-11-02 07:05:34 UTC (rev 277)
@@ -124,7 +124,7 @@
     unsigned i;
     int finalize = vo_is_final(vo_data);
     struct vf_priv_s *priv = vf->priv;
-    retval=vo_get_surface(vo_data,mpi,mpi->xp_idx);
+    retval=vo_get_surface(vo_data,mpi);
     if(retval==CONTROL_TRUE) {
 	mpi->flags |= MP_IMGFLAG_FINAL|MP_IMGFLAG_DIRECT;
 	if(finalize) mpi->flags |= MP_IMGFLAG_FINALIZED;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.