diff options
author | phintuka <phintuka> | 2010-01-03 19:29:50 +0000 |
---|---|---|
committer | phintuka <phintuka> | 2010-01-03 19:29:50 +0000 |
commit | e5dfe9e6c38c90a59997a746fbdb1124404b92b0 (patch) | |
tree | 18b5ea423156b21787a305583e15db706cee5733 | |
parent | e8a88ce941ffdf5d18ccfc251236df7ef83d5c2e (diff) | |
download | xineliboutput-e5dfe9e6c38c90a59997a746fbdb1124404b92b0.tar.gz xineliboutput-e5dfe9e6c38c90a59997a746fbdb1124404b92b0.tar.bz2 |
Relaxed intercept check
-rw-r--r-- | xine_post_autocrop.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xine_post_autocrop.c b/xine_post_autocrop.c index 3b8f70e8..161f0513 100644 --- a/xine_post_autocrop.c +++ b/xine_post_autocrop.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_post_autocrop.c,v 1.35 2009-12-15 19:44:51 phintuka Exp $ + * $Id: xine_post_autocrop.c,v 1.36 2010-01-03 19:29:50 phintuka Exp $ * */ @@ -47,6 +47,9 @@ #include <xine/xine_internal.h> #include <xine/post.h> +#ifndef FABS +# define FABS(x) ((x) < 0.0 ? -(x) : (x)) +#endif /* * Configuration @@ -1363,13 +1366,13 @@ static vo_frame_t *autocrop_get_frame(xine_video_port_t *port_gen, /* Crop only SDTV 4:3 frames ... */ int intercept = ((format == XINE_IMGFMT_YV12 || format == XINE_IMGFMT_YUY2 || this->has_driver_crop) && - ratio == 4.0/3.0 && - width >= 480 && width <= 768 && + FABS(ratio - 4.0/3.0) < 0.1 && + width >= 240 && width <= 768 && height >= 288 && height <= 576); 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); + TRACE("get_frame: deactivate ratio: %lf width: %d height: %d\n", ratio, width, height); } /* reset when format changes */ |