<br><font size=2 face="sans-serif">Just some more info...</font>
<br>
<br><font size=2 face="sans-serif">This is the last version of Hannes Domani's
patch here. At the time it was submitted I was unable to see any impact
it made - no improvement but no detriment either. I asked at the time for
some screenshots to illustrate the problem but never heard anything more.</font>
<br><font size=2 face="sans-serif">Hannes, does this code still fix your
problem? If so I'm much happier committing it than the more recent contribution
- I'd just like to see the before and after screenshots for this patch
to know what the effect of the change is - I can't get to the ones on the
ftp server, and in any case, as they are relevant to the more recent patch,
I'd prefer to get them again on the original one. Could you send them to
me please?</font>
<br>
<br><font size=2 face="sans-serif">Bitmap</font>
<br>
<br><font size=2><tt>--- src/video_output/vout_subpictures.c
Thu Aug 16 18:24:57
2007<br>
+++ src/video_output/vout_subpictures.c
Thu Aug 16 18:25:34 2007<br>
@@ -601,19 +601,41 @@<br>
}<br>
if( p_text_region &&
((p_text_region->i_align & REGION_RENDERED) == 0) )<br>
{<br>
- p_spu->p_text->fmt_out.video.i_width
=<br>
- p_spu->p_text->fmt_out.video.i_visible_width
=<br>
- p_fmt->i_width;<br>
- p_spu->p_text->fmt_out.video.i_height
=<br>
- p_spu->p_text->fmt_out.video.i_visible_height
=<br>
- p_fmt->i_height;<br>
+ if( (p_subpic->i_original_picture_height
> 0) &&<br>
+ (p_subpic->i_original_picture_width
> 0) )<br>
+ {<br>
+ p_spu->p_text->fmt_out.video.i_width
=<br>
+
p_spu->p_text->fmt_out.video.i_visible_width =<br>
+
p_subpic->i_original_picture_width;<br>
+ p_spu->p_text->fmt_out.video.i_height
=<br>
+
p_spu->p_text->fmt_out.video.i_visible_height =<br>
+
p_subpic->i_original_picture_height;<br>
+ }<br>
+ else<br>
+ {<br>
+ p_spu->p_text->fmt_out.video.i_width
=<br>
+
p_spu->p_text->fmt_out.video.i_visible_width =<br>
+
p_fmt->i_width;<br>
+ p_spu->p_text->fmt_out.video.i_height
=<br>
+
p_spu->p_text->fmt_out.video.i_visible_height =<br>
+
p_fmt->i_height;<br>
+ }<br>
}<br>
}<br>
<br>
pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig;<br>
pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig;<br>
- pi_scale_width[ SCALE_TEXT ]
= p_fmt->i_width * 1000 / p_spu->p_text->fmt_out.video.i_width;<br>
- pi_scale_height[ SCALE_TEXT ] =
p_fmt->i_height * 1000 / p_spu->p_text->fmt_out.video.i_height;<br>
+ if( (p_subpic->i_original_picture_height
> 0) &&<br>
+ (p_subpic->i_original_picture_width
> 0) )<br>
+ {<br>
+ pi_scale_width[ SCALE_TEXT ]
= p_subpic->i_original_picture_width * 1000 / p_spu->p_text->fmt_out.video.i_width;<br>
+ pi_scale_height[ SCALE_TEXT
] = p_subpic->i_original_picture_height * 1000 / p_spu->p_text->fmt_out.video.i_height;<br>
+ }<br>
+ else<br>
+ {<br>
+ pi_scale_width[ SCALE_TEXT ]
= p_fmt->i_width * 1000 / p_spu->p_text->fmt_out.video.i_width;<br>
+ pi_scale_height[ SCALE_TEXT
] = p_fmt->i_height * 1000 / p_spu->p_text->fmt_out.video.i_height;<br>
+ }<br>
<br>
for( k=0; k< SCALE_SIZE ; k++ )<br>
{</tt></font>
<br><font size=1 color=#800080 face="sans-serif">----- Forwarded by Bernie
Purcell/ADB on 13/09/2007 02:45 PM -----</font>
<br>
<table width=100%>
<tr valign=top>
<td width=40%><font size=1 face="sans-serif"><b>Bernie Purcell <b.purcell@adbglobal.com></b>
</font>
<br><font size=1 face="sans-serif">Sent by: vlc-devel-bounces@videolan.org</font>
<p><font size=1 face="sans-serif">13/09/2007 02:10 PM</font>
<table border>
<tr valign=top>
<td bgcolor=white>
<div align=center><font size=1 face="sans-serif">Please respond to<br>
Mailing list for VLC media player developers <vlc-devel@videolan.org></font></div></table>
<br>
<td width=59%>
<table width=100%>
<tr>
<td>
<div align=right><font size=1 face="sans-serif">To</font></div>
<td valign=top><font size=1 face="sans-serif">Mailing list for VLC media
player developers <vlc-devel@videolan.org></font>
<tr>
<td>
<div align=right><font size=1 face="sans-serif">cc</font></div>
<td valign=top>
<tr>
<td>
<div align=right><font size=1 face="sans-serif">Subject</font></div>
<td valign=top><font size=1 face="sans-serif">Re: [vlc-devel] [PATCH] wrong-sized
subtitles</font></table>
<br>
<table>
<tr valign=top>
<td>
<td></table>
<br></table>
<br>
<br>
<br><font size=2 face="sans-serif"><br>
Hi Hannes,</font><font size=3> <br>
</font><font size=2 face="sans-serif"><br>
This patch undoes the font smoothing that I went to some trouble to get
working - ie. rendering text at native resolution when possible, rather
than using the video resolution. I really don't want to commit it like
this.</font><font size=3> </font><font size=2 face="sans-serif"><br>
You submitted an earlier patch that didn't have this problem. I'm still
prepared to consider that one if it fixes your problem. Could you please
email me the screenshots you've put on the FTP server as I can't access
them though.</font><font size=3> <br>
</font><font size=2 face="sans-serif"><br>
Bitmap</font><font size=3> <br>
<br>
</font>
<table width=100%>
<tr valign=top>
<td width=59%><font size=1 face="sans-serif"><b>Hannes Domani <ssbssa@yahoo.de></b>
<br>
Sent by: vlc-devel-bounces@videolan.org</font><font size=3> </font>
<p><font size=1 face="sans-serif">12/09/2007 08:42 PM</font><font size=3>
</font>
<br>
<table border=4 width=100%>
<tr valign=top>
<td width=100% bgcolor=white>
<div align=center><font size=1 face="sans-serif">Please respond to<br>
Mailing list for VLC media player developers <vlc-devel@videolan.org></font></div></table>
<p>
<td width=40%>
<table width=100%>
<tr>
<td width=16%>
<div align=right><font size=1 face="sans-serif">To</font></div>
<td width=83% valign=top><font size=1 face="sans-serif">vlc-devel <vlc-devel@videolan.org></font><font size=3>
</font>
<tr>
<td>
<div align=right><font size=1 face="sans-serif">cc</font></div>
<td valign=top>
<tr>
<td>
<div align=right><font size=1 face="sans-serif">Subject</font></div>
<td valign=top><font size=1 face="sans-serif">[vlc-devel] [PATCH] wrong-sized
subtitles</font></table>
<br>
<br>
<table width=100%>
<tr valign=top>
<td width=49%>
<td width=50%></table>
<br></table>
<br><font size=3><br>
<br>
</font><font size=2><tt><br>
Hello<br>
<br>
this is my new try to fix the subtitles.<br>
<br>
this time i made some screenshots to show what needed<br>
to be fixed (but am not sure if they made it to the<br>
ftp):<br>
ftp://ftp.videolan.org/incoming/shot1.png<br>
ftp://ftp.videolan.org/incoming/shot1-patched.png<br>
ftp://ftp.videolan.org/incoming/shot2.png<br>
ftp://ftp.videolan.org/incoming/shot2-patched.png<br>
<br>
regards<br>
Domani Hannes<br>
<br>
<br>
Machen Sie Yahoo! zu Ihrer Startseite. Los geht's: <br>
http://de.yahoo.com/set--- src/video_output/vout_subpictures.c
Mon Sep 10 17:50:01 2007<br>
+++ src/video_output/vout_subpictures.c
Mon Sep 10 18:16:14 2007<br>
@@ -509,9 +509,6 @@<br>
subpicture_t *p_subpic,<br>
int i_scale_width_orig, int i_scale_height_orig
)<br>
{<br>
- int i_source_video_width = p_fmt->i_width *
1000 / i_scale_width_orig;<br>
- int i_source_video_height = p_fmt->i_height * 1000 /
i_scale_height_orig;<br>
-<br>
/* Get lock */<br>
vlc_mutex_lock( &p_spu->subpicture_lock );<br>
<br>
@@ -610,25 +607,6 @@<br>
pi_scale_width[ SCALE_TEXT ]
= p_fmt->i_width * 1000 / p_spu->p_text->fmt_out.video.i_width;<br>
pi_scale_height[ SCALE_TEXT ] =
p_fmt->i_height * 1000 / p_spu->p_text->fmt_out.video.i_height;<br>
<br>
- for( k=0; k< SCALE_SIZE ; k++ )<br>
- {<br>
- if( (p_subpic->i_original_picture_height
> 0) &&<br>
- (p_subpic->i_original_picture_width
> 0) )<br>
- {<br>
- pi_scale_width[
k ] = pi_scale_width[ k ] * i_source_video_width /<br>
-
p_subpic->i_original_picture_width;<br>
- pi_scale_height[
k ] = pi_scale_height[ k ] * i_source_video_height /<br>
-
p_subpic->i_original_picture_height;<br>
- }<br>
- else if( p_subpic->i_original_picture_height
> 0 )<br>
- {<br>
- pi_scale_height[
k ] = pi_scale_height[ k ] * i_source_video_height /<br>
-
p_subpic->i_original_picture_height;<br>
- pi_scale_width[
k ] = pi_scale_width[ k ] * i_source_video_height /<br>
-
p_subpic->i_original_picture_height;<br>
- }<br>
- }<br>
-<br>
/* Set default subpicture aspect ratio */<br>
if( p_region && p_region->fmt.i_aspect
&&<br>
(!p_region->fmt.i_sar_num
|| !p_region->fmt.i_sar_den) )<br>
@@ -696,6 +674,7 @@<br>
if( p_spu->p_text
&& p_spu->p_text->p_module )<br>
{<br>
vlc_value_t
val;<br>
+ int
i_scale;<br>
<br>
/*
Setup 3 variables which can be used to render<br>
* time-dependent text (and effects). The first indicates<br>
@@ -729,8 +708,11 @@<br>
var_SetBool(
p_spu->p_text, "text-rerender", VLC_FALSE );<br>
<br>
var_Create(
p_spu->p_text, "scale", VLC_VAR_INTEGER );<br>
- var_SetInteger(
p_spu->p_text, "scale",<br>
-
__MIN(i_scale_width_orig, i_scale_height_orig)
);<br>
+ i_scale
= __MIN( i_scale_width_orig, i_scale_height_orig );<br>
+ if(
p_subpic->i_original_picture_height > 0 )<br>
+
i_scale = i_scale * p_fmt->i_height /<br>
+
p_subpic->i_original_picture_height;<br>
+ var_SetInteger(
p_spu->p_text, "scale", i_scale );<br>
<br>
if(
p_spu->p_text->pf_render_html && p_region->psz_html )<br>
{<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
http://mailman.videolan.org/listinfo/vlc-devel</tt></font><font size=3><br>
</font><font size=2><tt>_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
http://mailman.videolan.org/listinfo/vlc-devel<br>
</tt></font>