[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] =?utf-8?q?HG=3A_xine-lib-1=2E2=3A_Cosmetics?=
From:       Torsten_Jager <t.jager () gmx ! de>
Date:       2012-07-03 19:25:44
Message-ID: 3120a2bb4039340fdf6d.1341079923 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Torsten Jager <t.jager@gmx.de>
# Date 1341079923 -10800
# Node ID 3120a2bb4039340fdf6dbe33359ba224ca459fca
# Branch  default
# Parent  fd3e2cd02764cb7510c675ad03b150f98daf2d68
Cosmetics

diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -233,6 +233,51 @@
   return capabilities;
 }
 
+static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
+  _x_vo_scale_compute_ideal_size( &frame->sc );
+}
+
+static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
+  _x_vo_scale_compute_output_size( &frame->sc );
+
+  /* avoid problems in yuv2rgb */
+  if (frame->sc.output_height < 1)
+    frame->sc.output_height = 1;
+  if (frame->sc.output_width < 8)
+    frame->sc.output_width = 8;
+  if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
+    frame->sc.output_width++;
+
+  lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
+	  frame->vo_frame.id,
+	  frame->sc.delivered_width, frame->sc.delivered_height,
+	  frame->sc.output_width, frame->sc.output_height,
+	  ( frame->sc.delivered_width != frame->sc.output_width
+	    || frame->sc.delivered_height != frame->sc.output_height
+	    ? ", software scaling"
+	   : "" )
+	  );
+}
+
+static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
+  xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
+  /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
+
+  switch (which_field) {
+  case VO_TOP_FIELD:
+    frame->rgb_dst = frame->image;
+    break;
+  case VO_BOTTOM_FIELD:
+    frame->rgb_dst = frame->image + frame->bytes_per_line;
+    break;
+  case VO_BOTH_FIELDS:
+    frame->rgb_dst = frame->image;
+    break;
+  }
+
+  frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
+}
+
 static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
   xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
   /*xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
@@ -260,25 +305,6 @@
   lprintf ("copy...done\n");
 }
 
-static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
-  xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
-  /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
-
-  switch (which_field) {
-  case VO_TOP_FIELD:
-    frame->rgb_dst = frame->image;
-    break;
-  case VO_BOTTOM_FIELD:
-    frame->rgb_dst = frame->image + frame->bytes_per_line;
-    break;
-  case VO_BOTH_FIELDS:
-    frame->rgb_dst = frame->image;
-    break;
-  }
-
-  frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
-}
-
 static void xshm_frame_dispose (vo_frame_t *vo_img) {
   xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
   xshm_driver_t *this  = (xshm_driver_t *) vo_img->driver;
@@ -329,32 +355,6 @@
   return (vo_frame_t *) frame;
 }
 
-static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
-  _x_vo_scale_compute_ideal_size( &frame->sc );
-}
-
-static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
-  _x_vo_scale_compute_output_size( &frame->sc );
-
-  /* avoid problems in yuv2rgb */
-  if (frame->sc.output_height < 1)
-    frame->sc.output_height = 1;
-  if (frame->sc.output_width < 8)
-    frame->sc.output_width = 8;
-  if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
-    frame->sc.output_width++;
-
-  lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
-	  frame->vo_frame.id,
-	  frame->sc.delivered_width, frame->sc.delivered_height,
-	  frame->sc.output_width, frame->sc.output_height,
-	  ( frame->sc.delivered_width != frame->sc.output_width
-	    || frame->sc.delivered_height != frame->sc.output_height
-	    ? ", software scaling"
-	   : "" )
-	  );
-}
-
 static void xshm_update_frame_format (vo_driver_t *this_gen,
 				      vo_frame_t *frame_gen,
 				      uint32_t width, uint32_t height,
 --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -325,6 +325,51 @@
   return capabilities;
 }
 
+static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
+  _x_vo_scale_compute_ideal_size( &frame->sc );
+}
+
+static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
+  _x_vo_scale_compute_output_size( &frame->sc );
+
+  /* avoid problems in yuv2rgb */
+  if (frame->sc.output_height < 1)
+    frame->sc.output_height = 1;
+  if (frame->sc.output_width < 8)
+    frame->sc.output_width = 8;
+  if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
+    frame->sc.output_width++;
+
+  lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
+	  frame->vo_frame.id,
+	  frame->sc.delivered_width, frame->sc.delivered_height,
+	  frame->sc.output_width, frame->sc.output_height,
+	  ( frame->sc.delivered_width != frame->sc.output_width
+	    || frame->sc.delivered_height != frame->sc.output_height
+	    ? ", software scaling"
+	   : "" )
+	  );
+}
+
+static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
+  xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
+  /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
+
+  switch (which_field) {
+  case VO_TOP_FIELD:
+    frame->rgb_dst    = (uint8_t *)frame->image->data;
+    break;
+  case VO_BOTTOM_FIELD:
+    frame->rgb_dst    = (uint8_t *)frame->image->data + frame->image->bytes_per_line ;
+    break;
+  case VO_BOTH_FIELDS:
+    frame->rgb_dst    = (uint8_t *)frame->image->data;
+    break;
+  }
+
+  frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
+}
+
 static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
   xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
   /*xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
@@ -352,25 +397,6 @@
   lprintf ("copy...done\n");
 }
 
-static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
-  xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
-  /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
-
-  switch (which_field) {
-  case VO_TOP_FIELD:
-    frame->rgb_dst    = (uint8_t *)frame->image->data;
-    break;
-  case VO_BOTTOM_FIELD:
-    frame->rgb_dst    = (uint8_t *)frame->image->data + frame->image->bytes_per_line ;
-    break;
-  case VO_BOTH_FIELDS:
-    frame->rgb_dst    = (uint8_t *)frame->image->data;
-    break;
-  }
-
-  frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
-}
-
 static void xshm_frame_dispose (vo_frame_t *vo_img) {
   xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
   xshm_driver_t *this  = (xshm_driver_t *) vo_img->driver;
@@ -421,32 +447,6 @@
   return (vo_frame_t *) frame;
 }
 
-static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
-  _x_vo_scale_compute_ideal_size( &frame->sc );
-}
-
-static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
-  _x_vo_scale_compute_output_size( &frame->sc );
-
-  /* avoid problems in yuv2rgb */
-  if (frame->sc.output_height < 1)
-    frame->sc.output_height = 1;
-  if (frame->sc.output_width < 8)
-    frame->sc.output_width = 8;
-  if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
-    frame->sc.output_width++;
-
-  lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
-	  frame->vo_frame.id,
-	  frame->sc.delivered_width, frame->sc.delivered_height,
-	  frame->sc.output_width, frame->sc.output_height,
-	  ( frame->sc.delivered_width != frame->sc.output_width
-	    || frame->sc.delivered_height != frame->sc.output_height
-	    ? ", software scaling"
-	   : "" )
-	  );
-}
-
 static void xshm_update_frame_format (vo_driver_t *this_gen,
 				      vo_frame_t *frame_gen,
 				      uint32_t width, uint32_t height,

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]