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