[MPlayer-cvslog] r28823 - trunk/libass/ass_render.c

[greg]

Author: greg
Date: Thu Mar  5 21:36:59 2009
New Revision: 28823

Log:
Fix positioned events' y-position when pan-and-scan is used.

Modified:
   trunk/libass/ass_render.c

Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	Thu Mar  5 21:36:56 2009	(r28822)
+++ trunk/libass/ass_render.c	Thu Mar  5 21:36:59 2009	(r28823)
@@ -485,6 +485,11 @@ static double y2scr(double y) {
 	return y * frame_context.orig_height_nocrop / frame_context.track->PlayResY +
 		FFMAX(global_settings->top_margin, 0);
 }
+static double y2scr_pos(double y) {
+	return y * frame_context.orig_height / frame_context.track->PlayResY +
+		global_settings->top_margin;
+}
+
 // the same for toptitles
 static int y2scr_top(double y) {
 	if (global_settings->use_margins)
@@ -1864,7 +1869,7 @@ static int ass_render_event(ass_event_t*
 
 		if (render_context.evt_type == EVENT_POSITIONED) {
 			shift.x += double_to_d6(x2scr_pos(render_context.pos_x)) & 56;
-			shift.y -= double_to_d6(y2scr(render_context.pos_y)) & 56;
+			shift.y -= double_to_d6(y2scr_pos(render_context.pos_y)) & 56;
 		}
 
 		ass_font_set_transform(render_context.font,
@@ -2031,7 +2036,7 @@ static int ass_render_event(ass_event_t*
 		mp_msg(MSGT_ASS, MSGL_DBG2, "positioned event at %f, %f\n", render_context.pos_x, render_context.pos_y);
 		get_base_point(bbox, alignment, &base_x, &base_y);
 		device_x = x2scr_pos(render_context.pos_x) - base_x;
-		device_y = y2scr(render_context.pos_y) - base_y;
+		device_y = y2scr_pos(render_context.pos_y) - base_y;
 	}
 	
 	// fix clip coordinates (they depend on alignment)