Mercurial > mplayer.hg
annotate libmpdemux/demuxer.c @ 29807:fe38b68ae9f4
Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
Patch by Francesco Lavra, francescolavra interfree it
author | cehoyos |
---|---|
date | Sat, 07 Nov 2009 12:55:07 +0000 |
parents | db80b9d20406 |
children | 07a96d936943 |
rev | line source |
---|---|
29238
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
1 /* |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
2 * DEMUXER v2.5 |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
3 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
4 * This file is part of MPlayer. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
5 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
6 * MPlayer is free software; you can redistribute it and/or modify |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
9 * (at your option) any later version. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
10 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
11 * MPlayer is distributed in the hope that it will be useful, |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
14 * GNU General Public License for more details. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
15 * |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
16 * You should have received a copy of the GNU General Public License along |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
17 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
d643e4643313
Add standard license header to all files in libmpdemux.
diego
parents:
29056
diff
changeset
|
19 */ |
1 | 20 |
1430 | 21 #include <stdio.h> |
22 #include <stdlib.h> | |
3150 | 23 #include <string.h> |
1430 | 24 #include <unistd.h> |
25 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
26 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
27 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
28 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
29 #include "config.h" |
1567 | 30 #include "mp_msg.h" |
1584 | 31 #include "help_mp.h" |
17012 | 32 #include "m_config.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
33 |
17200
a1b8eeffdfcd
include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents:
17012
diff
changeset
|
34 #include "libvo/fastmemcpy.h" |
a1b8eeffdfcd
include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents:
17012
diff
changeset
|
35 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22488
diff
changeset
|
36 #include "stream/stream.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
37 #include "demuxer.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
38 #include "stheader.h" |
4551 | 39 #include "mf.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
40 |
17012 | 41 #include "libaf/af_format.h" |
5084 | 42 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
43 #ifdef CONFIG_ASS |
25654
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
44 #include "libass/ass.h" |
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
45 #include "libass/ass_mp.h" |
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
46 #endif |
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
47 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
48 #ifdef CONFIG_LIBAVCODEC |
27282
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
49 #include "libavcodec/avcodec.h" |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
50 #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
51 #error MP_INPUT_BUFFER_PADDING_SIZE is too small! |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
52 #endif |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
53 #endif |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
54 |
28051 | 55 void resync_video_stream(sh_video_t *sh_video); |
56 void resync_audio_stream(sh_audio_t *sh_audio); | |
16175 | 57 |
58 // Demuxer list | |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
59 extern const demuxer_desc_t demuxer_desc_rawaudio; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
60 extern const demuxer_desc_t demuxer_desc_rawvideo; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
61 extern const demuxer_desc_t demuxer_desc_tv; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
62 extern const demuxer_desc_t demuxer_desc_mf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
63 extern const demuxer_desc_t demuxer_desc_avi; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
64 extern const demuxer_desc_t demuxer_desc_y4m; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
65 extern const demuxer_desc_t demuxer_desc_asf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
66 extern const demuxer_desc_t demuxer_desc_real; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
67 extern const demuxer_desc_t demuxer_desc_smjpeg; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
68 extern const demuxer_desc_t demuxer_desc_matroska; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
69 extern const demuxer_desc_t demuxer_desc_realaudio; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
70 extern const demuxer_desc_t demuxer_desc_vqf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
71 extern const demuxer_desc_t demuxer_desc_mov; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
72 extern const demuxer_desc_t demuxer_desc_vivo; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
73 extern const demuxer_desc_t demuxer_desc_fli; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
74 extern const demuxer_desc_t demuxer_desc_film; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
75 extern const demuxer_desc_t demuxer_desc_roq; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
76 extern const demuxer_desc_t demuxer_desc_gif; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
77 extern const demuxer_desc_t demuxer_desc_ogg; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
78 extern const demuxer_desc_t demuxer_desc_avs; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
79 extern const demuxer_desc_t demuxer_desc_pva; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
80 extern const demuxer_desc_t demuxer_desc_nsv; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
81 extern const demuxer_desc_t demuxer_desc_mpeg_ts; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
82 extern const demuxer_desc_t demuxer_desc_lmlm4; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
83 extern const demuxer_desc_t demuxer_desc_mpeg_ps; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
84 extern const demuxer_desc_t demuxer_desc_mpeg_pes; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
85 extern const demuxer_desc_t demuxer_desc_mpeg_es; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
86 extern const demuxer_desc_t demuxer_desc_mpeg_gxf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
87 extern const demuxer_desc_t demuxer_desc_mpeg4_es; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
88 extern const demuxer_desc_t demuxer_desc_h264_es; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
89 extern const demuxer_desc_t demuxer_desc_rawdv; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
90 extern const demuxer_desc_t demuxer_desc_mpc; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
91 extern const demuxer_desc_t demuxer_desc_audio; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
92 extern const demuxer_desc_t demuxer_desc_xmms; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
93 extern const demuxer_desc_t demuxer_desc_mpeg_ty; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
94 extern const demuxer_desc_t demuxer_desc_rtp; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
95 extern const demuxer_desc_t demuxer_desc_rtp_nemesi; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
96 extern const demuxer_desc_t demuxer_desc_lavf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
97 extern const demuxer_desc_t demuxer_desc_lavf_preferred; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
98 extern const demuxer_desc_t demuxer_desc_aac; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
99 extern const demuxer_desc_t demuxer_desc_nut; |
28018
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
100 extern const demuxer_desc_t demuxer_desc_mng; |
16175 | 101 |
25876
edfe8baed49f
copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents:
25872
diff
changeset
|
102 /* Please do not add any new demuxers here. If you want to implement a new |
25880
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
103 * demuxer, add it to libavformat, except for wrappers around external |
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
104 * libraries and demuxers requiring binary support. */ |
25876
edfe8baed49f
copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents:
25872
diff
changeset
|
105 |
27054 | 106 const demuxer_desc_t *const demuxer_list[] = { |
27055 | 107 &demuxer_desc_rawaudio, |
108 &demuxer_desc_rawvideo, | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
109 #ifdef CONFIG_TV |
27055 | 110 &demuxer_desc_tv, |
16175 | 111 #endif |
27055 | 112 &demuxer_desc_mf, |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
113 #ifdef CONFIG_LIBAVFORMAT |
27055 | 114 &demuxer_desc_lavf_preferred, |
23069
93948eb0280f
demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO
nicodvb
parents:
22971
diff
changeset
|
115 #endif |
27055 | 116 &demuxer_desc_avi, |
117 &demuxer_desc_y4m, | |
118 &demuxer_desc_asf, | |
119 &demuxer_desc_nsv, | |
120 &demuxer_desc_real, | |
121 &demuxer_desc_smjpeg, | |
122 &demuxer_desc_matroska, | |
123 &demuxer_desc_realaudio, | |
124 &demuxer_desc_vqf, | |
125 &demuxer_desc_mov, | |
126 &demuxer_desc_vivo, | |
127 &demuxer_desc_fli, | |
128 &demuxer_desc_film, | |
129 &demuxer_desc_roq, | |
27385
2113bd9c6bd9
Rename preprocessor directives related to image libraries.
diego
parents:
27363
diff
changeset
|
130 #ifdef CONFIG_GIF |
27055 | 131 &demuxer_desc_gif, |
16175 | 132 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
133 #ifdef CONFIG_OGGVORBIS |
27055 | 134 &demuxer_desc_ogg, |
16175 | 135 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
136 #ifdef CONFIG_WIN32DLL |
27055 | 137 &demuxer_desc_avs, |
16175 | 138 #endif |
27055 | 139 &demuxer_desc_pva, |
140 &demuxer_desc_mpeg_ts, | |
141 &demuxer_desc_lmlm4, | |
142 &demuxer_desc_mpeg_ps, | |
143 &demuxer_desc_mpeg_pes, | |
144 &demuxer_desc_mpeg_es, | |
145 &demuxer_desc_mpeg_gxf, | |
146 &demuxer_desc_mpeg4_es, | |
147 &demuxer_desc_h264_es, | |
148 &demuxer_desc_audio, | |
149 &demuxer_desc_mpeg_ty, | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27395
diff
changeset
|
150 #ifdef CONFIG_LIVE555 |
27055 | 151 &demuxer_desc_rtp, |
16175 | 152 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27395
diff
changeset
|
153 #ifdef CONFIG_LIBNEMESI |
27055 | 154 &demuxer_desc_rtp_nemesi, |
25266
239330301b33
Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents:
25197
diff
changeset
|
155 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
156 #ifdef CONFIG_LIBAVFORMAT |
27055 | 157 &demuxer_desc_lavf, |
16175 | 158 #endif |
27395 | 159 #ifdef CONFIG_MUSEPACK |
27055 | 160 &demuxer_desc_mpc, |
26873
a90971b955af
Move native musepack demuxer further down in demuxer list
reimar
parents:
26758
diff
changeset
|
161 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
162 #ifdef CONFIG_LIBDV095 |
27055 | 163 &demuxer_desc_rawdv, |
18900
0b53e6d1b27f
move some ill-behaving demuxers further down the list
reimar
parents:
18708
diff
changeset
|
164 #endif |
27055 | 165 &demuxer_desc_aac, |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
166 #ifdef CONFIG_LIBNUT |
27055 | 167 &demuxer_desc_nut, |
19861 | 168 #endif |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27385
diff
changeset
|
169 #ifdef CONFIG_XMMS |
27055 | 170 &demuxer_desc_xmms, |
18900
0b53e6d1b27f
move some ill-behaving demuxers further down the list
reimar
parents:
18708
diff
changeset
|
171 #endif |
28018
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
172 #ifdef CONFIG_MNG |
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
173 &demuxer_desc_mng, |
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
174 #endif |
27055 | 175 /* Please do not add any new demuxers here. If you want to implement a new |
176 * demuxer, add it to libavformat, except for wrappers around external | |
177 * libraries and demuxers requiring binary support. */ | |
178 NULL | |
16175 | 179 }; |
180 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
181 void free_demuxer_stream(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
182 { |
1643 | 183 ds_free_packs(ds); |
184 free(ds); | |
185 } | |
186 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
187 demux_stream_t *new_demuxer_stream(struct demuxer_st *demuxer, int id) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
188 { |
27055 | 189 demux_stream_t *ds = malloc(sizeof(demux_stream_t)); |
29770
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
190 *ds = (demux_stream_t){ |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
191 .id = id, |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
192 .demuxer = demuxer, |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
193 .asf_seq = -1, |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
194 }; |
27055 | 195 return ds; |
1 | 196 } |
197 | |
16175 | 198 |
199 /** | |
200 * Get demuxer description structure for a given demuxer type | |
201 * | |
202 * @param file_format type of the demuxer | |
203 * @return structure for the demuxer, NULL if not found | |
204 */ | |
27054 | 205 static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format) |
16175 | 206 { |
27055 | 207 int i; |
16175 | 208 |
27055 | 209 for (i = 0; demuxer_list[i]; i++) |
210 if (file_format == demuxer_list[i]->type) | |
211 return demuxer_list[i]; | |
16175 | 212 |
27055 | 213 return NULL; |
16175 | 214 } |
215 | |
216 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
217 demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
218 int s_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
219 { |
27055 | 220 demuxer_t *d = malloc(sizeof(demuxer_t)); |
221 memset(d, 0, sizeof(demuxer_t)); | |
222 d->stream = stream; | |
223 d->stream_pts = MP_NOPTS_VALUE; | |
224 d->reference_clock = MP_NOPTS_VALUE; | |
225 d->movi_start = stream->start_pos; | |
226 d->movi_end = stream->end_pos; | |
227 d->seekable = 1; | |
228 d->synced = 0; | |
29486
a373af1e3b24
Handle demuxers that never set filepos by using stream_tell.
reimar
parents:
29366
diff
changeset
|
229 d->filepos = -1; |
27055 | 230 d->audio = new_demuxer_stream(d, a_id); |
231 d->video = new_demuxer_stream(d, v_id); | |
232 d->sub = new_demuxer_stream(d, s_id); | |
233 d->type = type; | |
234 if (type) | |
235 if (!(d->desc = get_demuxer_desc_from_type(type))) | |
27056 | 236 mp_msg(MSGT_DEMUXER, MSGL_ERR, |
237 "BUG! Invalid demuxer type in new_demuxer(), " | |
238 "big troubles ahead."); | |
27055 | 239 if (filename) // Filename hack for avs_check_file |
240 d->filename = strdup(filename); | |
241 stream_reset(stream); | |
242 stream_seek(stream, stream->start_pos); | |
243 return d; | |
1 | 244 } |
245 | |
24022
4d576e0ed40b
When a new subtitle stream becomes available check if it is the one that
reimar
parents:
23865
diff
changeset
|
246 extern int dvdsub_id; |
4d576e0ed40b
When a new subtitle stream becomes available check if it is the one that
reimar
parents:
23865
diff
changeset
|
247 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
248 sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
249 { |
27055 | 250 if (id > MAX_S_STREAMS - 1 || id < 0) { |
27056 | 251 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
252 "Requested sub stream id overflow (%d > %d)\n", id, | |
253 MAX_S_STREAMS); | |
27055 | 254 return NULL; |
255 } | |
256 if (demuxer->s_streams[id]) | |
257 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id); | |
258 else { | |
259 sh_sub_t *sh = calloc(1, sizeof(sh_sub_t)); | |
260 demuxer->s_streams[id] = sh; | |
261 sh->sid = sid; | |
262 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid); | |
263 } | |
29056
93e72ef080ab
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
reimar
parents:
28872
diff
changeset
|
264 if (sid == dvdsub_id) { |
93e72ef080ab
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
reimar
parents:
28872
diff
changeset
|
265 demuxer->sub->id = id; |
93e72ef080ab
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
reimar
parents:
28872
diff
changeset
|
266 demuxer->sub->sh = demuxer->s_streams[id]; |
93e72ef080ab
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
reimar
parents:
28872
diff
changeset
|
267 } |
27055 | 268 return demuxer->s_streams[id]; |
20872
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20851
diff
changeset
|
269 } |
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20851
diff
changeset
|
270 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
271 void free_sh_sub(sh_sub_t *sh) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
272 { |
23592 | 273 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh); |
26085 | 274 free(sh->extradata); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
275 #ifdef CONFIG_ASS |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
276 if (sh->ass_track) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
277 ass_free_track(sh->ass_track); |
25702
c4275201a489
Add a forgotten #ifdef USE_ASS around ass_free_track
reimar
parents:
25657
diff
changeset
|
278 #endif |
26082 | 279 free(sh->lang); |
23592 | 280 free(sh); |
281 } | |
282 | |
27054 | 283 sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
284 { |
27055 | 285 if (id > MAX_A_STREAMS - 1 || id < 0) { |
27056 | 286 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
287 "Requested audio stream id overflow (%d > %d)\n", id, | |
288 MAX_A_STREAMS); | |
27052 | 289 return NULL; |
4642 | 290 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
291 if (demuxer->a_streams[id]) |
27055 | 292 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_AudioStreamRedefined, id); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
293 else { |
26874 | 294 sh_audio_t *sh = calloc(1, sizeof(sh_audio_t)); |
27055 | 295 mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundAudioStream, id); |
26874 | 296 demuxer->a_streams[id] = sh; |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
297 sh->aid = aid; |
26876 | 298 sh->ds = demuxer->audio; |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
299 // set some defaults |
27055 | 300 sh->samplesize = 2; |
301 sh->sample_format = AF_FORMAT_S16_NE; | |
302 sh->audio_out_minsize = 8192; /* default size, maybe not enough for Win32/ACM */ | |
303 sh->pts = MP_NOPTS_VALUE; | |
304 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid); | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
305 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
306 return demuxer->a_streams[id]; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
307 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
308 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
309 void free_sh_audio(demuxer_t *demuxer, int id) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
310 { |
18708
9e2b300db17b
Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents:
18404
diff
changeset
|
311 sh_audio_t *sh = demuxer->a_streams[id]; |
9e2b300db17b
Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents:
18404
diff
changeset
|
312 demuxer->a_streams[id] = NULL; |
27055 | 313 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh); |
26085 | 314 free(sh->wf); |
315 free(sh->codecdata); | |
26082 | 316 free(sh->lang); |
1643 | 317 free(sh); |
318 } | |
319 | |
27054 | 320 sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
321 { |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
322 if (id > MAX_V_STREAMS - 1 || id < 0) { |
27056 | 323 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
324 "Requested video stream id overflow (%d > %d)\n", id, | |
325 MAX_V_STREAMS); | |
27052 | 326 return NULL; |
4642 | 327 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
328 if (demuxer->v_streams[id]) |
27055 | 329 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_VideoStreamRedefined, id); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
330 else { |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
331 sh_video_t *sh = calloc(1, sizeof(sh_video_t)); |
27055 | 332 mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundVideoStream, id); |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
333 demuxer->v_streams[id] = sh; |
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
334 sh->vid = vid; |
26876 | 335 sh->ds = demuxer->video; |
27055 | 336 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
337 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
338 return demuxer->v_streams[id]; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
339 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
340 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
341 void free_sh_video(sh_video_t *sh) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
342 { |
27055 | 343 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh); |
26085 | 344 free(sh->bih); |
1643 | 345 free(sh); |
346 } | |
347 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
348 void free_demuxer(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
349 { |
1643 | 350 int i; |
27056 | 351 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing demuxer at %p\n", |
352 demuxer); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
353 if (demuxer->desc->close) |
27055 | 354 demuxer->desc->close(demuxer); |
16175 | 355 // Very ugly hack to make it behave like old implementation |
356 if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS) | |
27055 | 357 goto skip_streamfree; |
1643 | 358 // free streams: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
359 for (i = 0; i < MAX_A_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
360 if (demuxer->a_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
361 free_sh_audio(demuxer, i); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
362 for (i = 0; i < MAX_V_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
363 if (demuxer->v_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
364 free_sh_video(demuxer->v_streams[i]); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
365 for (i = 0; i < MAX_S_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
366 if (demuxer->s_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
367 free_sh_sub(demuxer->s_streams[i]); |
1643 | 368 // free demuxers: |
369 free_demuxer_stream(demuxer->audio); | |
370 free_demuxer_stream(demuxer->video); | |
5412 | 371 free_demuxer_stream(demuxer->sub); |
27055 | 372 skip_streamfree: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
373 if (demuxer->info) { |
27055 | 374 for (i = 0; demuxer->info[i] != NULL; i++) |
375 free(demuxer->info[i]); | |
376 free(demuxer->info); | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
377 } |
26085 | 378 free(demuxer->filename); |
19342 | 379 if (demuxer->chapters) { |
27055 | 380 for (i = 0; i < demuxer->num_chapters; i++) |
381 free(demuxer->chapters[i].name); | |
382 free(demuxer->chapters); | |
19342 | 383 } |
25657 | 384 if (demuxer->attachments) { |
27055 | 385 for (i = 0; i < demuxer->num_attachments; i++) { |
386 free(demuxer->attachments[i].name); | |
387 free(demuxer->attachments[i].type); | |
388 free(demuxer->attachments[i].data); | |
389 } | |
390 free(demuxer->attachments); | |
25657 | 391 } |
1643 | 392 free(demuxer); |
393 } | |
394 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
395 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
396 void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
397 { |
1 | 398 // append packet to DS stream: |
399 ++ds->packs; | |
27055 | 400 ds->bytes += dp->len; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
401 if (ds->last) { |
27055 | 402 // next packet in stream |
403 ds->last->next = dp; | |
404 ds->last = dp; | |
1 | 405 } else { |
27055 | 406 // first packet in stream |
407 ds->first = ds->last = dp; | |
1 | 408 } |
27056 | 409 mp_dbg(MSGT_DEMUXER, MSGL_DBG2, |
410 "DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n", | |
411 (ds == ds->demuxer->audio) ? "d_audio" : "d_video", dp->len, | |
412 dp->pts, (unsigned int) dp->pos, ds->demuxer->audio->packs, | |
413 ds->demuxer->video->packs); | |
1 | 414 } |
415 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
416 void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
417 double pts, off_t pos, int flags) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
418 { |
27055 | 419 demux_packet_t *dp = new_demux_packet(len); |
420 len = stream_read(stream, dp->buffer, len); | |
10891
65ed62e138fa
Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents:
10882
diff
changeset
|
421 resize_demux_packet(dp, len); |
27045 | 422 dp->pts = pts; |
27055 | 423 dp->pos = pos; |
424 dp->flags = flags; | |
1 | 425 // append packet to DS stream: |
27055 | 426 ds_add_packet(ds, dp); |
1 | 427 } |
428 | |
429 // return value: | |
430 // 0 = EOF or no stream found or invalid type | |
431 // 1 = successfully read a packet | |
432 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
433 int demux_fill_buffer(demuxer_t *demux, demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
434 { |
27055 | 435 // Note: parameter 'ds' can be NULL! |
436 return demux->desc->fill_buffer(demux, ds); | |
1 | 437 } |
438 | |
439 // return value: | |
440 // 0 = EOF | |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
441 // 1 = successful |
26037 | 442 #define MAX_ACUMULATED_PACKETS 64 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
443 int ds_fill_buffer(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
444 { |
27055 | 445 demuxer_t *demux = ds->demuxer; |
446 if (ds->current) | |
447 free_demux_packet(ds->current); | |
448 ds->current = NULL; | |
449 if (mp_msg_test(MSGT_DEMUXER, MSGL_DBG3)) { | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
450 if (ds == demux->audio) |
27056 | 451 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
452 "ds_fill_buffer(d_audio) called\n"); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
453 else if (ds == demux->video) |
27056 | 454 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
455 "ds_fill_buffer(d_video) called\n"); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
456 else if (ds == demux->sub) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
457 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, "ds_fill_buffer(d_sub) called\n"); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
458 else |
27056 | 459 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
460 "ds_fill_buffer(unknown 0x%X) called\n", (unsigned int) ds); | |
27055 | 461 } |
462 while (1) { | |
463 if (ds->packs) { | |
464 demux_packet_t *p = ds->first; | |
26071
449ad51bd8c7
in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents:
26037
diff
changeset
|
465 #if 0 |
27055 | 466 if (demux->reference_clock != MP_NOPTS_VALUE) { |
27059 | 467 if ( p->pts != MP_NOPTS_VALUE |
468 && p->pts > demux->reference_clock | |
469 && ds->packs < MAX_ACUMULATED_PACKETS) { | |
27055 | 470 if (demux_fill_buffer(demux, ds)) |
471 continue; | |
472 } | |
473 } | |
26071
449ad51bd8c7
in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents:
26037
diff
changeset
|
474 #endif |
27055 | 475 // copy useful data: |
476 ds->buffer = p->buffer; | |
477 ds->buffer_pos = 0; | |
478 ds->buffer_size = p->len; | |
479 ds->pos = p->pos; | |
480 ds->dpos += p->len; // !!! | |
481 ++ds->pack_no; | |
482 if (p->pts != MP_NOPTS_VALUE) { | |
483 ds->pts = p->pts; | |
484 ds->pts_bytes = 0; | |
485 } | |
486 ds->pts_bytes += p->len; // !!! | |
487 if (p->stream_pts != MP_NOPTS_VALUE) | |
488 demux->stream_pts = p->stream_pts; | |
489 ds->flags = p->flags; | |
490 // unlink packet: | |
491 ds->bytes -= p->len; | |
492 ds->current = p; | |
493 ds->first = p->next; | |
494 if (!ds->first) | |
495 ds->last = NULL; | |
496 --ds->packs; | |
497 return 1; | |
498 } | |
27056 | 499 if (demux->audio->packs >= MAX_PACKS |
500 || demux->audio->bytes >= MAX_PACK_BYTES) { | |
501 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, | |
502 demux->audio->packs, demux->audio->bytes); | |
27055 | 503 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
504 break; | |
505 } | |
27056 | 506 if (demux->video->packs >= MAX_PACKS |
507 || demux->video->bytes >= MAX_PACK_BYTES) { | |
508 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, | |
509 demux->video->packs, demux->video->bytes); | |
27055 | 510 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
511 break; | |
512 } | |
513 if (!demux_fill_buffer(demux, ds)) { | |
27056 | 514 mp_dbg(MSGT_DEMUXER, MSGL_DBG2, |
515 "ds_fill_buffer()->demux_fill_buffer() failed\n"); | |
27055 | 516 break; // EOF |
517 } | |
1 | 518 } |
27055 | 519 ds->buffer_pos = ds->buffer_size = 0; |
520 ds->buffer = NULL; | |
27056 | 521 mp_msg(MSGT_DEMUXER, MSGL_V, |
522 "ds_fill_buffer: EOF reached (stream: %s) \n", | |
523 ds == demux->audio ? "audio" : "video"); | |
27055 | 524 ds->eof = 1; |
525 return 0; | |
1 | 526 } |
527 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
528 int demux_read_data(demux_stream_t *ds, unsigned char *mem, int len) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
529 { |
27055 | 530 int x; |
531 int bytes = 0; | |
532 while (len > 0) { | |
533 x = ds->buffer_size - ds->buffer_pos; | |
534 if (x == 0) { | |
535 if (!ds_fill_buffer(ds)) | |
536 return bytes; | |
537 } else { | |
538 if (x > len) | |
539 x = len; | |
540 if (mem) | |
541 fast_memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x); | |
542 bytes += x; | |
543 len -= x; | |
544 ds->buffer_pos += x; | |
545 } | |
546 } | |
547 return bytes; | |
1 | 548 } |
549 | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
550 /** |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
551 * \brief read data until the given 3-byte pattern is encountered, up to maxlen |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
552 * \param mem memory to read data into, may be NULL to discard data |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
553 * \param maxlen maximum number of bytes to read |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
554 * \param read number of bytes actually read |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
555 * \param pattern pattern to search for (lowest 8 bits are ignored) |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
556 * \return whether pattern was found |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
557 */ |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
558 int demux_pattern_3(demux_stream_t *ds, unsigned char *mem, int maxlen, |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
559 int *read, uint32_t pattern) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
560 { |
27055 | 561 register uint32_t head = 0xffffff00; |
562 register uint32_t pat = pattern & 0xffffff00; | |
563 int total_len = 0; | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
564 do { |
27055 | 565 register unsigned char *ds_buf = &ds->buffer[ds->buffer_size]; |
566 int len = ds->buffer_size - ds->buffer_pos; | |
567 register long pos = -len; | |
568 if (unlikely(pos >= 0)) { // buffer is empty | |
569 ds_fill_buffer(ds); | |
570 continue; | |
571 } | |
572 do { | |
573 head |= ds_buf[pos]; | |
574 head <<= 8; | |
575 } while (++pos && head != pat); | |
576 len += pos; | |
577 if (total_len + len > maxlen) | |
578 len = maxlen - total_len; | |
579 len = demux_read_data(ds, mem ? &mem[total_len] : NULL, len); | |
580 total_len += len; | |
581 } while ((head != pat || total_len < 3) && total_len < maxlen && !ds->eof); | |
582 if (read) | |
583 *read = total_len; | |
584 return total_len >= 3 && head == pat; | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
585 } |
746 | 586 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
587 void ds_free_packs(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
588 { |
27055 | 589 demux_packet_t *dp = ds->first; |
590 while (dp) { | |
591 demux_packet_t *dn = dp->next; | |
592 free_demux_packet(dp); | |
593 dp = dn; | |
594 } | |
595 if (ds->asf_packet) { | |
596 // free unfinished .asf fragments: | |
597 free(ds->asf_packet->buffer); | |
598 free(ds->asf_packet); | |
599 ds->asf_packet = NULL; | |
600 } | |
601 ds->first = ds->last = NULL; | |
602 ds->packs = 0; // !!!!! | |
603 ds->bytes = 0; | |
604 if (ds->current) | |
605 free_demux_packet(ds->current); | |
606 ds->current = NULL; | |
607 ds->buffer = NULL; | |
608 ds->buffer_pos = ds->buffer_size; | |
609 ds->pts = 0; | |
610 ds->pts_bytes = 0; | |
1 | 611 } |
612 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
613 int ds_get_packet(demux_stream_t *ds, unsigned char **start) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
614 { |
24826 | 615 int len; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
616 if (ds->buffer_pos >= ds->buffer_size) { |
27052 | 617 if (!ds_fill_buffer(ds)) { |
1 | 618 // EOF |
619 *start = NULL; | |
620 return -1; | |
27052 | 621 } |
1 | 622 } |
27055 | 623 len = ds->buffer_size - ds->buffer_pos; |
24826 | 624 *start = &ds->buffer[ds->buffer_pos]; |
27055 | 625 ds->buffer_pos += len; |
24826 | 626 return len; |
1 | 627 } |
554 | 628 |
27055 | 629 int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts) |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
630 { |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
631 int len; |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
632 *pts = MP_NOPTS_VALUE; |
29504 | 633 len = ds_get_packet(ds, start); |
634 if (len < 0) | |
635 return len; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18900
diff
changeset
|
636 // Return pts unless this read starts from the middle of a packet |
29504 | 637 if (len == ds->buffer_pos) |
27052 | 638 *pts = ds->current->pts; |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
639 return len; |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
640 } |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
641 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
642 int ds_get_packet_sub(demux_stream_t *ds, unsigned char **start) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
643 { |
24826 | 644 int len; |
27055 | 645 if (ds->buffer_pos >= ds->buffer_size) { |
27052 | 646 *start = NULL; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
647 if (!ds->packs) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
648 return -1; // no sub |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
649 if (!ds_fill_buffer(ds)) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
650 return -1; // EOF |
554 | 651 } |
27055 | 652 len = ds->buffer_size - ds->buffer_pos; |
24826 | 653 *start = &ds->buffer[ds->buffer_pos]; |
27055 | 654 ds->buffer_pos += len; |
24826 | 655 return len; |
554 | 656 } |
657 | |
18309
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
658 double ds_get_next_pts(demux_stream_t *ds) |
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
659 { |
27055 | 660 demuxer_t *demux = ds->demuxer; |
661 while (!ds->first) { | |
27056 | 662 if (demux->audio->packs >= MAX_PACKS |
663 || demux->audio->bytes >= MAX_PACK_BYTES) { | |
664 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, | |
665 demux->audio->packs, demux->audio->bytes); | |
27055 | 666 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
667 return MP_NOPTS_VALUE; | |
668 } | |
27056 | 669 if (demux->video->packs >= MAX_PACKS |
670 || demux->video->bytes >= MAX_PACK_BYTES) { | |
671 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, | |
672 demux->video->packs, demux->video->bytes); | |
27055 | 673 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
674 return MP_NOPTS_VALUE; | |
675 } | |
676 if (!demux_fill_buffer(demux, ds)) | |
677 return MP_NOPTS_VALUE; | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
678 } |
27055 | 679 return ds->first->pts; |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
680 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
681 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
682 // ==================================================================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
683 |
16175 | 684 void demuxer_help(void) |
685 { | |
27055 | 686 int i; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
687 |
27055 | 688 mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n"); |
689 mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n"); | |
690 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n"); | |
691 for (i = 0; demuxer_list[i]; i++) { | |
692 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers | |
693 continue; | |
694 if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment)) | |
695 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n", | |
27056 | 696 demuxer_list[i]->name, demuxer_list[i]->type, |
697 demuxer_list[i]->info, demuxer_list[i]->comment); | |
27055 | 698 else |
699 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s\n", | |
27056 | 700 demuxer_list[i]->name, demuxer_list[i]->type, |
701 demuxer_list[i]->info); | |
27055 | 702 } |
16175 | 703 } |
704 | |
14693
37116118ab6a
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
14666
diff
changeset
|
705 |
16175 | 706 /** |
707 * Get demuxer type for a given demuxer name | |
708 * | |
709 * @param demuxer_name string with demuxer name of demuxer number | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
710 * @param force will be set if demuxer should be forced. |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
711 * May be NULL. |
16175 | 712 * @return DEMUXER_TYPE_xxx, -1 if error or not found |
713 */ | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
714 int get_demuxer_type_from_name(char *demuxer_name, int *force) |
16175 | 715 { |
27055 | 716 int i; |
717 long type_int; | |
718 char *endptr; | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
719 |
27055 | 720 if (!demuxer_name || !demuxer_name[0]) |
721 return DEMUXER_TYPE_UNKNOWN; | |
722 if (force) | |
723 *force = demuxer_name[0] == '+'; | |
724 if (demuxer_name[0] == '+') | |
725 demuxer_name = &demuxer_name[1]; | |
726 for (i = 0; demuxer_list[i]; i++) { | |
727 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Can't select special demuxers from commandline | |
728 continue; | |
729 if (strcmp(demuxer_name, demuxer_list[i]->name) == 0) | |
730 return demuxer_list[i]->type; | |
731 } | |
16175 | 732 |
27055 | 733 // No match found, try to parse name as an integer (demuxer number) |
734 type_int = strtol(demuxer_name, &endptr, 0); | |
735 if (*endptr) // Conversion failed | |
736 return -1; | |
737 if ((type_int > 0) && (type_int <= DEMUXER_TYPE_MAX)) | |
738 return (int) type_int; | |
739 | |
26437 | 740 return -1; |
16175 | 741 } |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
742 |
27055 | 743 int extension_parsing = 1; // 0=off 1=mixed (used only for unstable formats) |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
744 |
27055 | 745 int correct_pts = 0; |
746 int user_correct_pts = -1; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18900
diff
changeset
|
747 |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
748 /* |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
749 NOTE : Several demuxers may be opened at the same time so |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
750 demuxers should NEVER rely on an external var to enable them |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
751 self. If a demuxer can't do any auto-detection it should only use |
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
752 file_format. The user can explicitly set file_format with the -demuxer |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
753 option so there is really no need for another extra var. |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
754 For convenience an option can be added to set file_format directly |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
755 to the right type (ex: rawaudio,rawvideo). |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
756 Also the stream can override the file_format so a demuxer which rely |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
757 on a special stream type can set file_format at the stream level |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
758 (ex: tv,mf). |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
759 */ |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
760 |
27054 | 761 static demuxer_t *demux_open_stream(stream_t *stream, int file_format, |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
762 int force, int audio_id, int video_id, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
763 int dvdsub_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
764 { |
27055 | 765 demuxer_t *demuxer = NULL; |
1659 | 766 |
27055 | 767 sh_video_t *sh_video = NULL; |
26437 | 768 |
27055 | 769 const demuxer_desc_t *demuxer_desc; |
770 int fformat = 0; | |
771 int i; | |
26437 | 772 |
27055 | 773 // If somebody requested a demuxer check it |
774 if (file_format) { | |
775 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) { | |
27056 | 776 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
777 video_id, dvdsub_id, filename); | |
27055 | 778 if (demuxer_desc->check_file) |
779 fformat = demuxer_desc->check_file(demuxer); | |
780 if (force || !demuxer_desc->check_file) | |
781 fformat = demuxer_desc->type; | |
782 if (fformat != 0) { | |
783 if (fformat == demuxer_desc->type) { | |
784 demuxer_t *demux2 = demuxer; | |
785 // Move messages to demuxer detection code? | |
27056 | 786 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
787 MSGTR_Detected_XXX_FileFormat, | |
788 demuxer_desc->shortdesc); | |
27055 | 789 file_format = fformat; |
27056 | 790 if (!demuxer->desc->open |
791 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 792 demuxer = demux2; |
793 goto dmx_open; | |
794 } | |
795 } else { | |
796 // Format changed after check, recurse | |
797 free_demuxer(demuxer); | |
27056 | 798 return demux_open_stream(stream, fformat, force, audio_id, |
799 video_id, dvdsub_id, filename); | |
27055 | 800 } |
801 } | |
802 // Check failed for forced demuxer, quit | |
803 free_demuxer(demuxer); | |
804 return NULL; | |
20303 | 805 } |
806 } | |
27055 | 807 // Test demuxers with safe file checks |
808 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
809 if (demuxer_desc->safe_check) { | |
27056 | 810 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
811 video_id, dvdsub_id, filename); | |
27055 | 812 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { |
813 if (fformat == demuxer_desc->type) { | |
814 demuxer_t *demux2 = demuxer; | |
27056 | 815 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
816 MSGTR_Detected_XXX_FileFormat, | |
817 demuxer_desc->shortdesc); | |
27055 | 818 file_format = fformat; |
27056 | 819 if (!demuxer->desc->open |
820 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 821 demuxer = demux2; |
822 goto dmx_open; | |
823 } | |
824 } else { | |
825 if (fformat == DEMUXER_TYPE_PLAYLIST) | |
826 return demuxer; // handled in mplayer.c | |
827 // Format changed after check, recurse | |
828 free_demuxer(demuxer); | |
829 demuxer = demux_open_stream(stream, fformat, force, | |
27056 | 830 audio_id, video_id, |
831 dvdsub_id, filename); | |
27055 | 832 if (demuxer) |
833 return demuxer; // done! | |
834 file_format = DEMUXER_TYPE_UNKNOWN; | |
835 } | |
836 } | |
837 free_demuxer(demuxer); | |
838 demuxer = NULL; | |
26379 | 839 } |
840 } | |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
841 |
27055 | 842 // If no forced demuxer perform file extension based detection |
27056 | 843 // Ok. We're over the stable detectable fileformats, the next ones are |
844 // a bit fuzzy. So by default (extension_parsing==1) try extension-based | |
845 // detection first: | |
846 if (file_format == DEMUXER_TYPE_UNKNOWN && filename | |
847 && extension_parsing == 1) { | |
27055 | 848 file_format = demuxer_type_by_filename(filename); |
849 if (file_format != DEMUXER_TYPE_UNKNOWN) { | |
850 // we like recursion :) | |
27056 | 851 demuxer = demux_open_stream(stream, file_format, force, audio_id, |
852 video_id, dvdsub_id, filename); | |
27055 | 853 if (demuxer) |
854 return demuxer; // done! | |
855 file_format = DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing... | |
27056 | 856 mp_msg(MSGT_DEMUXER, MSGL_V, |
857 "demuxer: continue fuzzy content-based format guessing...\n"); | |
26437 | 858 } |
859 } | |
27055 | 860 // Try detection for all other demuxers |
861 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
862 if (!demuxer_desc->safe_check && demuxer_desc->check_file) { | |
27056 | 863 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
864 video_id, dvdsub_id, filename); | |
27055 | 865 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { |
866 if (fformat == demuxer_desc->type) { | |
867 demuxer_t *demux2 = demuxer; | |
27056 | 868 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
869 MSGTR_Detected_XXX_FileFormat, | |
870 demuxer_desc->shortdesc); | |
27055 | 871 file_format = fformat; |
27056 | 872 if (!demuxer->desc->open |
873 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 874 demuxer = demux2; |
875 goto dmx_open; | |
876 } | |
877 } else { | |
878 if (fformat == DEMUXER_TYPE_PLAYLIST) | |
879 return demuxer; // handled in mplayer.c | |
880 // Format changed after check, recurse | |
881 free_demuxer(demuxer); | |
882 demuxer = demux_open_stream(stream, fformat, force, | |
27056 | 883 audio_id, video_id, |
884 dvdsub_id, filename); | |
27055 | 885 if (demuxer) |
886 return demuxer; // done! | |
887 file_format = DEMUXER_TYPE_UNKNOWN; | |
888 } | |
889 } | |
890 free_demuxer(demuxer); | |
891 demuxer = NULL; | |
892 } | |
893 } | |
26437 | 894 |
27055 | 895 return NULL; |
896 //====== File format recognized, set up these for compatibility: ========= | |
897 dmx_open: | |
898 | |
899 demuxer->file_format = file_format; | |
900 | |
901 if ((sh_video = demuxer->video->sh) && sh_video->bih) { | |
902 int biComp = le2me_32(sh_video->bih->biCompression); | |
27056 | 903 mp_msg(MSGT_DEMUX, MSGL_INFO, |
904 "VIDEO: [%.4s] %dx%d %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", | |
905 (char *) &biComp, sh_video->bih->biWidth, | |
906 sh_video->bih->biHeight, sh_video->bih->biBitCount, | |
907 sh_video->fps, sh_video->i_bps * 0.008f, | |
27055 | 908 sh_video->i_bps / 1024.0f); |
909 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
910 #ifdef CONFIG_ASS |
27055 | 911 if (ass_enabled && ass_library) { |
912 for (i = 0; i < MAX_S_STREAMS; ++i) { | |
913 sh_sub_t *sh = demuxer->s_streams[i]; | |
914 if (sh && sh->type == 'a') { | |
915 sh->ass_track = ass_new_track(ass_library); | |
916 if (sh->ass_track && sh->extradata) | |
27056 | 917 ass_process_codec_private(sh->ass_track, sh->extradata, |
918 sh->extradata_len); | |
27055 | 919 } else if (sh && sh->type != 'v') |
920 sh->ass_track = ass_default_track(ass_library); | |
921 } | |
922 } | |
26437 | 923 #endif |
27055 | 924 return demuxer; |
26437 | 925 } |
926 | |
27054 | 927 char *audio_stream = NULL; |
27056 | 928 char *sub_stream = NULL; |
9709 | 929 int audio_stream_cache = 0; |
7867 | 930 |
27056 | 931 char *demuxer_name = NULL; // parameter from -demuxer |
16175 | 932 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer |
27056 | 933 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer |
16175 | 934 |
7867 | 935 extern int hr_mp3_seek; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
936 |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
937 extern float stream_cache_min_percent; |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
15958
diff
changeset
|
938 extern float stream_cache_seek_min_percent; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
939 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
940 demuxer_t *demux_open(stream_t *vs, int file_format, int audio_id, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
941 int video_id, int dvdsub_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
942 { |
27055 | 943 stream_t *as = NULL, *ss = NULL; |
944 demuxer_t *vd, *ad = NULL, *sd = NULL; | |
945 demuxer_t *res; | |
946 int afmt = DEMUXER_TYPE_UNKNOWN, sfmt = DEMUXER_TYPE_UNKNOWN; | |
947 int demuxer_type; | |
948 int audio_demuxer_type = 0, sub_demuxer_type = 0; | |
949 int demuxer_force = 0, audio_demuxer_force = 0, sub_demuxer_force = 0; | |
16175 | 950 |
27056 | 951 if ((demuxer_type = |
952 get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) { | |
953 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-demuxer %s does not exist.\n", | |
954 demuxer_name); | |
27055 | 955 } |
27056 | 956 if ((audio_demuxer_type = |
957 get_demuxer_type_from_name(audio_demuxer_name, | |
958 &audio_demuxer_force)) < 0) { | |
959 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-audio-demuxer %s does not exist.\n", | |
960 audio_demuxer_name); | |
27055 | 961 } |
27056 | 962 if ((sub_demuxer_type = |
963 get_demuxer_type_from_name(sub_demuxer_name, | |
964 &sub_demuxer_force)) < 0) { | |
965 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-sub-demuxer %s does not exist.\n", | |
966 sub_demuxer_name); | |
27055 | 967 } |
26437 | 968 |
27055 | 969 if (audio_stream) { |
970 as = open_stream(audio_stream, 0, &afmt); | |
971 if (!as) { | |
27056 | 972 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenAudioStream, |
973 audio_stream); | |
27055 | 974 return NULL; |
975 } | |
976 if (audio_stream_cache) { | |
27056 | 977 if (!stream_enable_cache |
978 (as, audio_stream_cache * 1024, | |
979 audio_stream_cache * 1024 * (stream_cache_min_percent / | |
980 100.0), | |
981 audio_stream_cache * 1024 * (stream_cache_seek_min_percent / | |
982 100.0))) { | |
27055 | 983 free_stream(as); |
27056 | 984 mp_msg(MSGT_DEMUXER, MSGL_ERR, |
985 "Can't enable audio stream cache\n"); | |
27055 | 986 return NULL; |
987 } | |
988 } | |
26379 | 989 } |
27055 | 990 if (sub_stream) { |
991 ss = open_stream(sub_stream, 0, &sfmt); | |
992 if (!ss) { | |
27056 | 993 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenSubtitlesStream, |
994 sub_stream); | |
27055 | 995 return NULL; |
996 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
997 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
998 |
27055 | 999 vd = demux_open_stream(vs, demuxer_type ? demuxer_type : file_format, |
27056 | 1000 demuxer_force, audio_stream ? -2 : audio_id, |
1001 video_id, sub_stream ? -2 : dvdsub_id, filename); | |
27055 | 1002 if (!vd) { |
1003 if (as) | |
1004 free_stream(as); | |
1005 if (ss) | |
1006 free_stream(ss); | |
1007 return NULL; | |
1008 } | |
1009 if (as) { | |
27056 | 1010 ad = demux_open_stream(as, |
1011 audio_demuxer_type ? audio_demuxer_type : afmt, | |
1012 audio_demuxer_force, audio_id, -2, -2, | |
1013 audio_stream); | |
27055 | 1014 if (!ad) { |
27056 | 1015 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_OpeningAudioDemuxerFailed, |
1016 audio_stream); | |
27055 | 1017 free_stream(as); |
27056 | 1018 } else if (ad->audio->sh |
1019 && ((sh_audio_t *) ad->audio->sh)->format == 0x55) // MP3 | |
27055 | 1020 hr_mp3_seek = 1; // Enable high res seeking |
9709 | 1021 } |
27055 | 1022 if (ss) { |
1023 sd = demux_open_stream(ss, sub_demuxer_type ? sub_demuxer_type : sfmt, | |
27056 | 1024 sub_demuxer_force, -2, -2, dvdsub_id, |
1025 sub_stream); | |
27055 | 1026 if (!sd) { |
27056 | 1027 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
1028 MSGTR_OpeningSubtitlesDemuxerFailed, sub_stream); | |
27055 | 1029 free_stream(ss); |
1030 } | |
1031 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1032 |
27055 | 1033 if (ad && sd) |
1034 res = new_demuxers_demuxer(vd, ad, sd); | |
1035 else if (ad) | |
1036 res = new_demuxers_demuxer(vd, ad, vd); | |
1037 else if (sd) | |
1038 res = new_demuxers_demuxer(vd, vd, sd); | |
1039 else | |
1040 res = vd; | |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25883
diff
changeset
|
1041 |
27055 | 1042 correct_pts = user_correct_pts; |
1043 if (correct_pts < 0) | |
27056 | 1044 correct_pts = demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL) |
1045 == DEMUXER_CTRL_OK; | |
27055 | 1046 return res; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1047 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1048 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1049 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1050 void demux_flush(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1051 { |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1052 ds_free_packs(demuxer->video); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1053 ds_free_packs(demuxer->audio); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1054 ds_free_packs(demuxer->sub); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1055 } |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1056 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1057 int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1058 int flags) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1059 { |
27055 | 1060 demux_stream_t *d_audio = demuxer->audio; |
1061 demux_stream_t *d_video = demuxer->video; | |
1062 sh_audio_t *sh_audio = d_audio->sh; | |
1063 sh_video_t *sh_video = d_video->sh; | |
20851
6602a90a06ec
consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
nicodvb
parents:
20841
diff
changeset
|
1064 double tmp = 0; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1065 double pts; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1066 |
27055 | 1067 if (!demuxer->seekable) { |
1068 if (demuxer->file_format == DEMUXER_TYPE_AVI) | |
1069 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekRawAVI); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
1070 #ifdef CONFIG_TV |
27055 | 1071 else if (demuxer->file_format == DEMUXER_TYPE_TV) |
1072 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_TVInputNotSeekable); | |
2790 | 1073 #endif |
27055 | 1074 else |
1075 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekFile); | |
1076 return 0; | |
1077 } | |
26437 | 1078 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1079 demux_flush(demuxer); |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1080 // clear demux buffers: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1081 if (sh_audio) |
27055 | 1082 sh_audio->a_buffer_len = 0; |
1083 | |
27045 | 1084 demuxer->stream->eof = 0; |
27055 | 1085 demuxer->video->eof = 0; |
1086 demuxer->audio->eof = 0; | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1087 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1088 if (sh_video) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1089 sh_video->timer = 0; // !!!!!! |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1090 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1091 if (flags & SEEK_ABSOLUTE) |
27055 | 1092 pts = 0.0f; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1093 else { |
27055 | 1094 if (demuxer->stream_pts == MP_NOPTS_VALUE) |
1095 goto dmx_seek; | |
1096 pts = demuxer->stream_pts; | |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1097 } |
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1098 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1099 if (flags & SEEK_FACTOR) { |
27056 | 1100 if (stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp) |
1101 == STREAM_UNSUPPORTED) | |
27055 | 1102 goto dmx_seek; |
1103 pts += tmp * rel_seek_secs; | |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1104 } else |
27055 | 1105 pts += rel_seek_secs; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1106 |
27056 | 1107 if (stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, &pts) != |
1108 STREAM_UNSUPPORTED) { | |
27055 | 1109 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); |
1110 return 1; | |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1111 } |
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1112 |
27055 | 1113 dmx_seek: |
1114 if (demuxer->desc->seek) | |
1115 demuxer->desc->seek(demuxer, rel_seek_secs, audio_delay, flags); | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1116 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1117 if (sh_audio) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1118 resync_audio_stream(sh_audio); |
16877
9081ae3a702c
move resync_audio_stream after seeking to demuxer.c
reimar
parents:
16572
diff
changeset
|
1119 |
27055 | 1120 return 1; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1121 } |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1122 |
19053
75327b24e06f
marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18917
diff
changeset
|
1123 int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param) |
3050 | 1124 { |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1125 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1126 int n = 0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1127 |
3050 | 1128 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1129 for (n = 0; info && info[2 * n] != NULL; n++) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1130 if (!strcasecmp(opt, info[2 * n])) { |
29634
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1131 if (!strcmp(param, info[2 * n + 1])) { |
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1132 mp_msg(MSGT_DEMUX, MSGL_V, "Demuxer info %s set to unchanged value %s\n", opt, param); |
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1133 return 0; |
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1134 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1135 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_DemuxerInfoChanged, opt, |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1136 param); |
27055 | 1137 free(info[2 * n + 1]); |
1138 info[2 * n + 1] = strdup(param); | |
27052 | 1139 return 0; |
27055 | 1140 } |
1141 } | |
27051 | 1142 |
27056 | 1143 info = demuxer->info = (char **) realloc(info, |
1144 (2 * (n + 2)) * sizeof(char *)); | |
27055 | 1145 info[2 * n] = strdup(opt); |
1146 info[2 * n + 1] = strdup(param); | |
1147 memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *)); | |
3050 | 1148 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1149 return 1; |
3050 | 1150 } |
1151 | |
1152 int demux_info_print(demuxer_t *demuxer) | |
1153 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1154 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1155 int n; |
3050 | 1156 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1157 if (!info) |
27055 | 1158 return 0; |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1159 |
27055 | 1160 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_ClipInfo); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1161 for (n = 0; info[2 * n] != NULL; n++) { |
27056 | 1162 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n", info[2 * n], |
1163 info[2 * n + 1]); | |
1164 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, | |
1165 info[2 * n]); | |
1166 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, | |
1167 info[2 * n + 1]); | |
15789
32d9c8a0a02b
adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents:
15780
diff
changeset
|
1168 } |
18237
4231482179b6
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents:
18128
diff
changeset
|
1169 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n); |
4189 | 1170 |
1171 return 0; | |
3050 | 1172 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1173 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1174 char *demux_info_get(demuxer_t *demuxer, const char *opt) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1175 { |
27055 | 1176 int i; |
1177 char **info = demuxer->info; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1178 |
27055 | 1179 for (i = 0; info && info[2 * i] != NULL; i++) { |
1180 if (!strcasecmp(opt, info[2 * i])) | |
1181 return info[2 * i + 1]; | |
1182 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1183 |
27055 | 1184 return NULL; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1185 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1186 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1187 int demux_control(demuxer_t *demuxer, int cmd, void *arg) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1188 { |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1189 |
16175 | 1190 if (demuxer->desc->control) |
27055 | 1191 return demuxer->desc->control(demuxer, cmd, arg); |
16175 | 1192 |
1193 return DEMUXER_CTRL_NOTIMPL; | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1194 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1195 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1196 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1197 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1198 double demuxer_get_time_length(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1199 { |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16326
diff
changeset
|
1200 double get_time_ans; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1201 sh_video_t *sh_video = demuxer->video->sh; |
16925 | 1202 sh_audio_t *sh_audio = demuxer->audio->sh; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1203 // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW |
27056 | 1204 if (demux_control |
1205 (demuxer, DEMUXER_CTRL_GET_TIME_LENGTH, (void *) &get_time_ans) <= 0) { | |
27055 | 1206 if (sh_video && sh_video->i_bps && sh_audio && sh_audio->i_bps) |
27056 | 1207 get_time_ans = (double) (demuxer->movi_end - |
1208 demuxer->movi_start) / (sh_video->i_bps + | |
1209 sh_audio->i_bps); | |
27055 | 1210 else if (sh_video && sh_video->i_bps) |
27056 | 1211 get_time_ans = (double) (demuxer->movi_end - |
1212 demuxer->movi_start) / sh_video->i_bps; | |
27055 | 1213 else if (sh_audio && sh_audio->i_bps) |
27056 | 1214 get_time_ans = (double) (demuxer->movi_end - |
1215 demuxer->movi_start) / sh_audio->i_bps; | |
27055 | 1216 else |
1217 get_time_ans = 0; | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1218 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1219 return get_time_ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1220 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1221 |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1222 /** |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1223 * \brief demuxer_get_current_time() returns the time of the current play in three possible ways: |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1224 * either when the stream reader satisfies STREAM_CTRL_GET_CURRENT_TIME (e.g. dvd) |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1225 * or using sh_video->pts when the former method fails |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1226 * 0 otherwise |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1227 * \return the current play time |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1228 */ |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1229 int demuxer_get_current_time(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1230 { |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1231 double get_time_ans = 0; |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1232 sh_video_t *sh_video = demuxer->video->sh; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1233 if (demuxer->stream_pts != MP_NOPTS_VALUE) |
21782
99ab6c41eb1e
use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
nicodvb
parents:
21780
diff
changeset
|
1234 get_time_ans = demuxer->stream_pts; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1235 else if (sh_video) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1236 get_time_ans = sh_video->pts; |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1237 return (int) get_time_ans; |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1238 } |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1239 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1240 int demuxer_get_percent_pos(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1241 { |
14197
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1242 int ans = 0; |
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1243 int res = demux_control(demuxer, DEMUXER_CTRL_GET_PERCENT_POS, &ans); |
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1244 int len = (demuxer->movi_end - demuxer->movi_start) / 100; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1245 if (res <= 0) { |
29486
a373af1e3b24
Handle demuxers that never set filepos by using stream_tell.
reimar
parents:
29366
diff
changeset
|
1246 off_t pos = demuxer->filepos > 0 ? demuxer->filepos : stream_tell(demuxer->stream); |
27055 | 1247 if (len > 0) |
29486
a373af1e3b24
Handle demuxers that never set filepos by using stream_tell.
reimar
parents:
29366
diff
changeset
|
1248 ans = (pos - demuxer->movi_start) / len; |
27055 | 1249 else |
1250 ans = 0; | |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1251 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1252 if (ans < 0) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1253 ans = 0; |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1254 if (ans > 100) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1255 ans = 100; |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1256 return ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1257 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1258 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1259 int demuxer_switch_audio(demuxer_t *demuxer, int index) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1260 { |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1261 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_AUDIO, &index); |
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1262 if (res == DEMUXER_CTRL_NOTIMPL) |
27055 | 1263 index = demuxer->audio->id; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1264 if (demuxer->audio->id >= 0) |
27055 | 1265 demuxer->audio->sh = demuxer->a_streams[demuxer->audio->id]; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1266 else |
27055 | 1267 demuxer->audio->sh = NULL; |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1268 return index; |
15046
b7aa70b05d76
Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents:
14934
diff
changeset
|
1269 } |
19342 | 1270 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1271 int demuxer_switch_video(demuxer_t *demuxer, int index) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1272 { |
20948 | 1273 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_VIDEO, &index); |
1274 if (res == DEMUXER_CTRL_NOTIMPL) | |
27055 | 1275 index = demuxer->video->id; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1276 if (demuxer->video->id >= 0) |
27055 | 1277 demuxer->video->sh = demuxer->v_streams[demuxer->video->id]; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1278 else |
27055 | 1279 demuxer->video->sh = NULL; |
20948 | 1280 return index; |
1281 } | |
1282 | |
27054 | 1283 int demuxer_add_attachment(demuxer_t *demuxer, const char *name, |
1284 const char *type, const void *data, size_t size) | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1285 { |
25657 | 1286 if (!(demuxer->num_attachments & 31)) |
27056 | 1287 demuxer->attachments = realloc(demuxer->attachments, |
1288 (demuxer->num_attachments + 32) * sizeof(demux_attachment_t)); | |
25657 | 1289 |
1290 demuxer->attachments[demuxer->num_attachments].name = strdup(name); | |
1291 demuxer->attachments[demuxer->num_attachments].type = strdup(type); | |
1292 demuxer->attachments[demuxer->num_attachments].data = malloc(size); | |
1293 memcpy(demuxer->attachments[demuxer->num_attachments].data, data, size); | |
1294 demuxer->attachments[demuxer->num_attachments].data_size = size; | |
1295 | |
27055 | 1296 return demuxer->num_attachments++; |
25657 | 1297 } |
1298 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1299 int demuxer_add_chapter(demuxer_t *demuxer, const char *name, uint64_t start, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1300 uint64_t end) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1301 { |
19342 | 1302 if (demuxer->chapters == NULL) |
27055 | 1303 demuxer->chapters = malloc(32 * sizeof(*demuxer->chapters)); |
19342 | 1304 else if (!(demuxer->num_chapters % 32)) |
27056 | 1305 demuxer->chapters = realloc(demuxer->chapters, |
1306 (demuxer->num_chapters + 32) * | |
1307 sizeof(*demuxer->chapters)); | |
19342 | 1308 |
1309 demuxer->chapters[demuxer->num_chapters].start = start; | |
1310 demuxer->chapters[demuxer->num_chapters].end = end; | |
27057
42332b47d6aa
Support NULL name parameter for demuxer_add_chapter.
reimar
parents:
27056
diff
changeset
|
1311 demuxer->chapters[demuxer->num_chapters].name = strdup(name ? name : MSGTR_Unknown); |
19342 | 1312 |
29366 | 1313 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_ID=%d\n", demuxer->num_chapters); |
1314 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_START=%"PRIu64"\n", demuxer->num_chapters, start); | |
1315 if (end) | |
1316 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_END=%"PRIu64"\n", demuxer->num_chapters, end); | |
1317 if (name) | |
1318 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_NAME=%s\n", demuxer->num_chapters, name); | |
1319 | |
27055 | 1320 return demuxer->num_chapters++; |
19342 | 1321 } |
1322 | |
19435 | 1323 /** |
27051 | 1324 * \brief demuxer_seek_chapter() seeks to a chapter in two possible ways: |
19435 | 1325 * either using the demuxer->chapters structure set by the demuxer |
1326 * or asking help to the stream layer (e.g. dvd) | |
19439 | 1327 * \param chapter - chapter number wished - 0-based |
19435 | 1328 * \param mode 0: relative to current main pts, 1: absolute |
1329 * \param seek_pts set by the function to the pts to seek to (if demuxer->chapters is set) | |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1330 * \param num_chapters number of chapters present (set by this function is param is not null) |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1331 * \param chapter_name name of chapter found (set by this function is param is not null) |
19435 | 1332 * \return -1 on error, current chapter if successful |
1333 */ | |
1334 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1335 int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1336 float *seek_pts, int *num_chapters, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1337 char **chapter_name) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1338 { |
19435 | 1339 int ris; |
1340 int current, total; | |
1341 sh_video_t *sh_video = demuxer->video->sh; | |
1342 sh_audio_t *sh_audio = demuxer->audio->sh; | |
1343 | |
1344 if (!demuxer->num_chapters || !demuxer->chapters) { | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1345 if (!mode) { |
27056 | 1346 ris = stream_control(demuxer->stream, |
1347 STREAM_CTRL_GET_CURRENT_CHAPTER, ¤t); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1348 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1349 return -1; |
19438
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1350 chapter += current; |
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1351 } |
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1352 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1353 demux_flush(demuxer); |
19435 | 1354 |
27056 | 1355 ris = stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_CHAPTER, |
1356 &chapter); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1357 if (ris != STREAM_UNSUPPORTED) |
20839
950ea3171afc
in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call DEMUXER_CTRL_RESYNC to notify the demuxer of the change
nicodvb
parents:
20749
diff
changeset
|
1358 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1359 if (sh_video) { |
19435 | 1360 ds_fill_buffer(demuxer->video); |
1361 resync_video_stream(sh_video); | |
1362 } | |
1363 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1364 if (sh_audio) { |
19435 | 1365 ds_fill_buffer(demuxer->audio); |
1366 resync_audio_stream(sh_audio); | |
1367 } | |
27056 | 1368 // exit status may be ok, but main() doesn't have to seek itself |
1369 // (because e.g. dvds depend on sectors, not on pts) | |
19435 | 1370 *seek_pts = -1.0; |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1371 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1372 if (num_chapters) { |
27056 | 1373 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, |
1374 num_chapters) == STREAM_UNSUPPORTED) | |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1375 *num_chapters = 0; |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1376 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1377 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1378 if (chapter_name) { |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1379 *chapter_name = NULL; |
25314
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1380 if (num_chapters && *num_chapters) { |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1381 char *tmp = malloc(16); |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1382 if (tmp) { |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1383 sprintf(tmp, " of %3d", *num_chapters); |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1384 *chapter_name = tmp; |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1385 } |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1386 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1387 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1388 |
26758
9fb1d2c3dbd4
cosmetics: Remove pointless parentheses from return statements.
diego
parents:
26437
diff
changeset
|
1389 return ris != STREAM_UNSUPPORTED ? chapter : -1; |
27055 | 1390 } else { // chapters structure is set in the demuxer |
19435 | 1391 total = demuxer->num_chapters; |
1392 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1393 if (mode == 1) //absolute seeking |
19435 | 1394 current = chapter; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1395 else { //relative seeking |
19435 | 1396 uint64_t now; |
27056 | 1397 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0.)) |
1398 * 1000 + .5; | |
19435 | 1399 |
1400 for (current = total - 1; current >= 0; --current) { | |
27054 | 1401 demux_chapter_t *chapter = demuxer->chapters + current; |
19435 | 1402 if (chapter->start <= now) |
1403 break; | |
1404 } | |
1405 current += chapter; | |
1406 } | |
1407 | |
1408 if (current >= total) | |
27055 | 1409 return -1; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1410 if (current < 0) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1411 current = 0; |
19435 | 1412 |
1413 *seek_pts = demuxer->chapters[current].start / 1000.0; | |
1414 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1415 if (num_chapters) |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1416 *num_chapters = demuxer->num_chapters; |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1417 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1418 if (chapter_name) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1419 if (demuxer->chapters[current].name) |
19479
8dd04ec733f5
100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
nicodvb
parents:
19478
diff
changeset
|
1420 *chapter_name = strdup(demuxer->chapters[current].name); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1421 else |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1422 *chapter_name = NULL; |
19479
8dd04ec733f5
100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
nicodvb
parents:
19478
diff
changeset
|
1423 } |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1424 |
19435 | 1425 return current; |
1426 } | |
1427 } | |
25358 | 1428 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1429 int demuxer_get_current_chapter(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1430 { |
25358 | 1431 int chapter = -1; |
1432 if (!demuxer->num_chapters || !demuxer->chapters) { | |
1433 if (stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, | |
1434 &chapter) == STREAM_UNSUPPORTED) | |
1435 chapter = -1; | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1436 } else { |
25358 | 1437 sh_video_t *sh_video = demuxer->video->sh; |
1438 sh_audio_t *sh_audio = demuxer->audio->sh; | |
1439 uint64_t now; | |
27056 | 1440 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0)) |
1441 * 1000 + 0.5; | |
25358 | 1442 for (chapter = demuxer->num_chapters - 1; chapter >= 0; --chapter) { |
1443 if (demuxer->chapters[chapter].start <= now) | |
1444 break; | |
1445 } | |
1446 } | |
1447 return chapter; | |
1448 } | |
1449 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1450 char *demuxer_chapter_name(demuxer_t *demuxer, int chapter) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1451 { |
25358 | 1452 if (demuxer->num_chapters && demuxer->chapters) { |
27056 | 1453 if (chapter >= 0 && chapter < demuxer->num_chapters |
1454 && demuxer->chapters[chapter].name) | |
25358 | 1455 return strdup(demuxer->chapters[chapter].name); |
1456 } | |
1457 return NULL; | |
1458 } | |
1459 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1460 char *demuxer_chapter_display_name(demuxer_t *demuxer, int chapter) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1461 { |
25358 | 1462 char *chapter_name = demuxer_chapter_name(demuxer, chapter); |
1463 if (chapter_name) { | |
1464 char *tmp = malloc(strlen(chapter_name) + 14); | |
1465 snprintf(tmp, 63, "(%d) %s", chapter + 1, chapter_name); | |
27051 | 1466 free(chapter_name); |
25358 | 1467 return tmp; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1468 } else { |
25358 | 1469 int chapter_num = demuxer_chapter_count(demuxer); |
1470 char tmp[30]; | |
1471 if (chapter_num <= 0) | |
1472 sprintf(tmp, "(%d)", chapter + 1); | |
1473 else | |
1474 sprintf(tmp, "(%d) of %d", chapter + 1, chapter_num); | |
1475 return strdup(tmp); | |
1476 } | |
1477 } | |
1478 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1479 float demuxer_chapter_time(demuxer_t *demuxer, int chapter, float *end) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1480 { |
25358 | 1481 if (demuxer->num_chapters && demuxer->chapters && chapter >= 0 |
27055 | 1482 && chapter < demuxer->num_chapters) { |
25358 | 1483 if (end) |
1484 *end = demuxer->chapters[chapter].end / 1000.0; | |
1485 return demuxer->chapters[chapter].start / 1000.0; | |
1486 } | |
1487 return -1.0; | |
1488 } | |
1489 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1490 int demuxer_chapter_count(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1491 { |
25358 | 1492 if (!demuxer->num_chapters || !demuxer->chapters) { |
1493 int num_chapters = 0; | |
1494 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, | |
1495 &num_chapters) == STREAM_UNSUPPORTED) | |
1496 num_chapters = 0; | |
1497 return num_chapters; | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1498 } else |
25358 | 1499 return demuxer->num_chapters; |
1500 } | |
1501 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1502 int demuxer_angles_count(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1503 { |
27055 | 1504 int ris, angles = -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1505 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1506 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_ANGLES, &angles); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1507 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1508 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1509 return angles; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1510 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1511 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1512 int demuxer_get_current_angle(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1513 { |
27055 | 1514 int ris, curr_angle = -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1515 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_ANGLE, &curr_angle); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1516 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1517 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1518 return curr_angle; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1519 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1520 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1521 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1522 int demuxer_set_angle(demuxer_t *demuxer, int angle) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1523 { |
27055 | 1524 int ris, angles = -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1525 sh_video_t *sh_video = demuxer->video->sh; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1526 sh_audio_t *sh_audio = demuxer->audio->sh; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1527 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1528 angles = demuxer_angles_count(demuxer); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1529 if ((angles < 1) || (angle > angles)) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1530 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1531 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1532 demux_flush(demuxer); |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1533 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1534 ris = stream_control(demuxer->stream, STREAM_CTRL_SET_ANGLE, &angle); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1535 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1536 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1537 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1538 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1539 if (sh_video) { |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1540 ds_fill_buffer(demuxer->video); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1541 resync_video_stream(sh_video); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1542 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1543 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1544 if (sh_audio) { |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1545 ds_fill_buffer(demuxer->audio); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1546 resync_audio_stream(sh_audio); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1547 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1548 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1549 return angle; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1550 } |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1551 |
27054 | 1552 int demuxer_audio_track_by_lang(demuxer_t *d, char *lang) |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1553 { |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1554 int i, len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1555 lang += strspn(lang, ","); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1556 while ((len = strcspn(lang, ",")) > 0) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1557 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1558 sh_audio_t *sh = d->a_streams[i]; |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1559 if (sh && sh->lang && strncmp(sh->lang, lang, len) == 0) |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1560 return sh->aid; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1561 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1562 lang += len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1563 lang += strspn(lang, ","); |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1564 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1565 return -1; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1566 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1567 |
27054 | 1568 int demuxer_sub_track_by_lang(demuxer_t *d, char *lang) |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1569 { |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1570 int i, len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1571 lang += strspn(lang, ","); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1572 while ((len = strcspn(lang, ",")) > 0) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1573 for (i = 0; i < MAX_S_STREAMS; ++i) { |
27054 | 1574 sh_sub_t *sh = d->s_streams[i]; |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1575 if (sh && sh->lang && strncmp(sh->lang, lang, len) == 0) |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1576 return sh->sid; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1577 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1578 lang += len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1579 lang += strspn(lang, ","); |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1580 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1581 return -1; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1582 } |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1583 |
27054 | 1584 int demuxer_default_audio_track(demuxer_t *d) |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1585 { |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1586 int i; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1587 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1588 sh_audio_t *sh = d->a_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1589 if (sh && sh->default_track) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1590 return sh->aid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1591 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1592 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1593 sh_audio_t *sh = d->a_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1594 if (sh) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1595 return sh->aid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1596 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1597 return -1; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1598 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1599 |
27054 | 1600 int demuxer_default_sub_track(demuxer_t *d) |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1601 { |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1602 int i; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1603 for (i = 0; i < MAX_S_STREAMS; ++i) { |
27054 | 1604 sh_sub_t *sh = d->s_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1605 if (sh && sh->default_track) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1606 return sh->sid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1607 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1608 return -1; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1609 } |