Mercurial > mplayer.hg
annotate mpcommon.c @ 28326:51797a3b96d2
HAVE_3DNOWEX --> HAVE_3DNOWEXT
author | diego |
---|---|
date | Sun, 25 Jan 2009 21:03:02 +0000 |
parents | 21504ba0f5d3 |
children | d985feb803b5 |
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 | 8 #include "cpudetect.h" |
9 #include "help_mp.h" | |
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 | 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 | 15 #include "stream/tv.h" |
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 | 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 | 31 |
32 void print_version(const char* name) | |
33 { | |
34 mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name); | |
35 | |
36 /* Test for CPU capabilities (and corresponding OS support) for optimizing */ | |
37 GetCpuCaps(&gCpuCaps); | |
38 #if ARCH_X86 | |
39 mp_msg(MSGT_CPLAYER, MSGL_V, | |
40 "CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", | |
41 gCpuCaps.hasMMX, gCpuCaps.hasMMX2, | |
42 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, | |
43 gCpuCaps.hasSSE, gCpuCaps.hasSSE2); | |
44 #ifdef RUNTIME_CPUDETECT | |
45 mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithRuntimeDetection); | |
46 #else | |
47 mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithCPUExtensions); | |
48 #if HAVE_MMX | |
49 mp_msg(MSGT_CPLAYER,MSGL_V," MMX"); | |
50 #endif | |
51 #if HAVE_MMX2 | |
52 mp_msg(MSGT_CPLAYER,MSGL_V," MMX2"); | |
53 #endif | |
54 #if HAVE_3DNOW | |
55 mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow"); | |
56 #endif | |
28326 | 57 #if HAVE_3DNOWEXT |
28325 | 58 mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowEx"); |
59 #endif | |
60 #if HAVE_SSE | |
61 mp_msg(MSGT_CPLAYER,MSGL_V," SSE"); | |
62 #endif | |
63 #if HAVE_SSE2 | |
64 mp_msg(MSGT_CPLAYER,MSGL_V," SSE2"); | |
65 #endif | |
66 mp_msg(MSGT_CPLAYER,MSGL_V,"\n"); | |
67 #endif /* RUNTIME_CPUDETECT */ | |
68 #endif /* ARCH_X86 */ | |
69 } | |
70 | |
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 | 79 sub_clear_text(&subs, MP_NOPTS_VALUE); |
80 if (vo_sub) { | |
81 vo_sub = NULL; | |
82 vo_osd_changed(OSDTYPE_SUBTITLE); | |
83 } | |
84 if (vo_spudec) { | |
85 spudec_reset(vo_spudec); | |
86 vo_osd_changed(OSDTYPE_SPU); | |
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 | 91 double pts = sh_video->pts; |
92 if (sub_fps==0) sub_fps = sh_video->fps; | |
93 current_module = "find_sub"; | |
94 if (pts > sub_last_pts || pts < sub_last_pts-1.0) { | |
95 find_sub(subdata, (pts+sub_delay) * | |
96 (subdata->sub_uses_time ? 100. : sub_fps)); | |
97 if (vo_sub) vo_sub_last = vo_sub; | |
98 // FIXME! frame counter... | |
99 sub_last_pts = pts; | |
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 | 105 (vobsub_id >= 0 || (dvdsub_id >= 0 && type == 'v'))) { |
106 int timestamp; | |
107 current_module = "spudec"; | |
108 spudec_heartbeat(vo_spudec, 90000*sh_video->timer); | |
109 /* Get a sub packet from the DVD or a vobsub and make a timestamp | |
110 * relative to sh_video->timer */ | |
111 while(1) { | |
112 // Vobsub | |
113 len = 0; | |
114 if (vo_vobsub) { | |
115 if (sh_video->pts+sub_delay >= 0) { | |
116 len = vobsub_get_packet(vo_vobsub, sh_video->pts+sub_delay, | |
117 (void**)&packet, ×tamp); | |
118 if (len > 0) { | |
119 timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000; | |
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); | |
121 } | |
122 } | |
123 } else { | |
124 // DVD sub | |
125 len = ds_get_packet_sub(d_dvdsub, (unsigned char**)&packet); | |
126 if (len > 0) { | |
127 // XXX This is wrong, sh_video->pts can be arbitrarily | |
128 // much behind demuxing position. Unfortunately using | |
129 // d_video->pts which would have been the simplest | |
130 // improvement doesn't work because mpeg specific hacks | |
131 // in video.c set d_video->pts to 0. | |
132 float x = d_dvdsub->pts - sh_video->pts; | |
133 if (x > -20 && x < 20) // prevent missing subs on pts reset | |
134 timestamp = 90000*(sh_video->timer + d_dvdsub->pts | |
135 + sub_delay - sh_video->pts); | |
136 else timestamp = 90000*(sh_video->timer + sub_delay); | |
137 mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d " | |
138 "v_pts=%5.3f s_pts=%5.3f ts=%d \n", len, | |
139 sh_video->pts, d_dvdsub->pts, timestamp); | |
140 } | |
141 } | |
142 if (len<=0 || !packet) break; | |
143 if (vo_vobsub || timestamp >= 0) | |
144 spudec_assemble(vo_spudec, packet, len, timestamp); | |
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 | 147 if (spudec_changed(vo_spudec)) |
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 | 150 double curpts = sh_video->pts + sub_delay; |
151 double endpts; | |
152 vo_sub = &subs; | |
153 while (d_dvdsub->first) { | |
154 double pts = ds_get_next_pts(d_dvdsub); | |
155 if (pts > curpts) | |
156 break; | |
157 endpts = d_dvdsub->first->endpts; | |
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 | 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 | 168 if (!ass_track) continue; |
169 if (type == 'a') { // ssa/ass subs with libass | |
27518 | 170 ass_process_chunk(ass_track, packet, len, |
171 (long long)(pts*1000 + 0.5), | |
172 (long long)((endpts-pts)*1000 + 0.5)); | |
25857 | 173 } else { // plaintext subs with libass |
174 vo_sub = NULL; | |
175 if (pts != MP_NOPTS_VALUE) { | |
176 if (endpts == MP_NOPTS_VALUE) endpts = pts + 3; | |
177 sub_clear_text(&subs, MP_NOPTS_VALUE); | |
178 sub_add_text(&subs, packet, len, endpts); | |
179 subs.start = pts * 100; | |
180 subs.end = endpts * 100; | |
181 ass_process_subtitle(ass_track, &subs); | |
182 } | |
25604 | 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 | 187 if (pts != MP_NOPTS_VALUE) { |
188 if (endpts == MP_NOPTS_VALUE) | |
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 | 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 | 201 sub_add_text(&subs, packet, len, endpts); |
202 vo_osd_changed(OSDTYPE_SUBTITLE); | |
203 } | |
204 } | |
205 if (sub_clear_text(&subs, curpts)) | |
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 | 210 |
211 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset) | |
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 | 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 | 217 if (demuxer->type != DEMUXER_TYPE_TV || !tvh) return; |
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 | 226 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=TVI_CONTROL_TRUE) |
227 vo_osd_teletext_page=NULL; | |
228 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=TVI_CONTROL_TRUE) | |
229 vo_osd_teletext_half=0; | |
230 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=TVI_CONTROL_TRUE) | |
231 vo_osd_teletext_mode=0; | |
232 if(tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=TVI_CONTROL_TRUE) | |
233 vo_osd_teletext_format=0; | |
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 | 237 #endif |
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 | 254 |
255 /* Parse -noconfig common to both programs */ | |
256 int disable_system_conf=0; | |
257 int disable_user_conf=0; | |
27343 | 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 | 260 #endif /* CONFIG_GUI */ |
26416 | 261 |
262 /* Disable all configuration files */ | |
263 static void noconfig_all(void) | |
264 { | |
265 disable_system_conf = 1; | |
266 disable_user_conf = 1; | |
27343 | 267 #ifdef CONFIG_GUI |
26416 | 268 disable_gui_conf = 1; |
27343 | 269 #endif /* CONFIG_GUI */ |
26416 | 270 } |
271 | |
272 const m_option_t noconfig_opts[] = { | |
273 {"all", noconfig_all, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, | |
274 {"system", &disable_system_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL}, | |
275 {"user", &disable_user_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL}, | |
27343 | 276 #ifdef CONFIG_GUI |
26416 | 277 {"gui", &disable_gui_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL}, |
27343 | 278 #endif /* CONFIG_GUI */ |
26416 | 279 {NULL, NULL, 0, 0, 0, 0, NULL} |
280 }; |