[Mplayer-cvslog] CVS: main/libvo vo_xv.c,1.70,1.71

[Atmosfear]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv28166/libvo

Modified Files:
	vo_xv.c 
Log Message:
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>


Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- vo_xv.c	13 Apr 2002 19:14:33 -0000	1.70
+++ vo_xv.c	14 Apr 2002 22:15:29 -0000	1.71
@@ -493,24 +493,48 @@
   * allocate XvImages.  FIXME: no error checking, without
   * mit-shm this will bomb...
   */
- xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]);
-
- Shminfo[foo].shmid    = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
- Shminfo[foo].shmaddr  = (char *) shmat(Shminfo[foo].shmid, 0, 0);
- Shminfo[foo].readOnly = False;
+ if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1;
+ else
+  {
+   Shmem_Flag = 0;
+   if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xv\n" );
+  }
+ if ( Shmem_Flag ) 
+  {
+   xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]);
 
- xvimage[foo]->data = Shminfo[foo].shmaddr;
- XShmAttach(mDisplay, &Shminfo[foo]);
- XSync(mDisplay, False);
- shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
+   Shminfo[foo].shmid    = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
+   Shminfo[foo].shmaddr  = (char *) shmat(Shminfo[foo].shmid, 0, 0);
+   Shminfo[foo].readOnly = False;
+
+   xvimage[foo]->data = Shminfo[foo].shmaddr;
+   XShmAttach(mDisplay, &Shminfo[foo]);
+   XSync(mDisplay, False);
+   shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
+  }
+ else
+  {
+    xvimage[foo] = XvCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height);
+    xvimage[foo]->data = malloc(xvimage[foo]->data_size);
+    XSync(mDisplay,False);
+  }
  memset(xvimage[foo]->data,128,xvimage[foo]->data_size);
  return;
 }
 
 static void deallocate_xvimage(int foo)
 {
- XShmDetach( mDisplay,&Shminfo[foo] );
- shmdt( Shminfo[foo].shmaddr );
+ if ( Shmem_Flag )
+  {
+   XShmDetach( mDisplay,&Shminfo[foo] );
+   shmdt( Shminfo[foo].shmaddr );
+  }
+ else
+  {
+   free(xvimage[foo]->data);
+  }
+ XFree(xvimage[foo]);
+ 
  XFlush( mDisplay );
  XSync(mDisplay, False);
  return;
@@ -541,8 +565,16 @@
   }
  if ( e & VO_EVENT_EXPOSE )
   {
-   XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0,  image_width, image_height, drwX, drwY, 1, 1, False);
-   XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0,  image_width, image_height, drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight), False);
+   if ( Shmem_Flag )
+    {
+     XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0,  image_width, image_height, drwX, drwY, 1, 1, False);
+     XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0,  image_width, image_height, drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight), False);
+    }
+   else
+    {
+     XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0,  image_width, image_height, drwX, drwY, 1, 1);
+     XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0,  image_width, image_height, drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight));
+    }
   }
 }
 
@@ -551,10 +583,19 @@
 
 static void flip_page(void)
 {
- XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
+ if ( Shmem_Flag )
+  {
+   XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
          0, 0,  image_width, image_height,
          drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight),
          False);
+  }
+ else
+  {
+   XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf],
+         0, 0,  image_width, image_height,
+         drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight));
+  }
  if (num_buffers>1){
     current_buf=(current_buf+1)%num_buffers;
     XFlush(mDisplay);