Mercurial > mplayer.hg
annotate libvo/sub.c @ 2176:1ae16a34f055
speed improvements
author | atlka |
---|---|
date | Fri, 12 Oct 2001 13:24:07 +0000 |
parents | dee4b2ea5e5b |
children | 28901a4122c8 |
rev | line source |
---|---|
218 | 1 |
2 #include "sub.h" | |
202 | 3 |
213 | 4 //static int vo_font_loaded=-1; |
5 font_desc_t* vo_font=NULL; | |
202 | 6 |
1991
dee4b2ea5e5b
add gui support to config scripts, and fixed some warning.
pontscho
parents:
1878
diff
changeset
|
7 unsigned char* vo_osd_text=NULL; |
803
b25a887b6054
sub splitting patch applied by Vlada V.Dubsky@sh.cvut.cz
arpi_esp
parents:
726
diff
changeset
|
8 int sub_unicode=0; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
9 int sub_utf8=0; |
213 | 10 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
11 inline static void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
12 unsigned char *cp=vo_osd_text; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
13 int c; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
14 int font; |
213 | 15 int y=10; |
16 int x=20; | |
202 | 17 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
18 while (*cp){ |
1549 | 19 c=*cp++; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
20 if ((font=vo_font->font[c])>=0) |
213 | 21 draw_alpha(x,y, |
22 vo_font->width[c], | |
23 vo_font->pic_a[font]->h, | |
24 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
25 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
26 vo_font->pic_a[font]->w); | |
27 x+=vo_font->width[c]+vo_font->charspace; | |
28 } | |
218 | 29 |
30 } | |
31 | |
32 int vo_osd_progbar_type=-1; | |
1726 | 33 int vo_osd_progbar_value=100; // 0..256 |
34 | |
35 // if we have n=256 bars then OSD progbar looks like below | |
36 // | |
1878 | 37 // 0 1 2 3 ... 256 <= vo_osd_progbar_value |
38 // | | | | | | |
1726 | 39 // [ === === === ... === ] |
40 // | |
41 // the above schema is rescalled to n=elems bars | |
218 | 42 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
43 inline static void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ |
1602 | 44 unsigned char *s; |
45 unsigned char *sa; | |
1726 | 46 int i,w,h,st,mark; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
47 int y=(dys-vo_font->height)/2; |
218 | 48 int c,font; |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
49 int delimw=vo_font->width[OSD_PB_START] |
1549 | 50 +vo_font->width[OSD_PB_END] |
51 +vo_font->charspace; | |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
52 int width=(2*dxs-3*delimw)/3; |
1549 | 53 int charw=vo_font->width[OSD_PB_0]+vo_font->charspace; |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
54 int elems=width/charw; |
1549 | 55 int x=(dxs-elems*charw-delimw)/2; |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
56 |
1726 | 57 if (vo_osd_progbar_value<=0) |
58 mark=0; | |
1878 | 59 else { |
60 int ev=vo_osd_progbar_value*elems; | |
61 mark=ev>>8; | |
62 if (ev & 0xFF) mark++; | |
63 if (mark>elems) mark=elems; | |
64 } | |
65 | |
1727 | 66 |
218 | 67 // printf("osd.progbar width=%d xpos=%d\n",width,x); |
68 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
69 c=vo_osd_progbar_type; |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
70 if(vo_osd_progbar_type>0 && (font=vo_font->font[c])>=0) { |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
71 int xp=x-vo_font->width[c]-vo_font->spacewidth; |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
72 draw_alpha((xp<0?0:xp),y, |
218 | 73 vo_font->width[c], |
74 vo_font->pic_a[font]->h, | |
75 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
76 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
77 vo_font->pic_a[font]->w); | |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
78 } |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
79 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
80 c=OSD_PB_START; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
81 if ((font=vo_font->font[c])>=0) |
218 | 82 draw_alpha(x,y, |
83 vo_font->width[c], | |
84 vo_font->pic_a[font]->h, | |
85 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
86 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
87 vo_font->pic_a[font]->w); | |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
88 x+=vo_font->width[c]+vo_font->charspace; |
218 | 89 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
90 c=OSD_PB_0; |
1602 | 91 if ((font=vo_font->font[c])>=0){ |
92 w=vo_font->width[c]; | |
93 h=vo_font->pic_a[font]->h; | |
94 s=vo_font->pic_b[font]->bmp+vo_font->start[c]; | |
95 sa=vo_font->pic_a[font]->bmp+vo_font->start[c]; | |
96 st=vo_font->pic_a[font]->w; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
97 for (i=mark;i--;){ |
1602 | 98 draw_alpha(x,y,w,h,s,sa,st); |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
99 x+=charw; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
100 } |
1602 | 101 } |
202 | 102 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
103 c=OSD_PB_1; |
1602 | 104 if ((font=vo_font->font[c])>=0){ |
105 w=vo_font->width[c]; | |
106 h=vo_font->pic_a[font]->h; | |
107 s =vo_font->pic_b[font]->bmp+vo_font->start[c]; | |
108 sa=vo_font->pic_a[font]->bmp+vo_font->start[c]; | |
109 st=vo_font->pic_a[font]->w; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
110 for (i=elems-mark;i--;){ |
1602 | 111 draw_alpha(x,y,w,h,s,sa,st); |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
112 x+=charw; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
113 } |
1602 | 114 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
115 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
116 c=OSD_PB_END; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
117 if ((font=vo_font->font[c])>=0) |
218 | 118 draw_alpha(x,y, |
119 vo_font->width[c], | |
120 vo_font->pic_a[font]->h, | |
121 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
122 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
123 vo_font->pic_a[font]->w); | |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
124 // x+=vo_font->width[c]+vo_font->charspace; |
803
b25a887b6054
sub splitting patch applied by Vlada V.Dubsky@sh.cvut.cz
arpi_esp
parents:
726
diff
changeset
|
125 |
218 | 126 |
127 // vo_osd_progbar_value=(vo_osd_progbar_value+1)&0xFF; | |
128 | |
129 } | |
130 | |
254 | 131 subtitle* vo_sub=NULL; |
218 | 132 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
133 #define MAX_UCS 1600 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
134 #define MAX_UCSLINES 16 |
218 | 135 |
1591 | 136 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
137 inline static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
138 static int utbl[MAX_UCS+1]; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
139 static int xtbl[MAX_UCSLINES]; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
140 static int lines; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
141 static subtitle *memsub=NULL; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
142 static int memy; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
143 static int memdxs; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
144 static int memdys; |
1591 | 145 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
146 unsigned char *t; |
1591 | 147 int c,i,j,l,x,y,font; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
148 int len; |
1591 | 149 int k,lastk; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
150 int lastStripPosition; |
1591 | 151 int xsize,lastxsize; |
152 int h,lasth; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
153 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
154 if ((memsub!=vo_sub)||(memdxs!=dxs)||(memdys!=dys)){ |
1591 | 155 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
156 memsub=vo_sub; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
157 memdxs=dxs; |
1591 | 158 memdys=memy=dys; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
159 |
1602 | 160 // too long lines divide into a smaller ones |
1591 | 161 i=k=lines=lasth=0; |
162 h=vo_font->height; | |
163 xsize=-vo_font->charspace; | |
164 lastStripPosition=-1; | |
165 l=vo_sub->lines; | |
166 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
167 while (l--){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
168 t=vo_sub->text[i++]; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
169 len=strlen(t)-1; |
1824 | 170 |
1852 | 171 // printf("sub(%d) '%s'\n",len,t); |
1824 | 172 // if(len<0) memy -=h; // according to max of vo_font->pic_a[font]->h |
173 // else | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
174 for (j=0;j<=len;j++){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
175 if ((c=t[j])>=0x80){ |
2176 | 176 if (sub_utf8){ |
177 if ((c & 0xe0) == 0xc0) /* 2 bytes U+00080..U+0007FF*/ | |
178 c = (c & 0x1f)<<6 | (t[++j] & 0x3f); | |
179 else if((c & 0xf0) == 0xe0)/* 3 bytes U+00800..U+00FFFF*/ | |
180 c = ((c & 0x0f)<<6 | | |
181 (t[++j] & 0x3f))<<6 | (t[++j] & 0x3f); | |
182 } else if (sub_unicode) | |
183 c = (c<<8) + t[++j]; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
184 } |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
185 if (k==MAX_UCS){ |
2176 | 186 l=0 ; len=j; // cut here |
1591 | 187 } |
188 utbl[k++]=c; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
189 if (c==' '){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
190 lastk=k; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
191 lastStripPosition=j; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
192 lastxsize=xsize; |
1824 | 193 } |
194 else if ((font=vo_font->font[c])>=0){ | |
1591 | 195 if (vo_font->pic_a[font]->h > h){ |
196 h=vo_font->pic_a[font]->h; | |
197 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
198 } |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
199 xsize+=vo_font->width[c]+vo_font->charspace; |
1591 | 200 if (dxs<xsize){ |
201 if (lastStripPosition>0){ | |
202 j=lastStripPosition; | |
203 xsize=lastxsize; | |
204 k=lastk; | |
205 } else { | |
206 xsize -=vo_font->width[c]+vo_font->charspace; // go back | |
207 k--; // cut line here | |
208 while (t[j] && t[j]!=' ') j++; // jump to the nearest space | |
209 } | |
210 } else if (j<len) | |
211 continue; | |
212 if (h>memy){ // out of the screen so end parsing | |
2176 | 213 memy -=lasth - vo_font->height; // correct the y position |
1591 | 214 l=0; break; |
215 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
216 utbl[k++]=0; |
1591 | 217 xtbl[lines++]=(dxs-xsize)/2; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
218 if (lines==MAX_UCSLINES||k>MAX_UCS){ |
2176 | 219 l=0; j=len; // end parsing |
1602 | 220 } else if(l || j<len){ // not the last line or not the last char |
1591 | 221 lastStripPosition=-1; |
222 xsize=-vo_font->charspace; | |
223 lasth=h; | |
224 h=vo_font->height; | |
225 } | |
2176 | 226 // printf("h: %d -> %d \n",vo_font->height,h); |
1591 | 227 memy -=h; // according to max of vo_font->pic_a[font]->h |
228 } | |
1573
c394d04d6b30
changes according to max of vo_font->pic_a[font]->h for the last line of subs
atlka
parents:
1569
diff
changeset
|
229 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
230 } |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
231 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
232 y = memy; |
1824 | 233 |
234 // printf("lines=%d y=%d\n",lines,y); | |
202 | 235 |
1591 | 236 i=j=0; l=lines; |
1824 | 237 while (i<lines){ |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
238 x= xtbl[i++]; |
1591 | 239 while ((c=utbl[j++])){ |
2176 | 240 if ((font=vo_font->font[c])>=0) |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
241 draw_alpha(x,y, |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
242 vo_font->width[c], |
1824 | 243 vo_font->pic_a[font]->h+y<dys ? vo_font->pic_a[font]->h : dys-y, |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
244 vo_font->pic_b[font]->bmp+vo_font->start[c], |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
245 vo_font->pic_a[font]->bmp+vo_font->start[c], |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
246 vo_font->pic_a[font]->w); |
1591 | 247 x+=vo_font->width[c]+vo_font->charspace; |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
248 } |
1591 | 249 y+=vo_font->height; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
250 } |
218 | 251 } |
252 | |
947
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
253 static int draw_alpha_init_flag=0; |
218 | 254 |
1109 | 255 extern void vo_draw_alpha_init(); |
256 | |
218 | 257 void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ |
258 | |
259 if(!vo_font) return; // no font | |
260 | |
947
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
261 if(!draw_alpha_init_flag){ |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
262 draw_alpha_init_flag=1; |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
263 vo_draw_alpha_init(); |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
264 } |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
265 |
218 | 266 if(vo_osd_text){ |
267 vo_draw_text_osd(dxs,dys,draw_alpha); | |
268 } | |
269 | |
254 | 270 if(vo_sub){ |
218 | 271 vo_draw_text_sub(dxs,dys,draw_alpha); |
272 } | |
273 | |
1822 | 274 if(vo_osd_progbar_type>=0 && vo_font->font[OSD_PB_0]>=0){ |
218 | 275 vo_draw_text_progbar(dxs,dys,draw_alpha); |
276 } | |
213 | 277 |
202 | 278 } |
1726 | 279 |