[xine-cvs] CVS: xine-ui/src/xitk snapshot.c,1.30,1.31

[Matthias H. <ms...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11500/src/xitk

Modified Files:
	snapshot.c 
Log Message:
Fixed aspect ratio in snapshot function.


Index: snapshot.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/snapshot.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- snapshot.c	15 Jan 2005 22:11:55 -0000	1.30
+++ snapshot.c	19 May 2006 16:12:06 -0000	1.31
@@ -546,9 +546,9 @@
   int ov_width = image->v_width;
 
   /* new line widths NB scale factor is factored by 32768 for rounding */
-  int ny_width = (oy_width * image->scale_factor) / 32768;
-  int nu_width = (ou_width * image->scale_factor) / 32768;
-  int nv_width = (ov_width * image->scale_factor) / 32768;
+  int ny_width = (oy_width * image->scale_factor + 0x4000) / 32768;
+  int nu_width = (ou_width * image->scale_factor + 0x4000) / 32768;
+  int nv_width = (ov_width * image->scale_factor + 0x4000) / 32768;
 
   /* allocate new buffer space space for post-scaled line buffers */
   n_y = (uint8_t*)png_malloc( image->struct_ptr, ny_width * image->height );
@@ -594,8 +594,8 @@
   image->u_width = nu_width;
   image->v_width = nv_width;
 
-#ifdef DEBUG
-  printf("  Post scaled\n    Width %d %d %d\n    Height %d %d %d\n",
+#ifdef DEBUG 
+  fprintf(stderr, "  Post scaled\n    Width %d %d %d\n    Height %d %d %d\n",
     image->width, image->u_width, image->v_width,
     image->height, image->u_height, image->v_height );
 #endif
@@ -877,6 +877,7 @@
   int err = 0;
   struct prvt_image_s *image;
   int width, height, ratio_code, format;
+  double aspect, destaspect, scale;
   
 #ifdef DEBUG
   static int	   prof_scale_image = -1;
@@ -941,65 +942,62 @@
   }
 
 #ifdef DEBUG
-  printf("  width:  %d\n", image->width );
-  printf("  height: %d\n", image->height );
-  printf("  ratio:  " );
+  fprintf (stderr, "  width:  %d\n", image->width );
+  fprintf (stderr, "  height: %d\n", image->height );
 #endif
 
-  switch ( image->ratio_code ) {
+  aspect = image->width / (double) image->height;
+  switch (image->ratio_code) {
     case XINE_VO_ASPECT_SQUARE:
-#ifdef DEBUG
-      printf( "XINE_ASPECT_RATIO_SQUARE\n" ); 
-#endif
-      image->scale_line = scale_line_1_1;
-      image->scale_factor = ( 32768 * 1 ) / 1;
+      destaspect = 0;
+      scale = 1;
       break;
-
     case XINE_VO_ASPECT_4_3:
-#ifdef DEBUG
-      printf( "XINE_ASPECT_RATIO_4_3\n" ); 
-#endif
-      image->scale_line = scale_line_15_16;
-      image->scale_factor = ( 32768 * 16 ) / 15;
+      destaspect = 4 / 3.0;
       break;
-
     case XINE_VO_ASPECT_ANAMORPHIC: 
-#ifdef DEBUG
-      printf( "XINE_ASPECT_RATIO_ANAMORPHIC\n" ); 
-#endif
-      image->scale_line = scale_line_45_64;
-      image->scale_factor = ( 32768 * 64 ) / 45;
+      destaspect = 16 / 9.0;
       break;
-
     case XINE_VO_ASPECT_DVB:      
-#ifdef DEBUG
-      printf( "XINE_ASPECT_RATIO_211_1\n" ); 
-#endif
-      image->scale_line = scale_line_45_64;
-      image->scale_factor = ( 32768 * 64 ) / 45;
+      destaspect = 2.11;
       break;
-
     case XINE_VO_ASPECT_DONT_TOUCH: 
+    default: 
+      destaspect = 0;
+      scale = 1;
 #ifdef DEBUG
-      printf( "XINE_ASPECT_RATIO_DONT_TOUCH\n" ); 
+      printf( "Warning: unknown aspect ratio. will assume 1:1\n" ); 
 #endif
-      image->scale_line = scale_line_1_1;
-      image->scale_factor = ( 32768 * 1 ) / 1;
-      break;
-    default:                
-      /* the mpeg standard has a few that we don't know about */
+  }
+
+  if (destaspect > 0)
+    scale = destaspect / aspect;
+  /* image->scale_factor = 0x8000 * scale + .5; */
+
 #ifdef DEBUG
-      printf( "Warning: unknown aspect ratio. will assume 1:1\n" ); 
+  fprintf(stderr, "  input aspect: %g  output aspect: %g  pixel aspect: %g ",
+	 aspect, destaspect, scale);
 #endif
+      
+  if (scale > 0.99 && scale < 1.01) {
+      image->scale_factor = 0x8000;
+      image->scale_line = scale_line_1_1;
+  } else if (scale > 1.06 && scale < 1.075) {
+      image->scale_line = scale_line_15_16;
+      image->scale_factor = 0x8000 * 16 / 15;
+  } else if (scale > 1.41 && scale < 1.43) {
+      image->scale_line = scale_line_45_64;
+      image->scale_factor = 0x8000 * 64 / 45;
+  } else {
+      fprintf (stderr, "*** Scale image not implemented for destination aspect %g:1, pixel aspect %g:1\n*** Using pixel aspect 1:1\n", destaspect, scale);
+      image->scale_factor = 0x8000;
       image->scale_line = scale_line_1_1;
-      image->scale_factor = ( 32768 * 1 ) / 1;
-      break;
   }
 
 #ifdef DEBUG
   printf("  format: " );
 #endif
- 
+
   switch ( image->format ) {
     case XINE_IMGFMT_YV12:
 #ifdef DEBUG