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