Mercurial > mplayer.hg

changeset 31635:36a339f6613a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix calc_bbox to always return sensible values. When the scaled width is equal to the current width we could reuse the previous bbox value, however we havent saved them anywhere...
author reimar
date Sun, 11 Jul 2010 12:46:12 +0000
parents b985f9cca8be
children fc0080157cee
files spudec.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/spudec.c	Sun Jul 11 12:14:40 2010 +0000
+++ b/spudec.c	Sun Jul 11 12:46:12 2010 +0000
@@ -691,12 +691,14 @@
   spu = (spudec_handle_t *)me;
   if (spu->orig_frame_width == 0 || spu->orig_frame_height == 0
   || (spu->orig_frame_width == dxs && spu->orig_frame_height == dys)) {
+    // unscaled
     bbox[0] = spu->start_col;
     bbox[1] = spu->start_col + spu->width;
     bbox[2] = spu->start_row;
     bbox[3] = spu->start_row + spu->height;
   }
-  else if (spu->scaled_frame_width != dxs || spu->scaled_frame_height != dys) {
+  else {
+    // scaled
     unsigned int scalex = 0x100 * dxs / spu->orig_frame_width;
     unsigned int scaley = 0x100 * dys / spu->orig_frame_height;
     bbox[0] = spu->start_col * scalex / 0x100;
@@ -726,9 +728,6 @@
       bbox[3] = spu->start_row * scaley / 0x100 + spu->height * scaley / 0x100;
       break;
     }
-  } else {
-    mp_msg(MSGT_SPUDEC, MSGL_ERR, "Bad values in spudec_calc_bbox\n");
-    bbox[0] = bbox[1] = bbox[2] = bbox[3] = 0;
   }
 }
 /* transform mplayer's alpha value into an opacity value that is linear */