Mercurial > mplayer.hg

changeset 20653:402484a85b9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More precise bounding box calculation for karaoke effects.
author eugeni
date Sat, 04 Nov 2006 17:58:09 +0000
parents 0c342e00c63d
children 37f5cd897b03
files libass/ass_render.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_render.c	Sat Nov 04 16:25:32 2006 +0000
+++ b/libass/ass_render.c	Sat Nov 04 17:58:09 2006 +0000
@@ -39,6 +39,7 @@
 #include "ass_library.h"
 
 #include "libvo/sub.h" // for utf8_get_char
+#include "libavutil/common.h"
 
 #define MAX_GLYPHS 1000
 #define MAX_LINES 100
@@ -1495,8 +1496,12 @@
 				tm_start = timing + s1->effect_skip_timing;
 				tm_end = tm_start + s1->effect_timing;
 				timing = tm_end;
-				x_start = s1->bbox.xMin + s1->pos.x;
-				x_end = e1->bbox.xMax + e1->pos.x;
+				x_start = 1000000;
+				x_end = -1000000;
+				for (cur2 = s1; cur2 <= e1; ++cur2) {
+					x_start = FFMIN(x_start, cur2->bbox.xMin + cur2->pos.x);
+					x_end = FFMAX(x_end, cur2->bbox.xMax + cur2->pos.x);
+				}
 
 				dt = (tm_current - tm_start);
 				if ((s1->effect_type == EF_KARAOKE) || (s1->effect_type == EF_KARAOKE_KO)) {