summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-21 00:32:28 +0100
committerwm4 <wm4@nowhere>2014-01-24 01:01:13 +0100
commit97f74166cfc6e2884c405846b030215331c37a75 (patch)
treeb9ffe7816220122737771b53c52f8ea205dac477
parent5114ff4f2cef1846fbcc9ffcdfddea32bddb0657 (diff)
downloadlibass-97f74166cfc6e2884c405846b030215331c37a75.tar.bz2
libass-97f74166cfc6e2884c405846b030215331c37a75.tar.xz
Remove some ass_msg() calls
These aren't very useful for debugging due to the high volume of the log output in problem cases. In fact, all they do is making the code slower (the message callback can easily appear in the profiler output, even if the callback doesn't actually print the messages).
-rw-r--r--libass/ass.c19
-rw-r--r--libass/ass_parse.c12
-rw-r--r--libass/ass_render.c13
3 files changed, 6 insertions, 38 deletions
diff --git a/libass/ass.c b/libass/ass.c
index c45adaf..3817134 100644
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -252,38 +252,32 @@ static int numpad2align(int val)
#define ANYVAL(name,func) \
} else if (strcasecmp(tname, #name) == 0) { \
- target->name = func(token); \
- ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
+ target->name = func(token);
#define STRVAL(name) \
} else if (strcasecmp(tname, #name) == 0) { \
if (target->name != NULL) free(target->name); \
- target->name = strdup(token); \
- ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
+ target->name = strdup(token);
#define STARREDSTRVAL(name) \
} else if (strcasecmp(tname, #name) == 0) { \
if (target->name != NULL) free(target->name); \
while (*token == '*') ++token; \
- target->name = strdup(token); \
- ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
+ target->name = strdup(token);
#define COLORVAL(name) \
} else if (strcasecmp(tname, #name) == 0) { \
- target->name = string2color(track->library, token); \
- ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
+ target->name = string2color(track->library, token);
#define INTVAL(name) ANYVAL(name,atoi)
#define FPVAL(name) ANYVAL(name,ass_atof)
#define TIMEVAL(name) \
} else if (strcasecmp(tname, #name) == 0) { \
- target->name = string2timecode(track->library, token); \
- ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
+ target->name = string2timecode(track->library, token);
#define STYLEVAL(name) \
} else if (strcasecmp(tname, #name) == 0) { \
- target->name = lookup_style(track, token); \
- ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
+ target->name = lookup_style(track, token);
static char *next_token(char **str)
{
@@ -354,7 +348,6 @@ static int process_event_tail(ASS_Track *track, ASS_Event *event,
if (last >= event->Text && *last == '\r')
*last = 0;
}
- ass_msg(track->library, MSGL_DBG2, "Text = %s", event->Text);
event->Duration -= event->Start;
free(format);
return 0; // "Text" is always the last
diff --git a/libass/ass_parse.c b/libass/ass_parse.c
index 159be3b..c74f3b3 100644
--- a/libass/ass_parse.c
+++ b/libass/ass_parse.c
@@ -412,10 +412,6 @@ char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr)
mystrtoll(&p, &t1);
skip(',');
mystrtoll(&p, &t2);
- ass_msg(render_priv->library, MSGL_DBG2,
- "movement6: (%f, %f) -> (%f, %f), (%" PRId64 " .. %"
- PRId64 ")\n", x1, y1, x2, y2, (int64_t) t1,
- (int64_t) t2);
// VSFilter
if (t1 > t2) {
double tmp = t2;
@@ -426,8 +422,6 @@ char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr)
if (t1 <= 0 && t2 <= 0) {
t1 = 0;
t2 = render_priv->state.event->Duration;
- ass_msg(render_priv->library, MSGL_DBG2,
- "movement: (%f, %f) -> (%f, %f)", x1, y1, x2, y2);
}
skipopt(')');
delta_t = t2 - t1;
@@ -510,12 +504,10 @@ char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr)
if ((render_priv->state.parsed_tags & PARSED_A) == 0) {
if (val >= 1 && val <= 9) {
int v = (val - 1) / 3; // 0, 1 or 2 for vertical alignment
- ass_msg(render_priv->library, MSGL_DBG2, "an %d", val);
if (v != 0)
v = 3 - v;
val = ((val - 1) % 3) + 1; // horizontal alignment
val += v * 4;
- ass_msg(render_priv->library, MSGL_DBG2, "align %d", val);
render_priv->state.alignment = val;
} else
render_priv->state.alignment =
@@ -542,7 +534,6 @@ char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr)
skip(',');
mystrtod(&p, &v2);
skipopt(')');
- ass_msg(render_priv->library, MSGL_DBG2, "pos(%f, %f)", v1, v2);
if (render_priv->state.evt_type == EVENT_POSITIONED) {
ass_msg(render_priv->library, MSGL_V, "Subtitle has a new \\pos "
"after \\move or \\pos, ignoring");
@@ -605,7 +596,6 @@ char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr)
skip(',');
mystrtod(&p, &v2);
skipopt(')');
- ass_msg(render_priv->library, MSGL_DBG2, "org(%f, %f)", v1, v2);
if (!render_priv->state.have_origin) {
render_priv->state.org_x = v1;
render_priv->state.org_y = v2;
@@ -736,8 +726,6 @@ char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr)
n, cmd);
break;
}
- ass_msg(render_priv->library, MSGL_DBG2, "single c/a at %f: %c%c = %X",
- pwr, n, cmd, render_priv->state.c[cidx]);
} else if (mystrcmp(&p, "r")) {
char *start = p;
char *style;
diff --git a/libass/ass_render.c b/libass/ass_render.c
index ca89e76..12f5701 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -372,22 +372,18 @@ render_glyph(ASS_Renderer *render_priv, Bitmap *bm, int dst_x, int dst_y,
tmp = dst_x - clip_x0;
if (tmp < 0) {
- ass_msg(render_priv->library, MSGL_DBG2, "clip left");
b_x0 = -tmp;
}
tmp = dst_y - clip_y0;
if (tmp < 0) {
- ass_msg(render_priv->library, MSGL_DBG2, "clip top");
b_y0 = -tmp;
}
tmp = clip_x1 - dst_x - bm->w;
if (tmp < 0) {
- ass_msg(render_priv->library, MSGL_DBG2, "clip right");
b_x1 = bm->w + tmp;
}
tmp = clip_y1 - dst_y - bm->h;
if (tmp < 0) {
- ass_msg(render_priv->library, MSGL_DBG2, "clip bottom");
b_y1 = bm->h + tmp;
}
@@ -583,10 +579,6 @@ static void blend_vector_clip(ASS_Renderer *render_priv,
FT_Outline_Translate(outline, trans.x, trans.y);
}
- ass_msg(render_priv->library, MSGL_DBG2,
- "Parsed vector clip: scales (%f, %f) string [%s]\n",
- drawing->scale_x, drawing->scale_y, drawing->text);
-
clip_bm = outline_to_bitmap(render_priv->library,
render_priv->ftlibrary, outline, 0);
@@ -1601,9 +1593,6 @@ wrap_lines_smart(ASS_Renderer *render_priv, double max_text_width)
run_offset++;
pen_shift_x = d6_to_double(-cur->pos.x);
pen_shift_y += height + render_priv->settings.line_spacing;
- ass_msg(render_priv->library, MSGL_DBG2,
- "shifting from %d to %d by (%f, %f)", i,
- text_info->length - 1, pen_shift_x, pen_shift_y);
}
cur->bm_run_id += run_offset;
cur->pos.x += double_to_d6(pen_shift_x);
@@ -2108,8 +2097,6 @@ ass_render_event(ASS_Renderer *render_priv, ASS_Event *event,
if (render_priv->state.evt_type == EVENT_POSITIONED) {
double base_x = 0;
double base_y = 0;
- ass_msg(render_priv->library, MSGL_DBG2, "positioned event at %f, %f",
- render_priv->state.pos_x, render_priv->state.pos_y);
get_base_point(&bbox, alignment, &base_x, &base_y);
device_x =
x2scr_pos(render_priv, render_priv->state.pos_x) - base_x;