[Mplayer-cvslog] CVS: main mplayer.c,1.122,1.123

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv30489

Modified Files:
	mplayer.c 
Log Message:
support for new opendivx decore API

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -r1.122 -r1.123
*** mplayer.c	2001/05/20 13:06:33	1.122
--- mplayer.c	2001/05/22 23:17:31	1.123
***************
*** 268,271 ****
--- 268,272 ----
  //#include "dec_audio.c"
  
+ #ifndef NEW_DECORE
  //**************************************************************************//
  //             The OpenDivX stuff:
***************
*** 290,293 ****
--- 291,295 ----
      opendivx_stride[2]=stride_uv;
  }
+ #endif
  
  //**************************************************************************//
***************
*** 1218,1225 ****
     { DEC_PARAM dec_param;
       DEC_SET dec_set;
! //     DEC_MEM_REQS dec_mem;
  	dec_param.x_dim = sh_video->bih->biWidth;
  	dec_param.y_dim = sh_video->bih->biHeight;
! #if 0
          // 0.50-CVS
          decore(0x123, DEC_OPT_MEMORY_REQS, &dec_param, &dec_mem);
--- 1220,1230 ----
     { DEC_PARAM dec_param;
       DEC_SET dec_set;
! #ifdef NEW_DECORE
!      DEC_MEM_REQS dec_mem;
  	dec_param.x_dim = sh_video->bih->biWidth;
  	dec_param.y_dim = sh_video->bih->biHeight;
!         dec_param.output_format=DEC_USER;
! #endif
! #ifdef NEW_DECORE
          // 0.50-CVS
          decore(0x123, DEC_OPT_MEMORY_REQS, &dec_param, &dec_mem);
***************
*** 1702,1705 ****
--- 1707,1713 ----
      unsigned int t2;
      DEC_FRAME dec_frame;
+ #ifdef NEW_DECORE
+     DEC_PICTURE dec_pic;
+ #endif
      unsigned char* start=NULL;
      int in_size=ds_get_packet(d_video,&start);
***************
*** 1710,1716 ****
--- 1718,1741 ----
  	dec_frame.bitstream = start;
  	dec_frame.render_flag = 1;
+ #ifdef NEW_DECORE
+         dec_frame.bmp=&dec_pic;
+         dec_pic.y=dec_pic.u=dec_pic.v=NULL;
+ #endif
  	decore(0x123, 0, &dec_frame, NULL);
        t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
  
+ #ifdef NEW_DECORE
+       if(dec_pic.y){
+         void* src[3];
+         int stride[3];
+         src[0]=dec_pic.y;
+         src[1]=dec_pic.u;
+         src[2]=dec_pic.v;
+         stride[0]=dec_pic.stride_y;
+         stride[1]=stride[2]=dec_pic.stride_uv;
+         video_out->draw_slice(src,stride,
+                             sh_video->disp_w,sh_video->disp_h,0,0);
+       }
+ #else
        if(opendivx_src[0]){
          video_out->draw_slice(opendivx_src,opendivx_stride,
***************
*** 1718,1721 ****
--- 1743,1747 ----
          opendivx_src[0]=NULL;
        }
+ #endif
        t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
  


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog