[Xineliboutput-cvslog] vdr-xineliboutput xine_post_autocrop.c, 1.30, 1.31

[Petri H. <phi...@us...>]

Update of /cvsroot/xineliboutput/vdr-xineliboutput
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6038

Modified Files:
	xine_post_autocrop.c 
Log Message:
Only auto-detected croppping is resetted when frame format changes.
Removed redundant format change check.


Index: xine_post_autocrop.c
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine_post_autocrop.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- xine_post_autocrop.c	8 Dec 2009 12:58:50 -0000	1.30
+++ xine_post_autocrop.c	8 Dec 2009 13:02:09 -0000	1.31
@@ -1246,13 +1246,6 @@
     /* apply height limit */
     if(this->height_limit_active && end_line < this->height_limit)
       end_line = this->height_limit;
-
-  } else {
-    /* reset when format changes */
-    if(frame->height != this->prev_height)
-      cropping_active = 0;
-    if(frame->width != this->prev_width)
-      cropping_active = 0;
   }
 
   /* update timers */
@@ -1347,13 +1340,15 @@
        width  >= 480 && width  <= 768 &&
        height >= 288 && height <= 576);
 
-  if(!intercept) {
+  if(cropping_active && !intercept) {
     cropping_active = 0;
+    TRACE("get_frame: deactivate ratio %d width: %d height %d\n", (ratio == 4.0/3.0), width, height);
   }
 
   /* reset when format changes */
-  if (cropping_active && (height != this->prev_height || width != this->prev_width)) {
+  if (cropping_active && this->autodetect && (height != this->prev_height || width != this->prev_width)) {
     cropping_active = 0;
+    TRACE("get_frame: deactivate width %d -> %d height %d -> %d\n", this->prev_width, width, this->prev_height, height);
   }
 
   /* set new ratio when using driver crop */