Mercurial > mplayer.hg
annotate mpcommon.c @ 25791:5448bd27b954
Fix vobsub_seek use same reseek method as vobsub_get_packet did.
author | ulion |
---|---|
date | Sun, 20 Jan 2008 15:43:10 +0000 |
parents | 00e4d59a0be4 |
children | 57a1511f4e76 |
rev | line source |
---|---|
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
1 #include <stdlib.h> |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
2 #include "stream/stream.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
3 #include "libmpdemux/demuxer.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
4 #include "libmpdemux/stheader.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
5 #include "mplayer.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
6 #include "libvo/sub.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
7 #include "libvo/video_out.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
8 #include "spudec.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
9 #include "vobsub.h" |
23903 | 10 #ifdef HAVE_TV_TELETEXT |
11 #include "stream/tv.h" | |
12 #endif | |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
13 |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
14 double sub_last_pts = -303; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
15 |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
16 #ifdef USE_ASS |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
17 #include "libass/ass.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
18 #include "libass/ass_mp.h" |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
19 ass_track_t* ass_track = 0; // current track to render |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
20 #endif |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
21 |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
22 sub_data* subdata = NULL; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
23 subtitle* vo_sub_last = NULL; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
24 |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
25 void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset) |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
26 { |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
27 unsigned char *packet=NULL; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
28 int len; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
29 char type = d_dvdsub->sh ? ((sh_sub_t *)d_dvdsub->sh)->type : 'v'; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
30 static subtitle subs; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
31 if (reset) { |
25604 | 32 sub_clear_text(&subs, MP_NOPTS_VALUE); |
33 if (vo_sub) { | |
34 vo_sub = NULL; | |
35 vo_osd_changed(OSDTYPE_SUBTITLE); | |
36 } | |
37 if (vo_spudec) { | |
38 spudec_reset(vo_spudec); | |
39 vo_osd_changed(OSDTYPE_SPU); | |
40 } | |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
41 } |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
42 // find sub |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
43 if (subdata) { |
25604 | 44 double pts = sh_video->pts; |
45 if (sub_fps==0) sub_fps = sh_video->fps; | |
46 current_module = "find_sub"; | |
47 if (pts > sub_last_pts || pts < sub_last_pts-1.0) { | |
48 find_sub(subdata, (pts+sub_delay) * | |
49 (subdata->sub_uses_time ? 100. : sub_fps)); | |
50 if (vo_sub) vo_sub_last = vo_sub; | |
51 // FIXME! frame counter... | |
52 sub_last_pts = pts; | |
53 } | |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
54 } |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
55 |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
56 // DVD sub: |
25509
1cfa39a320cc
Fix update_subtitles() checking subtitle type for the wrong track.
eugeni
parents:
25322
diff
changeset
|
57 if (vo_config_count && vo_spudec && |
25604 | 58 (vobsub_id >= 0 || (dvdsub_id >= 0 && type == 'v'))) { |
59 int timestamp; | |
60 current_module = "spudec"; | |
61 spudec_heartbeat(vo_spudec, 90000*sh_video->timer); | |
62 /* Get a sub packet from the DVD or a vobsub and make a timestamp | |
63 * relative to sh_video->timer */ | |
64 while(1) { | |
65 // Vobsub | |
66 len = 0; | |
67 if (vo_vobsub) { | |
68 if (sh_video->pts+sub_delay >= 0) { | |
69 len = vobsub_get_packet(vo_vobsub, sh_video->pts+sub_delay, | |
70 (void**)&packet, ×tamp); | |
71 if (len > 0) { | |
72 timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000; | |
73 mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0,timestamp); | |
74 } | |
75 } | |
76 } else { | |
77 // DVD sub | |
78 len = ds_get_packet_sub(d_dvdsub, (unsigned char**)&packet); | |
79 if (len > 0) { | |
80 // XXX This is wrong, sh_video->pts can be arbitrarily | |
81 // much behind demuxing position. Unfortunately using | |
82 // d_video->pts which would have been the simplest | |
83 // improvement doesn't work because mpeg specific hacks | |
84 // in video.c set d_video->pts to 0. | |
85 float x = d_dvdsub->pts - sh_video->pts; | |
86 if (x > -20 && x < 20) // prevent missing subs on pts reset | |
87 timestamp = 90000*(sh_video->timer + d_dvdsub->pts | |
88 + sub_delay - sh_video->pts); | |
89 else timestamp = 90000*(sh_video->timer + sub_delay); | |
90 mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d " | |
91 "v_pts=%5.3f s_pts=%5.3f ts=%d \n", len, | |
92 sh_video->pts, d_dvdsub->pts, timestamp); | |
93 } | |
94 } | |
95 if (len<=0 || !packet) break; | |
96 if (vo_vobsub || timestamp >= 0) | |
97 spudec_assemble(vo_spudec, packet, len, timestamp); | |
98 } | |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
99 |
25604 | 100 if (spudec_changed(vo_spudec)) |
101 vo_osd_changed(OSDTYPE_SPU); | |
25655
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
102 } else if (dvdsub_id >= 0 && (type == 't' || type == 'a')) { |
25604 | 103 double curpts = sh_video->pts + sub_delay; |
104 double endpts; | |
105 vo_sub = &subs; | |
106 while (d_dvdsub->first) { | |
107 double pts = ds_get_next_pts(d_dvdsub); | |
108 if (pts > curpts) | |
109 break; | |
110 endpts = d_dvdsub->first->endpts; | |
111 len = ds_get_packet_sub(d_dvdsub, &packet); | |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
112 #ifdef USE_ASS |
25655
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
113 if (type == 'a' && ass_enabled) { // ssa/ass subs with libass |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
114 sh_sub_t* sh = d_dvdsub->sh; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
115 ass_track = sh ? sh->ass_track : NULL; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
116 if (ass_track) |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
117 ass_process_chunk(ass_track, packet, len, |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
118 (long long)(pts*1000 + 0.5), |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
119 (long long)((endpts-pts)*1000 + 0.5)); |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
120 continue; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
121 } |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
122 if (type == 't' && ass_enabled) { // plaintext subs with libass |
25656
00e4d59a0be4
Remove global_ass_track. Instead create an ass_track for each 't' track.
eugeni
parents:
25655
diff
changeset
|
123 sh_sub_t* sh = d_dvdsub->sh; |
00e4d59a0be4
Remove global_ass_track. Instead create an ass_track for each 't' track.
eugeni
parents:
25655
diff
changeset
|
124 ass_track = sh ? sh->ass_track : NULL; |
25604 | 125 vo_sub = NULL; |
25656
00e4d59a0be4
Remove global_ass_track. Instead create an ass_track for each 't' track.
eugeni
parents:
25655
diff
changeset
|
126 if (ass_track && pts != MP_NOPTS_VALUE) { |
25604 | 127 if (endpts == MP_NOPTS_VALUE) endpts = pts + 3; |
128 sub_clear_text(&subs, MP_NOPTS_VALUE); | |
129 sub_add_text(&subs, packet, len, endpts); | |
130 subs.start = pts * 100; | |
131 subs.end = endpts * 100; | |
132 ass_process_subtitle(ass_track, &subs); | |
133 } | |
25655
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
134 continue; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
135 } |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
136 #endif |
25604 | 137 if (pts != MP_NOPTS_VALUE) { |
138 if (endpts == MP_NOPTS_VALUE) | |
139 sub_clear_text(&subs, MP_NOPTS_VALUE); | |
25655
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
140 if (type == 'a') { // ssa/ass subs without libass => convert to plaintext |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
141 int i; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
142 unsigned char* p = packet; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
143 for (i=0; i < 8 && *p != '\0'; p++) |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
144 if (*p == ',') |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
145 i++; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
146 if (*p == '\0') /* Broken line? */ |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
147 continue; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
148 len -= p - packet; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
149 packet = p; |
e98ceb0190c1
Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents:
25604
diff
changeset
|
150 } |
25604 | 151 sub_add_text(&subs, packet, len, endpts); |
152 vo_osd_changed(OSDTYPE_SUBTITLE); | |
153 } | |
154 } | |
155 if (sub_clear_text(&subs, curpts)) | |
156 vo_osd_changed(OSDTYPE_SUBTITLE); | |
22233
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
157 } |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
158 current_module=NULL; |
5bf6c178f09a
Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff
changeset
|
159 } |
23903 | 160 |
161 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset) | |
162 { | |
163 #ifdef HAVE_TV_TELETEXT | |
164 tvi_handle_t* tvh=demuxer->priv; | |
24342
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
165 int page_changed; |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
166 |
23903 | 167 if (demuxer->type != DEMUXER_TYPE_TV || !tvh) return; |
168 | |
24342
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
169 //Also forcing page update when such ioctl is not supported or call error occured |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
170 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_IS_CHANGED,&page_changed)!=TVI_CONTROL_TRUE) |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
171 page_changed=1; |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
172 |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
173 if(!page_changed) |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
174 return; |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
175 |
23903 | 176 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=TVI_CONTROL_TRUE) |
177 vo_osd_teletext_page=NULL; | |
178 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=TVI_CONTROL_TRUE) | |
179 vo_osd_teletext_half=0; | |
180 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=TVI_CONTROL_TRUE) | |
181 vo_osd_teletext_mode=0; | |
182 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=TVI_CONTROL_TRUE) | |
183 vo_osd_teletext_format=0; | |
184 vo_osd_changed(OSDTYPE_TELETEXT); | |
24342
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
185 |
8873c972c6aa
Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents:
23903
diff
changeset
|
186 tvh->functions->control(tvh->priv,TV_VBI_CONTROL_MARK_UNCHANGED,NULL); |
23903 | 187 #endif |
188 } |