mplayer.hg: libass/ass_render.c comparison

comparison libass/ass_render.c @ 22213:66abe12ad374

Move conversions between 16.16, 26.6 fixed point and int, double to separate functions. Some rounding errors are fixed along the way.

author	eugeni
date	Fri, 16 Feb 2007 17:49:35 +0000
parents	5add218bb6c3
children	218f486c544d

comparison

equal deleted inserted replaced

-:f45084fb38dc
+:66abe12ad374
 	int i;
 	if (text_info.length > 0) {
 		bbox.xMin = 32000;
 		bbox.xMax = -32000;
-		bbox.yMin = - (text_info.lines[0].asc >> 6) + text_info.glyphs[0].pos.y;
+		bbox.yMin = - d6_to_int(text_info.lines[0].asc) + text_info.glyphs[0].pos.y;
-		bbox.yMax = ((text_info.height - text_info.lines[0].asc) >> 6) + text_info.glyphs[0].pos.y;
+		bbox.yMax = d6_to_int(text_info.height - text_info.lines[0].asc) + text_info.glyphs[0].pos.y;
 		for (i = 0; i < text_info.length; ++i) {
 			int s = text_info.glyphs[i].pos.x;
-			int e = s + (text_info.glyphs[i].advance.x >> 6);
+			int e = s + d6_to_int(text_info.glyphs[i].advance.x);
 			bbox.xMin = FFMIN(bbox.xMin, s);
 			bbox.xMax = FFMAX(bbox.xMax, e);
 		}
 	} else
 		bbox.xMin = bbox.xMax = bbox.yMin = bbox.yMax = 0;
 	info->glyph = ass_font_get_glyph(frame_context.ass_priv->fontconfig_priv, render_context.font, symbol);
 	if (!info->glyph)
 		return 0;
-	info->advance.x = info->glyph->advance.x >> 10;
+	info->advance.x = d16_to_d6(info->glyph->advance.x);
-	info->advance.y = info->glyph->advance.y >> 10;
+	info->advance.y = d16_to_d6(info->glyph->advance.y);
 	if (render_context.stroker) {
 		info->outline_glyph = info->glyph;
 		error = FT_Glyph_Stroke( &(info->outline_glyph), render_context.stroker, 0 ); // don't destroy original
 		if (error) {
 		cur = text_info.glyphs + i;
 		if (cur->linebreak) {
 			int height = text_info.lines[cur_line - 1].desc + text_info.lines[cur_line].asc;
 			cur_line ++;
 			pen_shift_x = - cur->pos.x;
-			pen_shift_y += (height >> 6) + global_settings->line_spacing;
+			pen_shift_y += d6_to_int(height) + global_settings->line_spacing;
 			mp_msg(MSGT_ASS, MSGL_DBG2, "shifting from %d to %d by (%d, %d)\n", i, text_info.length - 1, pen_shift_x, pen_shift_y);
 		}
 		cur->pos.x += pen_shift_x;
 		cur->pos.y += pen_shift_y;
 	}
 		if (error) {
 			continue;
 		}
-		text_info.glyphs[text_info.length].pos.x = pen.x >> 6;
+		text_info.glyphs[text_info.length].pos.x = d6_to_int(pen.x);
-		text_info.glyphs[text_info.length].pos.y = pen.y >> 6;
+		text_info.glyphs[text_info.length].pos.y = d6_to_int(pen.y);
 		pen.x += text_info.glyphs[text_info.length].advance.x;
 		pen.x += render_context.hspacing;
 		pen.y += text_info.glyphs[text_info.length].advance.y;
 	// y coordinate for everything except positioned events
 	if (render_context.evt_type == EVENT_NORMAL ||
 	    render_context.evt_type == EVENT_HSCROLL) {
 		if (valign == VALIGN_TOP) { // toptitle
-			device_y = y2scr_top(MarginV) + (text_info.lines[0].asc >> 6);
+			device_y = y2scr_top(MarginV) + d6_to_int(text_info.lines[0].asc);
 		} else if (valign == VALIGN_CENTER) { // midtitle
 			int scr_y = y2scr(frame_context.track->PlayResY / 2);
 			device_y = scr_y - (bbox.yMax - bbox.yMin) / 2;
 		} else { // subtitle
 			int scr_y;
 			if (valign != VALIGN_SUB)
 				mp_msg(MSGT_ASS, MSGL_V, "Invalid valign, supposing 0 (subtitle)\n");
 			scr_y = y2scr_sub(frame_context.track->PlayResY - MarginV);
 			device_y = scr_y;
-			device_y -= (text_info.height >> 6);
+			device_y -= d6_to_int(text_info.height);
-			device_y += (text_info.lines[0].asc >> 6);
+			device_y += d6_to_int(text_info.lines[0].asc);
 		}
 	} else if (render_context.evt_type == EVENT_VSCROLL) {
 		if (render_context.scroll_direction == SCROLL_TB)
 			device_y = y2scr(render_context.clip_y0 + render_context.scroll_shift) - (bbox.yMax - bbox.yMin);
 		else if (render_context.scroll_direction == SCROLL_BT)
 				matrix_rotate.yy = (FT_Fixed)( cos( angle ) * 0x10000L );
 			}
 			// calculating shift vector
 			// shift = (position - center)*M - (position - center)
-			start.x = (info->pos.x + device_x - center.x) << 6;
+			start.x = int_to_d6(info->pos.x + device_x - center.x);
-			start.y = - (info->pos.y + device_y - center.y) << 6;
+			start.y = int_to_d6(info->pos.y + device_y - center.y);
 			start_old.x = start.x;
 			start_old.y = start.y;
 			FT_Vector_Transform(&start, &matrix_rotate);
 			start.x -= start_old.x;
 			start.y -= start_old.y;
-			info->pos.x += start.x >> 6;
+			info->pos.x += d6_to_int(start.x);
-			info->pos.y -= start.y >> 6;
+			info->pos.y -= d6_to_int(start.y);
 			if (info->glyph)
 				FT_Glyph_Transform( info->glyph, &matrix_rotate, 0 );
 			if (info->outline_glyph)
 				FT_Glyph_Transform( info->outline_glyph, &matrix_rotate, 0 );
 		}
 	}
-	event_images->top = device_y - (text_info.lines[0].asc >> 6);
+	event_images->top = device_y - d6_to_int(text_info.lines[0].asc);
-	event_images->height = text_info.height >> 6;
+	event_images->height = d6_to_int(text_info.height);
 	event_images->detect_collisions = render_context.detect_collisions;
 	event_images->shift_direction = (valign == VALIGN_TOP) ? 1 : -1;
 	event_images->event = event;
 	event_images->imgs = render_text(&text_info, device_x, device_y);

Mercurial > mplayer.hg

comparison libass/ass_render.c @ 22213:66abe12ad374