annotate mpcommon.c @ 28326:51797a3b96d2

HAVE_3DNOWEX --> HAVE_3DNOWEXT
author diego
date Sun, 25 Jan 2009 21:03:02 +0000
parents 21504ba0f5d3
children d985feb803b5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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"
28325
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
8 #include "cpudetect.h"
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
9 #include "help_mp.h"
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
10 #include "mp_msg.h"
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
11 #include "spudec.h"
28325
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
12 #include "version.h"
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
13 #include "vobsub.h"
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27343
diff changeset
14 #ifdef CONFIG_TV_TELETEXT
23903
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
15 #include "stream/tv.h"
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
16 #endif
25855
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25656
diff changeset
17 #include "libavutil/intreadwrite.h"
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
18 #include "m_option.h"
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
19
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
20 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
21
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26422
diff changeset
22 #ifdef CONFIG_ASS
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
23 #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
24 #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
25 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
26 #endif
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
27
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
28 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
29 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
30
28325
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
31
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
32 void print_version(const char* name)
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
33 {
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
34 mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name);
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
35
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
36 /* Test for CPU capabilities (and corresponding OS support) for optimizing */
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
37 GetCpuCaps(&gCpuCaps);
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
38 #if ARCH_X86
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
39 mp_msg(MSGT_CPLAYER, MSGL_V,
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
40 "CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
41 gCpuCaps.hasMMX, gCpuCaps.hasMMX2,
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
42 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
43 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
44 #ifdef RUNTIME_CPUDETECT
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
45 mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithRuntimeDetection);
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
46 #else
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
47 mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithCPUExtensions);
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
48 #if HAVE_MMX
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
49 mp_msg(MSGT_CPLAYER,MSGL_V," MMX");
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
50 #endif
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
51 #if HAVE_MMX2
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
52 mp_msg(MSGT_CPLAYER,MSGL_V," MMX2");
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
53 #endif
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
54 #if HAVE_3DNOW
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
55 mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow");
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
56 #endif
28326
51797a3b96d2 HAVE_3DNOWEX --> HAVE_3DNOWEXT
diego
parents: 28325
diff changeset
57 #if HAVE_3DNOWEXT
28325
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
58 mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowEx");
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
59 #endif
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
60 #if HAVE_SSE
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
61 mp_msg(MSGT_CPLAYER,MSGL_V," SSE");
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
62 #endif
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
63 #if HAVE_SSE2
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
64 mp_msg(MSGT_CPLAYER,MSGL_V," SSE2");
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
65 #endif
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
66 mp_msg(MSGT_CPLAYER,MSGL_V,"\n");
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
67 #endif /* RUNTIME_CPUDETECT */
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
68 #endif /* ARCH_X86 */
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
69 }
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
70
21504ba0f5d3 Factorize print_version().
diego
parents: 27518
diff changeset
71
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
72 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
73 {
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
74 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
75 int len;
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
76 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
77 static subtitle subs;
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
78 if (reset) {
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
79 sub_clear_text(&subs, MP_NOPTS_VALUE);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
80 if (vo_sub) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
81 vo_sub = NULL;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
82 vo_osd_changed(OSDTYPE_SUBTITLE);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
83 }
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
84 if (vo_spudec) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
85 spudec_reset(vo_spudec);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
86 vo_osd_changed(OSDTYPE_SPU);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
87 }
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
88 }
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
89 // find sub
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
90 if (subdata) {
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
91 double pts = sh_video->pts;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
92 if (sub_fps==0) sub_fps = sh_video->fps;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
93 current_module = "find_sub";
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
94 if (pts > sub_last_pts || pts < sub_last_pts-1.0) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
95 find_sub(subdata, (pts+sub_delay) *
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
96 (subdata->sub_uses_time ? 100. : sub_fps));
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
97 if (vo_sub) vo_sub_last = vo_sub;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
98 // FIXME! frame counter...
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
99 sub_last_pts = pts;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
100 }
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
101 }
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
102
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
103 // DVD sub:
25509
1cfa39a320cc Fix update_subtitles() checking subtitle type for the wrong track.
eugeni
parents: 25322
diff changeset
104 if (vo_config_count && vo_spudec &&
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
105 (vobsub_id >= 0 || (dvdsub_id >= 0 && type == 'v'))) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
106 int timestamp;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
107 current_module = "spudec";
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
108 spudec_heartbeat(vo_spudec, 90000*sh_video->timer);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
109 /* Get a sub packet from the DVD or a vobsub and make a timestamp
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
110 * relative to sh_video->timer */
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
111 while(1) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
112 // Vobsub
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
113 len = 0;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
114 if (vo_vobsub) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
115 if (sh_video->pts+sub_delay >= 0) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
116 len = vobsub_get_packet(vo_vobsub, sh_video->pts+sub_delay,
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
117 (void**)&packet, &timestamp);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
118 if (len > 0) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
119 timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
120 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);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
121 }
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
122 }
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
123 } else {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
124 // DVD sub
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
125 len = ds_get_packet_sub(d_dvdsub, (unsigned char**)&packet);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
126 if (len > 0) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
127 // XXX This is wrong, sh_video->pts can be arbitrarily
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
128 // much behind demuxing position. Unfortunately using
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
129 // d_video->pts which would have been the simplest
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
130 // improvement doesn't work because mpeg specific hacks
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
131 // in video.c set d_video->pts to 0.
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
132 float x = d_dvdsub->pts - sh_video->pts;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
133 if (x > -20 && x < 20) // prevent missing subs on pts reset
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
134 timestamp = 90000*(sh_video->timer + d_dvdsub->pts
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
135 + sub_delay - sh_video->pts);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
136 else timestamp = 90000*(sh_video->timer + sub_delay);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
137 mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d "
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
138 "v_pts=%5.3f s_pts=%5.3f ts=%d \n", len,
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
139 sh_video->pts, d_dvdsub->pts, timestamp);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
140 }
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
141 }
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
142 if (len<=0 || !packet) break;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
143 if (vo_vobsub || timestamp >= 0)
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
144 spudec_assemble(vo_spudec, packet, len, timestamp);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
145 }
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
146
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
147 if (spudec_changed(vo_spudec))
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
148 vo_osd_changed(OSDTYPE_SPU);
25855
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25656
diff changeset
149 } else if (dvdsub_id >= 0 && (type == 't' || type == 'm' || type == 'a')) {
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
150 double curpts = sh_video->pts + sub_delay;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
151 double endpts;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
152 vo_sub = &subs;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
153 while (d_dvdsub->first) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
154 double pts = ds_get_next_pts(d_dvdsub);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
155 if (pts > curpts)
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
156 break;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
157 endpts = d_dvdsub->first->endpts;
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
158 len = ds_get_packet_sub(d_dvdsub, &packet);
25855
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25656
diff changeset
159 if (type == 'm') {
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25656
diff changeset
160 if (len < 2) continue;
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25656
diff changeset
161 len = FFMIN(len - 2, AV_RB16(packet));
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25656
diff changeset
162 packet += 2;
57a1511f4e76 Support mov subtitle format directly instead of converting to text in the demuxer
reimar
parents: 25656
diff changeset
163 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26422
diff changeset
164 #ifdef CONFIG_ASS
25856
d42e4a4942a4 Simplify subtitle handling with -ass
reimar
parents: 25855
diff changeset
165 if (ass_enabled) {
25655
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
166 sh_sub_t* sh = d_dvdsub->sh;
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
167 ass_track = sh ? sh->ass_track : NULL;
25856
d42e4a4942a4 Simplify subtitle handling with -ass
reimar
parents: 25855
diff changeset
168 if (!ass_track) continue;
d42e4a4942a4 Simplify subtitle handling with -ass
reimar
parents: 25855
diff changeset
169 if (type == 'a') { // ssa/ass subs with libass
27518
e54c9b7eb0d8 Revert bad changes to SSA/ASS subtitle packet format
uau
parents: 27498
diff changeset
170 ass_process_chunk(ass_track, packet, len,
e54c9b7eb0d8 Revert bad changes to SSA/ASS subtitle packet format
uau
parents: 27498
diff changeset
171 (long long)(pts*1000 + 0.5),
e54c9b7eb0d8 Revert bad changes to SSA/ASS subtitle packet format
uau
parents: 27498
diff changeset
172 (long long)((endpts-pts)*1000 + 0.5));
25857
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
173 } else { // plaintext subs with libass
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
174 vo_sub = NULL;
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
175 if (pts != MP_NOPTS_VALUE) {
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
176 if (endpts == MP_NOPTS_VALUE) endpts = pts + 3;
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
177 sub_clear_text(&subs, MP_NOPTS_VALUE);
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
178 sub_add_text(&subs, packet, len, endpts);
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
179 subs.start = pts * 100;
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
180 subs.end = endpts * 100;
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
181 ass_process_subtitle(ass_track, &subs);
4e593b5b4300 Reindent
reimar
parents: 25856
diff changeset
182 }
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
183 }
25655
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
184 continue;
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
185 }
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
186 #endif
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
187 if (pts != MP_NOPTS_VALUE) {
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
188 if (endpts == MP_NOPTS_VALUE)
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
189 sub_clear_text(&subs, MP_NOPTS_VALUE);
25655
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
190 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
191 int i;
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
192 unsigned char* p = packet;
27518
e54c9b7eb0d8 Revert bad changes to SSA/ASS subtitle packet format
uau
parents: 27498
diff changeset
193 for (i=0; i < 8 && *p != '\0'; p++)
25655
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
194 if (*p == ',')
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
195 i++;
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
196 if (*p == '\0') /* Broken line? */
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
197 continue;
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
198 len -= p - packet;
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
199 packet = p;
e98ceb0190c1 Move all subtitle parsing from mkv demuxer to update_subtitles().
eugeni
parents: 25604
diff changeset
200 }
25604
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
201 sub_add_text(&subs, packet, len, endpts);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
202 vo_osd_changed(OSDTYPE_SUBTITLE);
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
203 }
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
204 }
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
205 if (sub_clear_text(&subs, curpts))
11cae072ab88 Whitespace-only cosmetics: get rid of tabs
reimar
parents: 25509
diff changeset
206 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
207 }
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
208 current_module=NULL;
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents:
diff changeset
209 }
23903
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
210
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
211 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset)
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
212 {
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27343
diff changeset
213 #ifdef CONFIG_TV_TELETEXT
23903
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
214 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
215 int page_changed;
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
216
23903
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
217 if (demuxer->type != DEMUXER_TYPE_TV || !tvh) return;
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
218
24342
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
219 //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
220 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
221 page_changed=1;
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
222
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
223 if(!page_changed)
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
224 return;
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
225
23903
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
226 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=TVI_CONTROL_TRUE)
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
227 vo_osd_teletext_page=NULL;
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
228 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=TVI_CONTROL_TRUE)
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
229 vo_osd_teletext_half=0;
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
230 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=TVI_CONTROL_TRUE)
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
231 vo_osd_teletext_mode=0;
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
232 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=TVI_CONTROL_TRUE)
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
233 vo_osd_teletext_format=0;
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
234 vo_osd_changed(OSDTYPE_TELETEXT);
24342
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
235
8873c972c6aa Decrease teletext page rendering frequency from 1/frame to about 4/sec.
voroshil
parents: 23903
diff changeset
236 tvh->functions->control(tvh->priv,TV_VBI_CONTROL_MARK_UNCHANGED,NULL);
23903
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
237 #endif
037737866f6a Teletext support
voroshil
parents: 23573
diff changeset
238 }
26090
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
239
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
240 int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang)
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
241 {
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
242 if (audio_id == -1 && audio_lang)
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
243 audio_id = demuxer_audio_track_by_lang(demuxer, audio_lang);
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26090
diff changeset
244 if (audio_id == -1)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26090
diff changeset
245 audio_id = demuxer_default_audio_track(demuxer);
26090
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
246 if (audio_id != -1) // -1 (automatic) is the default behaviour of demuxers
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
247 demuxer_switch_audio(demuxer, audio_id);
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
248 if (audio_id == -2) { // some demuxers don't yet know how to switch to no sound
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
249 demuxer->audio->id = -2;
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
250 demuxer->audio->sh = NULL;
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
251 }
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
252 return demuxer->audio->id;
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 25857
diff changeset
253 }
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
254
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
255 /* Parse -noconfig common to both programs */
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
256 int disable_system_conf=0;
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
257 int disable_user_conf=0;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
258 #ifdef CONFIG_GUI
26422
f74bff77f088 noconfig fix, disable_gui_conf was not defined when compiling mencoder.
albeu
parents: 26416
diff changeset
259 int disable_gui_conf=0;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
260 #endif /* CONFIG_GUI */
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
261
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
262 /* Disable all configuration files */
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
263 static void noconfig_all(void)
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
264 {
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
265 disable_system_conf = 1;
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
266 disable_user_conf = 1;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
267 #ifdef CONFIG_GUI
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
268 disable_gui_conf = 1;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
269 #endif /* CONFIG_GUI */
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
270 }
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
271
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
272 const m_option_t noconfig_opts[] = {
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
273 {"all", noconfig_all, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
274 {"system", &disable_system_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
275 {"user", &disable_user_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
276 #ifdef CONFIG_GUI
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
277 {"gui", &disable_gui_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
278 #endif /* CONFIG_GUI */
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
279 {NULL, NULL, 0, 0, 0, 0, NULL}
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26269
diff changeset
280 };