Mercurial > mplayer.hg
annotate libvo/sub.h @ 26907:f0d0b666ee35
Fix compilation with internal dvdnav
author | rtogni |
---|---|
date | Sat, 31 May 2008 13:42:09 +0000 |
parents | 429c8f64b810 |
children | e7c989f7a7c9 |
rev | line source |
---|---|
616 | 1 |
23689
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
23606
diff
changeset
|
2 #ifndef MPLAYER_SUB_H |
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
23606
diff
changeset
|
3 #define MPLAYER_SUB_H |
616 | 4 |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
5 typedef struct mp_osd_bbox_s { |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
6 int x1,y1,x2,y2; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
7 } mp_osd_bbox_t; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
8 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
9 #define OSDTYPE_OSD 1 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
10 #define OSDTYPE_SUBTITLE 2 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
11 #define OSDTYPE_PROGBAR 3 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
12 #define OSDTYPE_SPU 4 |
21193
a067e7e18b50
support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents:
18935
diff
changeset
|
13 #define OSDTYPE_DVDNAV 5 |
23903 | 14 #define OSDTYPE_TELETEXT 6 |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
15 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
16 #define OSDFLAG_VISIBLE 1 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
17 #define OSDFLAG_CHANGED 2 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
18 #define OSDFLAG_BBOX 4 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
19 #define OSDFLAG_OLD_BBOX 8 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
20 #define OSDFLAG_FORCE_UPDATE 16 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
21 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
22 #define MAX_UCS 1600 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
23 #define MAX_UCSLINES 16 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
24 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
25 typedef struct mp_osd_obj_s { |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
26 struct mp_osd_obj_s* next; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
27 unsigned char type; |
11000 | 28 unsigned char alignment; // 2 bits: x;y percentages, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
29 unsigned short flags; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
30 int x,y; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
31 int dxs,dys; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
32 mp_osd_bbox_t bbox; // bounding box |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
33 mp_osd_bbox_t old_bbox; // the renderer will save bbox here |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
34 union { |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
35 struct { |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
36 void* sub; // value of vo_sub at last update |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
37 int utbl[MAX_UCS+1]; // subtitle text |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
38 int xtbl[MAX_UCSLINES]; // x positions |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
39 int lines; // no. of lines |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
40 } subtitle; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
41 struct { |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
42 int elems; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
43 } progbar; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
44 } params; |
7121
6abc330b5b32
subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separated
arpi
parents:
6304
diff
changeset
|
45 int stride; |
6abc330b5b32
subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separated
arpi
parents:
6304
diff
changeset
|
46 |
6abc330b5b32
subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separated
arpi
parents:
6304
diff
changeset
|
47 int allocated; |
6abc330b5b32
subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separated
arpi
parents:
6304
diff
changeset
|
48 unsigned char *alpha_buffer; |
6abc330b5b32
subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separated
arpi
parents:
6304
diff
changeset
|
49 unsigned char *bitmap_buffer; |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
50 } mp_osd_obj_t; |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
51 |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
52 |
865 | 53 #if 0 |
54 | |
55 // disable subtitles: | |
56 static inline 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)){ | |
57 } | |
58 | |
59 #else | |
60 | |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
11000
diff
changeset
|
61 #include "subreader.h" |
218 | 62 |
21370
b806ccbc6398
Remove some of the worst "headers include headers which include
reimar
parents:
21220
diff
changeset
|
63 extern sub_data* subdata; //currently used subtitles |
b806ccbc6398
Remove some of the worst "headers include headers which include
reimar
parents:
21220
diff
changeset
|
64 extern subtitle* vo_sub; |
b806ccbc6398
Remove some of the worst "headers include headers which include
reimar
parents:
21220
diff
changeset
|
65 |
218 | 66 extern unsigned char* vo_osd_text; |
67 | |
23903 | 68 extern void* vo_osd_teletext_page; |
69 extern int vo_osd_teletext_half; | |
70 extern int vo_osd_teletext_mode; | |
71 extern int vo_osd_teletext_format; | |
72 | |
218 | 73 extern int vo_osd_progbar_type; |
74 extern int vo_osd_progbar_value; // 0..255 | |
75 | |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
2498
diff
changeset
|
76 extern void* vo_spudec; |
4080 | 77 extern void* vo_vobsub; |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
2498
diff
changeset
|
78 |
218 | 79 #define OSD_PLAY 0x01 |
80 #define OSD_PAUSE 0x02 | |
81 #define OSD_STOP 0x03 | |
82 #define OSD_REW 0x04 | |
83 #define OSD_FFW 0x05 | |
84 #define OSD_CLOCK 0x06 | |
85 #define OSD_CONTRAST 0x07 | |
86 #define OSD_SATURATION 0x08 | |
87 #define OSD_VOLUME 0x09 | |
88 #define OSD_BRIGHTNESS 0x0A | |
89 #define OSD_HUE 0x0B | |
23568 | 90 #define OSD_BALANCE 0x0C |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6110
diff
changeset
|
91 #define OSD_PANSCAN 0x50 |
218 | 92 |
93 #define OSD_PB_START 0x10 | |
94 #define OSD_PB_0 0x11 | |
95 #define OSD_PB_END 0x12 | |
96 #define OSD_PB_1 0x13 | |
97 | |
1552 | 98 /* now in textform */ |
24046 | 99 extern char * sub_osd_names[]; |
100 extern char * sub_osd_names_short[]; | |
1552 | 101 |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5645
diff
changeset
|
102 extern int sub_unicode; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5645
diff
changeset
|
103 extern int sub_utf8; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5645
diff
changeset
|
104 |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5645
diff
changeset
|
105 extern char *sub_cp; |
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5645
diff
changeset
|
106 extern int sub_pos; |
8583 | 107 extern int sub_width_p; |
8534
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8361
diff
changeset
|
108 extern int sub_alignment; |
7628
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7121
diff
changeset
|
109 extern int sub_visibility; |
8617
6ffbe7608013
Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not "bkg".
rathann
parents:
8601
diff
changeset
|
110 extern int sub_bg_color; /* subtitles background color */ |
6ffbe7608013
Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not "bkg".
rathann
parents:
8601
diff
changeset
|
111 extern int sub_bg_alpha; |
9077
d430529c5b4b
Improvements to spudec (DVD/VobSub) subtitle code:
rfelker
parents:
8617
diff
changeset
|
112 extern int spu_alignment; |
d430529c5b4b
Improvements to spudec (DVD/VobSub) subtitle code:
rfelker
parents:
8617
diff
changeset
|
113 extern int spu_aamode; |
d430529c5b4b
Improvements to spudec (DVD/VobSub) subtitle code:
rfelker
parents:
8617
diff
changeset
|
114 extern float spu_gaussvar; |
5669
391931fa79a6
enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents:
5645
diff
changeset
|
115 |
898 | 116 //extern 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)); |
865 | 117 //extern 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)); |
118 //extern 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)); | |
898 | 119 extern 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)); |
5645 | 120 extern void vo_remove_text(int dxs,int dys,void (*remove)(int x0,int y0, int w,int h)); |
218 | 121 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17100
diff
changeset
|
122 void vo_init_osd(void); |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5294
diff
changeset
|
123 int vo_update_osd(int dxs,int dys); |
4807
156482788caf
osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents:
4080
diff
changeset
|
124 int vo_osd_changed(int new_value); |
6057
31e465fda59c
various openbsd and general warning fixes - patch by Bj«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
5669
diff
changeset
|
125 int vo_osd_check_range_update(int,int,int,int); |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17100
diff
changeset
|
126 void free_osd_list(void); |
4807
156482788caf
osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents:
4080
diff
changeset
|
127 |
5642
eb0cb6185e6c
osd: ok, now it's possible to do partial draw/clear of the buffer only if changed
arpi
parents:
5638
diff
changeset
|
128 extern int vo_osd_changed_flag; |
eb0cb6185e6c
osd: ok, now it's possible to do partial draw/clear of the buffer only if changed
arpi
parents:
5638
diff
changeset
|
129 |
21582
239f2c145b2f
Mark utf8_get_char parameter as const and fix a compiler warning
reimar
parents:
21370
diff
changeset
|
130 unsigned utf8_get_char(const char **str); |
18935 | 131 |
21219 | 132 #ifdef USE_DVDNAV |
21220 | 133 #include <inttypes.h> |
21219 | 134 void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey); |
135 #endif | |
136 | |
25595
88e8649d97e0
cosmetics: Whitespace changes, add comments to some #endif directives.
diego
parents:
25535
diff
changeset
|
137 #endif /* 0 */ |
25535
3baf6a2283da
Add explanatory comments to the #endif part of multiple inclusion guards.
diego
parents:
24046
diff
changeset
|
138 |
3baf6a2283da
Add explanatory comments to the #endif part of multiple inclusion guards.
diego
parents:
24046
diff
changeset
|
139 #endif /* MPLAYER_SUB_H */ |