Mercurial > mplayer.hg
annotate libmpdemux/demuxer.c @ 36782:06344efeded3
configure: improve FFmpeg check.
If internal FFmpeg is not available we should fall back to
external automatically instead of trying to build without
(which is currently broken it seems).
Also we can compile without internal copy as long as the
necessary headers can be found.
Two are required that FFmpeg does not install:
libavformat/internal.h
libavutil/x86/asm.h
author | reimar |
---|---|
date | Mon, 17 Feb 2014 23:25:32 +0000 |
parents | aadf2020f6f0 |
children | a4c2668dadb6 |
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> |
35903 | 24 #include <strings.h> |
1430 | 25 #include <unistd.h> |
26 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
27 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
28 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
29 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
30 #include "config.h" |
1567 | 31 #include "mp_msg.h" |
1584 | 32 #include "help_mp.h" |
17012 | 33 #include "m_config.h" |
32043
f6249bc89c38
Move extern declarations used by both mplayer.c and mencoder.c to mpcommon.h.
diego
parents:
31960
diff
changeset
|
34 #include "mpcommon.h" |
36158
749f1c5c4267
Make parser allocation work if a codec was forced.
reimar
parents:
35903
diff
changeset
|
35 #include "codec-cfg.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
36 |
17200
a1b8eeffdfcd
include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents:
17012
diff
changeset
|
37 #include "libvo/fastmemcpy.h" |
a1b8eeffdfcd
include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents:
17012
diff
changeset
|
38 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22488
diff
changeset
|
39 #include "stream/stream.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
40 #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
|
41 #include "stheader.h" |
4551 | 42 #include "mf.h" |
31418
d2fd0e4d0b9a
Move hr_mp3_seek extern variable declaration to demux_audio.h.
diego
parents:
31272
diff
changeset
|
43 #include "demux_audio.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
44 |
17012 | 45 #include "libaf/af_format.h" |
32344
0e036289e7ef
Replace forward declarations of resync_{audio|video}_stream by proper #includes.
diego
parents:
32337
diff
changeset
|
46 #include "libmpcodecs/dec_audio.h" |
0e036289e7ef
Replace forward declarations of resync_{audio|video}_stream by proper #includes.
diego
parents:
32337
diff
changeset
|
47 #include "libmpcodecs/dec_video.h" |
29832 | 48 #include "libmpcodecs/dec_teletext.h" |
32461 | 49 #include "sub/ass_mp.h" |
25654
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
50 |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
51 #ifdef CONFIG_FFMPEG |
27282
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
52 #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
|
53 #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
|
54 #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
|
55 #endif |
33871
30f5e5cd3676
Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents:
33827
diff
changeset
|
56 #include "av_helpers.h" |
27282
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
57 #endif |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
58 #include "libavutil/avstring.h" |
27282
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
59 |
36359 | 60 // Options shared between demuxers |
61 int rtsp_transport_http = 0; | |
62 int rtsp_transport_tcp = 0; | |
63 int rtsp_transport_sctp = 0; | |
64 | |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
65 // This is quite experimental, in particular it will mess up the pts values |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
66 // in the queue - on the other hand it might fix some issues like generating |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
67 // broken files with mencoder and stream copy. |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
68 // Better leave it disabled for now, if we find no use for it this code should |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
69 // just be removed again. |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
70 #define PARSE_ON_ADD 0 |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
71 |
30379
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
72 static void clear_parser(sh_common_t *sh); |
16175 | 73 |
74 // Demuxer list | |
25707
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_rawaudio; |
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_rawvideo; |
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_tv; |
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_mf; |
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_avi; |
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_y4m; |
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_asf; |
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_real; |
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_smjpeg; |
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_matroska; |
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_realaudio; |
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_vqf; |
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_mov; |
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_vivo; |
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_fli; |
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_film; |
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_roq; |
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_gif; |
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_ogg; |
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_avs; |
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_pva; |
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_nsv; |
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_mpeg_ts; |
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_lmlm4; |
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_mpeg_ps; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
100 extern const demuxer_desc_t demuxer_desc_mpeg_pes; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
101 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
|
102 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
|
103 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
|
104 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
|
105 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
|
106 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
|
107 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
|
108 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
|
109 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
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 extern const demuxer_desc_t demuxer_desc_nut; |
28018
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
116 extern const demuxer_desc_t demuxer_desc_mng; |
16175 | 117 |
35448 | 118 // never add this to the list |
119 extern const demuxer_desc_t demuxer_desc_demuxers; | |
120 | |
25876
edfe8baed49f
copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents:
25872
diff
changeset
|
121 /* 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
|
122 * 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
|
123 * 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
|
124 |
27054 | 125 const demuxer_desc_t *const demuxer_list[] = { |
27055 | 126 &demuxer_desc_rawaudio, |
127 &demuxer_desc_rawvideo, | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
128 #ifdef CONFIG_TV |
27055 | 129 &demuxer_desc_tv, |
16175 | 130 #endif |
27055 | 131 &demuxer_desc_mf, |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
132 #ifdef CONFIG_FFMPEG |
27055 | 133 &demuxer_desc_lavf_preferred, |
23069
93948eb0280f
demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO
nicodvb
parents:
22971
diff
changeset
|
134 #endif |
27055 | 135 &demuxer_desc_avi, |
136 &demuxer_desc_y4m, | |
137 &demuxer_desc_asf, | |
138 &demuxer_desc_nsv, | |
139 &demuxer_desc_real, | |
140 &demuxer_desc_smjpeg, | |
141 &demuxer_desc_matroska, | |
142 &demuxer_desc_realaudio, | |
143 &demuxer_desc_vqf, | |
144 &demuxer_desc_mov, | |
145 &demuxer_desc_vivo, | |
146 &demuxer_desc_fli, | |
147 &demuxer_desc_film, | |
148 &demuxer_desc_roq, | |
27385
2113bd9c6bd9
Rename preprocessor directives related to image libraries.
diego
parents:
27363
diff
changeset
|
149 #ifdef CONFIG_GIF |
27055 | 150 &demuxer_desc_gif, |
16175 | 151 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
152 #ifdef CONFIG_OGGVORBIS |
27055 | 153 &demuxer_desc_ogg, |
16175 | 154 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
155 #ifdef CONFIG_WIN32DLL |
27055 | 156 &demuxer_desc_avs, |
16175 | 157 #endif |
27055 | 158 &demuxer_desc_pva, |
159 &demuxer_desc_mpeg_ts, | |
160 &demuxer_desc_lmlm4, | |
161 &demuxer_desc_mpeg_ps, | |
162 &demuxer_desc_mpeg_pes, | |
163 &demuxer_desc_mpeg_es, | |
164 &demuxer_desc_mpeg_gxf, | |
165 &demuxer_desc_mpeg4_es, | |
166 &demuxer_desc_h264_es, | |
167 &demuxer_desc_audio, | |
168 &demuxer_desc_mpeg_ty, | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27395
diff
changeset
|
169 #ifdef CONFIG_LIVE555 |
27055 | 170 &demuxer_desc_rtp, |
16175 | 171 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27395
diff
changeset
|
172 #ifdef CONFIG_LIBNEMESI |
27055 | 173 &demuxer_desc_rtp_nemesi, |
25266
239330301b33
Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents:
25197
diff
changeset
|
174 #endif |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
175 #ifdef CONFIG_FFMPEG |
27055 | 176 &demuxer_desc_lavf, |
16175 | 177 #endif |
27395 | 178 #ifdef CONFIG_MUSEPACK |
27055 | 179 &demuxer_desc_mpc, |
26873
a90971b955af
Move native musepack demuxer further down in demuxer list
reimar
parents:
26758
diff
changeset
|
180 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
181 #ifdef CONFIG_LIBDV095 |
27055 | 182 &demuxer_desc_rawdv, |
18900
0b53e6d1b27f
move some ill-behaving demuxers further down the list
reimar
parents:
18708
diff
changeset
|
183 #endif |
27055 | 184 &demuxer_desc_aac, |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
185 #ifdef CONFIG_LIBNUT |
27055 | 186 &demuxer_desc_nut, |
19861 | 187 #endif |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27385
diff
changeset
|
188 #ifdef CONFIG_XMMS |
27055 | 189 &demuxer_desc_xmms, |
18900
0b53e6d1b27f
move some ill-behaving demuxers further down the list
reimar
parents:
18708
diff
changeset
|
190 #endif |
28018
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
191 #ifdef CONFIG_MNG |
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
192 &demuxer_desc_mng, |
4ac70bd6acac
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents:
27397
diff
changeset
|
193 #endif |
27055 | 194 /* Please do not add any new demuxers here. If you want to implement a new |
195 * demuxer, add it to libavformat, except for wrappers around external | |
196 * libraries and demuxers requiring binary support. */ | |
197 NULL | |
16175 | 198 }; |
199 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
200 void free_demuxer_stream(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
201 { |
1643 | 202 ds_free_packs(ds); |
203 free(ds); | |
204 } | |
205 | |
30644
390c8d36d463
Drop weird and unnecessary _s/_st suffixes from demuxer struct names.
diego
parents:
30626
diff
changeset
|
206 demux_stream_t *new_demuxer_stream(struct demuxer *demuxer, int id) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
207 { |
27055 | 208 demux_stream_t *ds = malloc(sizeof(demux_stream_t)); |
29770
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
209 *ds = (demux_stream_t){ |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
210 .id = id, |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
211 .demuxer = demuxer, |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
212 .asf_seq = -1, |
db80b9d20406
demuxer.c: Add initialization missing from previous commit
uau
parents:
29634
diff
changeset
|
213 }; |
27055 | 214 return ds; |
1 | 215 } |
216 | |
16175 | 217 |
218 /** | |
219 * Get demuxer description structure for a given demuxer type | |
220 * | |
221 * @param file_format type of the demuxer | |
222 * @return structure for the demuxer, NULL if not found | |
223 */ | |
27054 | 224 static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format) |
16175 | 225 { |
27055 | 226 int i; |
35448 | 227 if (file_format == DEMUXER_TYPE_DEMUXERS) |
228 return &demuxer_desc_demuxers; | |
16175 | 229 |
27055 | 230 for (i = 0; demuxer_list[i]; i++) |
231 if (file_format == demuxer_list[i]->type) | |
232 return demuxer_list[i]; | |
16175 | 233 |
27055 | 234 return NULL; |
16175 | 235 } |
236 | |
33237
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
237 demuxer_t *alloc_demuxer(stream_t *stream, int type, const char *filename) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
238 { |
32448 | 239 demuxer_t *d = calloc(1, sizeof(*d)); |
27055 | 240 d->stream = stream; |
241 d->stream_pts = MP_NOPTS_VALUE; | |
242 d->reference_clock = MP_NOPTS_VALUE; | |
243 d->movi_start = stream->start_pos; | |
244 d->movi_end = stream->end_pos; | |
245 d->seekable = 1; | |
246 d->synced = 0; | |
29486
a373af1e3b24
Handle demuxers that never set filepos by using stream_tell.
reimar
parents:
29366
diff
changeset
|
247 d->filepos = -1; |
27055 | 248 d->type = type; |
249 if (type) | |
250 if (!(d->desc = get_demuxer_desc_from_type(type))) | |
27056 | 251 mp_msg(MSGT_DEMUXER, MSGL_ERR, |
252 "BUG! Invalid demuxer type in new_demuxer(), " | |
35026 | 253 "big troubles ahead.\n"); |
27055 | 254 if (filename) // Filename hack for avs_check_file |
255 d->filename = strdup(filename); | |
33237
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
256 return d; |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
257 } |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
258 |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
259 demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id, |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
260 int s_id, char *filename) |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
261 { |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
262 demuxer_t *d = alloc_demuxer(stream, type, filename); |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
263 d->audio = new_demuxer_stream(d, a_id); |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
264 d->video = new_demuxer_stream(d, v_id); |
a8619bfabf84
Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents:
33189
diff
changeset
|
265 d->sub = new_demuxer_stream(d, s_id); |
30626
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30624
diff
changeset
|
266 stream->eof = 0; |
27055 | 267 stream_seek(stream, stream->start_pos); |
268 return d; | |
1 | 269 } |
270 | |
31925
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
271 const char *sh_sub_type2str(int type) |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
272 { |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
273 switch (type) { |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
274 case 't': return "text"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
275 case 'm': return "movtext"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
276 case 'a': return "ass"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
277 case 'v': return "vobsub"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
278 case 'x': return "xsub"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
279 case 'b': return "dvb"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
280 case 'd': return "dvb-teletext"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
281 case 'p': return "hdmv pgs"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
282 } |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
283 return "unknown"; |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
284 } |
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31609
diff
changeset
|
285 |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
286 sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid, const char *lang) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
287 { |
27055 | 288 if (id > MAX_S_STREAMS - 1 || id < 0) { |
27056 | 289 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
290 "Requested sub stream id overflow (%d > %d)\n", id, | |
291 MAX_S_STREAMS); | |
27055 | 292 return NULL; |
293 } | |
294 if (demuxer->s_streams[id]) | |
295 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id); | |
296 else { | |
297 sh_sub_t *sh = calloc(1, sizeof(sh_sub_t)); | |
298 demuxer->s_streams[id] = sh; | |
299 sh->sid = sid; | |
300 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid); | |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
301 if (lang && lang[0] && strcmp(lang, "und")) { |
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
302 sh->lang = strdup(lang); |
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
303 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", sid, lang); |
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
304 } |
32449
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
305 if (sid == dvdsub_id) { |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
306 demuxer->sub->id = id; |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
307 demuxer->sub->sh = demuxer->s_streams[id]; |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
308 } |
29056
93e72ef080ab
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
reimar
parents:
28872
diff
changeset
|
309 } |
27055 | 310 return demuxer->s_streams[id]; |
20872
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20851
diff
changeset
|
311 } |
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20851
diff
changeset
|
312 |
30570
98dc6ae7ede2
libmpdemux: Mark functions not used outside of their files as static.
diego
parents:
30396
diff
changeset
|
313 static void free_sh_sub(sh_sub_t *sh) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
314 { |
23592 | 315 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh); |
26085 | 316 free(sh->extradata); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
317 #ifdef CONFIG_ASS |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
318 if (sh->ass_track) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
319 ass_free_track(sh->ass_track); |
25702
c4275201a489
Add a forgotten #ifdef USE_ASS around ass_free_track
reimar
parents:
25657
diff
changeset
|
320 #endif |
26082 | 321 free(sh->lang); |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
322 #ifdef CONFIG_FFMPEG |
30379
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
323 clear_parser((sh_common_t *)sh); |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
324 #endif |
23592 | 325 free(sh); |
326 } | |
327 | |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
328 sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid, const char *lang) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
329 { |
27055 | 330 if (id > MAX_A_STREAMS - 1 || id < 0) { |
27056 | 331 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
332 "Requested audio stream id overflow (%d > %d)\n", id, | |
333 MAX_A_STREAMS); | |
27052 | 334 return NULL; |
4642 | 335 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
336 if (demuxer->a_streams[id]) |
27055 | 337 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_AudioStreamRedefined, id); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
338 else { |
26874 | 339 sh_audio_t *sh = calloc(1, sizeof(sh_audio_t)); |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33487
diff
changeset
|
340 mp_msg(MSGT_DEMUXER, MSGL_V, "==> Found audio stream: %d\n", id); |
26874 | 341 demuxer->a_streams[id] = sh; |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
342 sh->aid = aid; |
26876 | 343 sh->ds = demuxer->audio; |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
344 // set some defaults |
27055 | 345 sh->samplesize = 2; |
346 sh->sample_format = AF_FORMAT_S16_NE; | |
347 sh->audio_out_minsize = 8192; /* default size, maybe not enough for Win32/ACM */ | |
348 sh->pts = MP_NOPTS_VALUE; | |
349 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid); | |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
350 if (lang && lang[0] && strcmp(lang, "und")) { |
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
351 sh->lang = strdup(lang); |
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
352 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", aid, lang); |
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31558
diff
changeset
|
353 } |
32449
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
354 if (aid == audio_id) { |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
355 demuxer->audio->id = id; |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
356 demuxer->audio->sh = demuxer->a_streams[id]; |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
357 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
358 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
359 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
|
360 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
361 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
362 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
|
363 { |
18708
9e2b300db17b
Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents:
18404
diff
changeset
|
364 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
|
365 demuxer->a_streams[id] = NULL; |
27055 | 366 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh); |
26085 | 367 free(sh->wf); |
368 free(sh->codecdata); | |
26082 | 369 free(sh->lang); |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
370 #ifdef CONFIG_FFMPEG |
30379
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
371 clear_parser((sh_common_t *)sh); |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
372 #endif |
1643 | 373 free(sh); |
374 } | |
375 | |
27054 | 376 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
|
377 { |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
378 if (id > MAX_V_STREAMS - 1 || id < 0) { |
27056 | 379 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
380 "Requested video stream id overflow (%d > %d)\n", id, | |
381 MAX_V_STREAMS); | |
27052 | 382 return NULL; |
4642 | 383 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
384 if (demuxer->v_streams[id]) |
27055 | 385 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_VideoStreamRedefined, id); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
386 else { |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
387 sh_video_t *sh = calloc(1, sizeof(sh_video_t)); |
33827
277ec491a8a7
Do not translate console messages of verbosity level MSGL_V and above.
diego
parents:
33487
diff
changeset
|
388 mp_msg(MSGT_DEMUXER, MSGL_V, "==> Found video stream: %d\n", id); |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
389 demuxer->v_streams[id] = sh; |
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
390 sh->vid = vid; |
26876 | 391 sh->ds = demuxer->video; |
27055 | 392 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid); |
32449
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
393 if (vid == video_id) { |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
394 demuxer->video->id = id; |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
395 demuxer->video->sh = demuxer->v_streams[id]; |
f39c946f7ff7
Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents:
32448
diff
changeset
|
396 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
397 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
398 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
|
399 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
400 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
401 void free_sh_video(sh_video_t *sh) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
402 { |
27055 | 403 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh); |
26085 | 404 free(sh->bih); |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
405 #ifdef CONFIG_FFMPEG |
30379
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
406 clear_parser((sh_common_t *)sh); |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
407 #endif |
1643 | 408 free(sh); |
409 } | |
410 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
411 void free_demuxer(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
412 { |
1643 | 413 int i; |
35255 | 414 if (!demuxer) |
415 return; | |
30624 | 416 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing %s demuxer at %p\n", |
417 demuxer->desc->shortdesc, demuxer); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
418 if (demuxer->desc->close) |
27055 | 419 demuxer->desc->close(demuxer); |
16175 | 420 // Very ugly hack to make it behave like old implementation |
421 if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS) | |
27055 | 422 goto skip_streamfree; |
1643 | 423 // free streams: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
424 for (i = 0; i < MAX_A_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
425 if (demuxer->a_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
426 free_sh_audio(demuxer, i); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
427 for (i = 0; i < MAX_V_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
428 if (demuxer->v_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
429 free_sh_video(demuxer->v_streams[i]); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
430 for (i = 0; i < MAX_S_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
431 if (demuxer->s_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
432 free_sh_sub(demuxer->s_streams[i]); |
1643 | 433 // free demuxers: |
434 free_demuxer_stream(demuxer->audio); | |
435 free_demuxer_stream(demuxer->video); | |
5412 | 436 free_demuxer_stream(demuxer->sub); |
27055 | 437 skip_streamfree: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
438 if (demuxer->info) { |
27055 | 439 for (i = 0; demuxer->info[i] != NULL; i++) |
440 free(demuxer->info[i]); | |
441 free(demuxer->info); | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
442 } |
26085 | 443 free(demuxer->filename); |
19342 | 444 if (demuxer->chapters) { |
27055 | 445 for (i = 0; i < demuxer->num_chapters; i++) |
446 free(demuxer->chapters[i].name); | |
447 free(demuxer->chapters); | |
19342 | 448 } |
25657 | 449 if (demuxer->attachments) { |
27055 | 450 for (i = 0; i < demuxer->num_attachments; i++) { |
451 free(demuxer->attachments[i].name); | |
452 free(demuxer->attachments[i].type); | |
453 free(demuxer->attachments[i].data); | |
454 } | |
455 free(demuxer->attachments); | |
25657 | 456 } |
29832 | 457 if (demuxer->teletext) |
458 teletext_control(demuxer->teletext, TV_VBI_CONTROL_STOP, NULL); | |
1643 | 459 free(demuxer); |
460 } | |
461 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
462 |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
463 static void ds_add_packet_internal(demux_stream_t *ds, demux_packet_t *dp) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
464 { |
1 | 465 // append packet to DS stream: |
466 ++ds->packs; | |
27055 | 467 ds->bytes += dp->len; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
468 if (ds->last) { |
27055 | 469 // next packet in stream |
470 ds->last->next = dp; | |
471 ds->last = dp; | |
1 | 472 } else { |
27055 | 473 // first packet in stream |
474 ds->first = ds->last = dp; | |
1 | 475 } |
27056 | 476 mp_dbg(MSGT_DEMUXER, MSGL_DBG2, |
477 "DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n", | |
478 (ds == ds->demuxer->audio) ? "d_audio" : "d_video", dp->len, | |
479 dp->pts, (unsigned int) dp->pos, ds->demuxer->audio->packs, | |
480 ds->demuxer->video->packs); | |
1 | 481 } |
482 | |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
483 #ifdef CONFIG_FFMPEG |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
484 static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
485 { |
35864 | 486 enum AVCodecID codec_id = AV_CODEC_ID_NONE; |
31960
1ba5eef167aa
Refactor more instances of avcodec_initialized handling into init_avcodec().
diego
parents:
31949
diff
changeset
|
487 |
1ba5eef167aa
Refactor more instances of avcodec_initialized handling into init_avcodec().
diego
parents:
31949
diff
changeset
|
488 init_avcodec(); |
1ba5eef167aa
Refactor more instances of avcodec_initialized handling into init_avcodec().
diego
parents:
31949
diff
changeset
|
489 |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
490 switch (format) { |
34080 | 491 case 0x1600: |
33872 | 492 case MKTAG('M', 'P', '4', 'A'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
493 codec_id = AV_CODEC_ID_AAC; |
33872 | 494 break; |
34080 | 495 case 0x1602: |
32495 | 496 case MKTAG('M', 'P', '4', 'L'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
497 codec_id = AV_CODEC_ID_AAC_LATM; |
32495 | 498 break; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
499 case 0x2000: |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
500 case 0x332D6361: |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
501 case 0x332D4341: |
32509
190a7fc12929
Add missing fourcc's that require libavcodec parsing.
cehoyos
parents:
32508
diff
changeset
|
502 case 0x20736D: |
32940
5bab4a2e1b59
100l, actually only dnet tag indicates byte-swapped AC-3.
reimar
parents:
32939
diff
changeset
|
503 case MKTAG('s', 'a', 'c', '3'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
504 codec_id = AV_CODEC_ID_AC3; |
32940
5bab4a2e1b59
100l, actually only dnet tag indicates byte-swapped AC-3.
reimar
parents:
32939
diff
changeset
|
505 break; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
506 case MKTAG('d', 'n', 'e', 't'): |
32939
26bbfa0249e0
Do not run the AC-3 parser on DNET (byte-swapped AC-3), that will break badly.
reimar
parents:
32736
diff
changeset
|
507 // DNET/byte-swapped AC-3 - there is no parser for that yet |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
508 //codec_id = AV_CODEC_ID_DNET; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
509 break; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
510 case MKTAG('E', 'A', 'C', '3'): |
34146
19b03b022753
add forgotten ec-3 tag to parsers list in demuxers.c
compn
parents:
34080
diff
changeset
|
511 case MKTAG('e', 'c', '-', '3'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
512 codec_id = AV_CODEC_ID_EAC3; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
513 break; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
514 case 0x2001: |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
515 case 0x86: |
34080 | 516 case MKTAG('D', 'T', 'S', ' '): |
517 case MKTAG('d', 't', 's', ' '): | |
518 case MKTAG('d', 't', 's', 'b'): | |
519 case MKTAG('d', 't', 's', 'c'): | |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
520 codec_id = AV_CODEC_ID_DTS; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
521 break; |
32590
10b9ac971ef6
Add support for FLAC audio parsing, fixes playback time jumping
reimar
parents:
32509
diff
changeset
|
522 case MKTAG('f', 'L', 'a', 'C'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
523 codec_id = AV_CODEC_ID_FLAC; |
32590
10b9ac971ef6
Add support for FLAC audio parsing, fixes playback time jumping
reimar
parents:
32509
diff
changeset
|
524 break; |
30385 | 525 case MKTAG('M', 'L', 'P', ' '): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
526 codec_id = AV_CODEC_ID_MLP; |
30385 | 527 break; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
528 case 0x55: |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
529 case 0x5500736d: |
32509
190a7fc12929
Add missing fourcc's that require libavcodec parsing.
cehoyos
parents:
32508
diff
changeset
|
530 case 0x55005354: |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
531 case MKTAG('.', 'm', 'p', '3'): |
32508 | 532 case MKTAG('M', 'P', '3', ' '): |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
533 case MKTAG('L', 'A', 'M', 'E'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
534 codec_id = AV_CODEC_ID_MP3; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
535 break; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
536 case 0x50: |
32509
190a7fc12929
Add missing fourcc's that require libavcodec parsing.
cehoyos
parents:
32508
diff
changeset
|
537 case 0x5000736d: |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
538 case MKTAG('.', 'm', 'p', '2'): |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
539 case MKTAG('.', 'm', 'p', '1'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
540 codec_id = AV_CODEC_ID_MP2; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
541 break; |
30385 | 542 case MKTAG('T', 'R', 'H', 'D'): |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
543 codec_id = AV_CODEC_ID_TRUEHD; |
30385 | 544 break; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
545 } |
35715
8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents:
35449
diff
changeset
|
546 if (codec_id != AV_CODEC_ID_NONE) { |
34566
f3d53cd55376
Update deprecated avcodec_alloc_context()/avcodec_open() API calls
siretart
parents:
34312
diff
changeset
|
547 *avctx = avcodec_alloc_context3(NULL); |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
548 if (!*avctx) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
549 return; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
550 *parser = av_parser_init(codec_id); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
551 if (!*parser) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
552 av_freep(avctx); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
553 } |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
554 } |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
555 |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
556 static void get_parser(sh_common_t *sh, AVCodecContext **avctx, AVCodecParserContext **parser) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
557 { |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
558 *avctx = NULL; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
559 *parser = NULL; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
560 |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
561 if (!sh || !sh->needs_parsing) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
562 return; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
563 |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
564 *avctx = sh->avctx; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
565 *parser = sh->parser; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
566 if (*parser) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
567 return; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
568 |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
569 allocate_parser(avctx, parser, sh->format); |
36158
749f1c5c4267
Make parser allocation work if a codec was forced.
reimar
parents:
35903
diff
changeset
|
570 if (!*parser && sh->codec) // fallback to support forcing a codec |
749f1c5c4267
Make parser allocation work if a codec was forced.
reimar
parents:
35903
diff
changeset
|
571 allocate_parser(avctx, parser, sh->codec->fourcc[0]); |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
572 sh->avctx = *avctx; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
573 sh->parser = *parser; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
574 } |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
575 |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
576 int ds_parse(demux_stream_t *ds, uint8_t **buffer, int *len, double pts, off_t pos) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
577 { |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
578 AVCodecContext *avctx; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
579 AVCodecParserContext *parser; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
580 get_parser(ds->sh, &avctx, &parser); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
581 if (!parser) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
582 return *len; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
583 return av_parser_parse2(parser, avctx, buffer, len, *buffer, *len, pts, pts, pos); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
584 } |
30379
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
585 |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
586 static void clear_parser(sh_common_t *sh) |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
587 { |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
588 av_parser_close(sh->parser); |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
589 sh->parser = NULL; |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
590 av_freep(&sh->avctx); |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
591 } |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
592 |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
593 void ds_clear_parser(demux_stream_t *ds) |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
594 { |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
595 if (!ds->sh) |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
596 return; |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
597 clear_parser(ds->sh); |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
598 } |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
599 #endif |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
600 |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
601 void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
602 { |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
603 #if PARSE_ON_ADD && defined(CONFIG_FFMPEG) |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
604 int len = dp->len; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
605 int pos = 0; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
606 while (len > 0) { |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
607 uint8_t *parsed_start = dp->buffer + pos; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
608 int parsed_len = len; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
609 int consumed = ds_parse(ds->sh, &parsed_start, &parsed_len, dp->pts, dp->pos); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
610 pos += consumed; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
611 len -= consumed; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
612 if (parsed_start == dp->buffer && parsed_len == dp->len) { |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
613 ds_add_packet_internal(ds, dp); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
614 } else if (parsed_len) { |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
615 demux_packet_t *dp2 = new_demux_packet(parsed_len); |
33909
50489783444d
Simply drop packets for which new_demux_packet allocation fails.
reimar
parents:
33872
diff
changeset
|
616 if (!dp2) return; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
617 dp2->pos = dp->pos; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
618 dp2->pts = dp->pts; // should be parser->pts but that works badly |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
619 memcpy(dp2->buffer, parsed_start, parsed_len); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
620 ds_add_packet_internal(ds, dp2); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
621 } |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
622 } |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
623 #else |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
624 ds_add_packet_internal(ds, dp); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
625 #endif |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
626 } |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
627 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
628 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
|
629 double pts, off_t pos, int flags) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
630 { |
27055 | 631 demux_packet_t *dp = new_demux_packet(len); |
33909
50489783444d
Simply drop packets for which new_demux_packet allocation fails.
reimar
parents:
33872
diff
changeset
|
632 if (!dp) return; |
27055 | 633 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
|
634 resize_demux_packet(dp, len); |
27045 | 635 dp->pts = pts; |
27055 | 636 dp->pos = pos; |
637 dp->flags = flags; | |
1 | 638 // append packet to DS stream: |
27055 | 639 ds_add_packet(ds, dp); |
1 | 640 } |
641 | |
642 // return value: | |
643 // 0 = EOF or no stream found or invalid type | |
644 // 1 = successfully read a packet | |
645 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
646 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
|
647 { |
27055 | 648 // Note: parameter 'ds' can be NULL! |
649 return demux->desc->fill_buffer(demux, ds); | |
1 | 650 } |
651 | |
652 // return value: | |
653 // 0 = EOF | |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
654 // 1 = successful |
33487 | 655 #define MAX_ACCUMULATED_PACKETS 64 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
656 int ds_fill_buffer(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
657 { |
27055 | 658 demuxer_t *demux = ds->demuxer; |
659 if (ds->current) | |
660 free_demux_packet(ds->current); | |
661 ds->current = NULL; | |
662 if (mp_msg_test(MSGT_DEMUXER, MSGL_DBG3)) { | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
663 if (ds == demux->audio) |
27056 | 664 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
665 "ds_fill_buffer(d_audio) called\n"); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
666 else if (ds == demux->video) |
27056 | 667 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
668 "ds_fill_buffer(d_video) called\n"); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
669 else if (ds == demux->sub) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
670 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
|
671 else |
27056 | 672 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
36766
aadf2020f6f0
demuxer.c: Use proper format string to print pointer.
reimar
parents:
36682
diff
changeset
|
673 "ds_fill_buffer(unknown %p) called\n", ds); |
27055 | 674 } |
675 while (1) { | |
35405
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
676 int apacks = demux->audio ? demux->audio->packs : 0; |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
677 int abytes = demux->audio ? demux->audio->bytes : 0; |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
678 int vpacks = demux->video ? demux->video->packs : 0; |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
679 int vbytes = demux->video ? demux->video->bytes : 0; |
27055 | 680 if (ds->packs) { |
681 demux_packet_t *p = ds->first; | |
32736
a25f55874cdd
Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents:
32590
diff
changeset
|
682 // obviously not yet EOF after all |
a25f55874cdd
Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents:
32590
diff
changeset
|
683 ds->eof = 0; |
35392
092c40fbd33d
Try to improve seeking in files with only few video packets,
reimar
parents:
35255
diff
changeset
|
684 ds->fill_count = 0; |
26071
449ad51bd8c7
in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents:
26037
diff
changeset
|
685 #if 0 |
27055 | 686 if (demux->reference_clock != MP_NOPTS_VALUE) { |
27059 | 687 if ( p->pts != MP_NOPTS_VALUE |
688 && p->pts > demux->reference_clock | |
33487 | 689 && ds->packs < MAX_ACCUMULATED_PACKETS) { |
27055 | 690 if (demux_fill_buffer(demux, ds)) |
691 continue; | |
692 } | |
693 } | |
26071
449ad51bd8c7
in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents:
26037
diff
changeset
|
694 #endif |
27055 | 695 // copy useful data: |
696 ds->buffer = p->buffer; | |
697 ds->buffer_pos = 0; | |
698 ds->buffer_size = p->len; | |
699 ds->pos = p->pos; | |
700 ds->dpos += p->len; // !!! | |
701 ++ds->pack_no; | |
702 if (p->pts != MP_NOPTS_VALUE) { | |
703 ds->pts = p->pts; | |
704 ds->pts_bytes = 0; | |
705 } | |
706 ds->pts_bytes += p->len; // !!! | |
707 if (p->stream_pts != MP_NOPTS_VALUE) | |
708 demux->stream_pts = p->stream_pts; | |
709 ds->flags = p->flags; | |
710 // unlink packet: | |
711 ds->bytes -= p->len; | |
712 ds->current = p; | |
713 ds->first = p->next; | |
714 if (!ds->first) | |
715 ds->last = NULL; | |
716 --ds->packs; | |
717 return 1; | |
718 } | |
35392
092c40fbd33d
Try to improve seeking in files with only few video packets,
reimar
parents:
35255
diff
changeset
|
719 // avoid buffering too far ahead in e.g. badly interleaved files |
092c40fbd33d
Try to improve seeking in files with only few video packets,
reimar
parents:
35255
diff
changeset
|
720 // or when one stream is shorter, without breaking large audio |
092c40fbd33d
Try to improve seeking in files with only few video packets,
reimar
parents:
35255
diff
changeset
|
721 // delay with well interleaved files. |
35449 | 722 // This needs to be enough for at least 1 second of packets |
723 // since libavformat mov demuxer does not try to interleave | |
724 // with more than 1s precision. | |
725 if (ds->fill_count > 80) | |
35392
092c40fbd33d
Try to improve seeking in files with only few video packets,
reimar
parents:
35255
diff
changeset
|
726 break; |
32736
a25f55874cdd
Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents:
32590
diff
changeset
|
727 // avoid printing the "too many ..." message over and over |
a25f55874cdd
Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents:
32590
diff
changeset
|
728 if (ds->eof) |
a25f55874cdd
Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents:
32590
diff
changeset
|
729 break; |
35405
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
730 if (apacks >= MAX_PACKS || abytes >= MAX_PACK_BYTES) { |
27056 | 731 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, |
35405
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
732 apacks, abytes); |
27055 | 733 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
734 break; | |
735 } | |
35405
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
736 if (vpacks >= MAX_PACKS || vbytes >= MAX_PACK_BYTES) { |
27056 | 737 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, |
35405
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
738 vpacks, vbytes); |
27055 | 739 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
740 break; | |
741 } | |
742 if (!demux_fill_buffer(demux, ds)) { | |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32062
diff
changeset
|
743 #if PARSE_ON_ADD && defined(CONFIG_FFMPEG) |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
744 uint8_t *parsed_start = NULL; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
745 int parsed_len = 0; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
746 ds_parse(ds->sh, &parsed_start, &parsed_len, MP_NOPTS_VALUE, 0); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
747 if (parsed_len) { |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
748 demux_packet_t *dp2 = new_demux_packet(parsed_len); |
33909
50489783444d
Simply drop packets for which new_demux_packet allocation fails.
reimar
parents:
33872
diff
changeset
|
749 if (!dp2) continue; |
30088
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
750 dp2->pts = MP_NOPTS_VALUE; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
751 memcpy(dp2->buffer, parsed_start, parsed_len); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
752 ds_add_packet_internal(ds, dp2); |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
753 continue; |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
754 } |
4977e04f3a18
Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents:
29832
diff
changeset
|
755 #endif |
27056 | 756 mp_dbg(MSGT_DEMUXER, MSGL_DBG2, |
757 "ds_fill_buffer()->demux_fill_buffer() failed\n"); | |
27055 | 758 break; // EOF |
759 } | |
35405
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
760 if (demux->audio) |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
761 ds->fill_count += demux->audio->packs - apacks; |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
762 if (demux->video && demux->video->packs > vpacks && |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
763 // Empty packets or "skip" packets in e.g. AVI can cause issues. |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
764 demux->video->bytes > vbytes + 100 && |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
765 // when video needs parsing we will have lots of video packets |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
766 // in-between audio packets, so ignore them in that case. |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
767 demux->video->sh && !((sh_video_t *)demux->video->sh)->needs_parsing) |
d6305a78a11e
Fix code that detects streams temporarily lacking data to work
reimar
parents:
35392
diff
changeset
|
768 ds->fill_count++; |
1 | 769 } |
27055 | 770 ds->buffer_pos = ds->buffer_size = 0; |
771 ds->buffer = NULL; | |
27056 | 772 mp_msg(MSGT_DEMUXER, MSGL_V, |
773 "ds_fill_buffer: EOF reached (stream: %s) \n", | |
774 ds == demux->audio ? "audio" : "video"); | |
27055 | 775 ds->eof = 1; |
776 return 0; | |
1 | 777 } |
778 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
779 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
|
780 { |
27055 | 781 int x; |
782 int bytes = 0; | |
783 while (len > 0) { | |
784 x = ds->buffer_size - ds->buffer_pos; | |
785 if (x == 0) { | |
786 if (!ds_fill_buffer(ds)) | |
787 return bytes; | |
788 } else { | |
789 if (x > len) | |
790 x = len; | |
791 if (mem) | |
792 fast_memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x); | |
793 bytes += x; | |
794 len -= x; | |
795 ds->buffer_pos += x; | |
796 } | |
797 } | |
798 return bytes; | |
1 | 799 } |
800 | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
801 /** |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
802 * \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
|
803 * \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
|
804 * \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
|
805 * \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
|
806 * \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
|
807 * \return whether pattern was found |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
808 */ |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
809 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
|
810 int *read, uint32_t pattern) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
811 { |
27055 | 812 register uint32_t head = 0xffffff00; |
813 register uint32_t pat = pattern & 0xffffff00; | |
814 int total_len = 0; | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
815 do { |
27055 | 816 register unsigned char *ds_buf = &ds->buffer[ds->buffer_size]; |
817 int len = ds->buffer_size - ds->buffer_pos; | |
818 register long pos = -len; | |
819 if (unlikely(pos >= 0)) { // buffer is empty | |
820 ds_fill_buffer(ds); | |
821 continue; | |
822 } | |
823 do { | |
824 head |= ds_buf[pos]; | |
825 head <<= 8; | |
826 } while (++pos && head != pat); | |
827 len += pos; | |
828 if (total_len + len > maxlen) | |
829 len = maxlen - total_len; | |
830 len = demux_read_data(ds, mem ? &mem[total_len] : NULL, len); | |
831 total_len += len; | |
832 } while ((head != pat || total_len < 3) && total_len < maxlen && !ds->eof); | |
833 if (read) | |
834 *read = total_len; | |
835 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
|
836 } |
746 | 837 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
838 void ds_free_packs(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
839 { |
27055 | 840 demux_packet_t *dp = ds->first; |
841 while (dp) { | |
842 demux_packet_t *dn = dp->next; | |
843 free_demux_packet(dp); | |
844 dp = dn; | |
845 } | |
846 if (ds->asf_packet) { | |
847 // free unfinished .asf fragments: | |
848 free(ds->asf_packet->buffer); | |
849 free(ds->asf_packet); | |
850 ds->asf_packet = NULL; | |
851 } | |
852 ds->first = ds->last = NULL; | |
853 ds->packs = 0; // !!!!! | |
854 ds->bytes = 0; | |
855 if (ds->current) | |
856 free_demux_packet(ds->current); | |
857 ds->current = NULL; | |
858 ds->buffer = NULL; | |
859 ds->buffer_pos = ds->buffer_size; | |
860 ds->pts = 0; | |
861 ds->pts_bytes = 0; | |
1 | 862 } |
863 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
864 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
|
865 { |
24826 | 866 int len; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
867 if (ds->buffer_pos >= ds->buffer_size) { |
27052 | 868 if (!ds_fill_buffer(ds)) { |
1 | 869 // EOF |
870 *start = NULL; | |
871 return -1; | |
27052 | 872 } |
1 | 873 } |
27055 | 874 len = ds->buffer_size - ds->buffer_pos; |
24826 | 875 *start = &ds->buffer[ds->buffer_pos]; |
27055 | 876 ds->buffer_pos += len; |
24826 | 877 return len; |
1 | 878 } |
554 | 879 |
27055 | 880 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
|
881 { |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
882 int len; |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
883 *pts = MP_NOPTS_VALUE; |
29504 | 884 len = ds_get_packet(ds, start); |
885 if (len < 0) | |
886 return len; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18900
diff
changeset
|
887 // Return pts unless this read starts from the middle of a packet |
29504 | 888 if (len == ds->buffer_pos) |
27052 | 889 *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
|
890 return len; |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
891 } |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
892 |
31558 | 893 /** |
894 * Get a subtitle packet. In particular avoid reading the stream. | |
895 * \param pts input: maximum pts value of subtitle packet. NOPTS or NULL for any. | |
33487 | 896 * output: start/reference pts of subtitle |
31558 | 897 * May be NULL. |
898 * \param endpts output: pts for end of display time. May be NULL. | |
899 * \return -1 if no packet is available | |
900 */ | |
901 int ds_get_packet_sub(demux_stream_t *ds, unsigned char **start, | |
902 double *pts, double *endpts) | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
903 { |
32337
c1a2c51bed1c
Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents:
32209
diff
changeset
|
904 double max_pts = MP_NOPTS_VALUE; |
24826 | 905 int len; |
31558 | 906 *start = NULL; |
907 // initialize pts | |
32337
c1a2c51bed1c
Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents:
32209
diff
changeset
|
908 if (pts) { |
c1a2c51bed1c
Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents:
32209
diff
changeset
|
909 max_pts = *pts; |
31558 | 910 *pts = MP_NOPTS_VALUE; |
32337
c1a2c51bed1c
Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents:
32209
diff
changeset
|
911 } |
31558 | 912 if (endpts) |
913 *endpts = MP_NOPTS_VALUE; | |
27055 | 914 if (ds->buffer_pos >= ds->buffer_size) { |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
915 if (!ds->packs) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
916 return -1; // no sub |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
917 if (!ds_fill_buffer(ds)) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
918 return -1; // EOF |
554 | 919 } |
31558 | 920 // only start of buffer has valid pts |
921 if (ds->buffer_pos == 0) { | |
922 if (endpts) | |
923 *endpts = ds->current->endpts; | |
924 if (pts) { | |
925 *pts = ds->current->pts; | |
926 // check if we are too early | |
32337
c1a2c51bed1c
Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents:
32209
diff
changeset
|
927 if (*pts != MP_NOPTS_VALUE && max_pts != MP_NOPTS_VALUE && |
c1a2c51bed1c
Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents:
32209
diff
changeset
|
928 *pts > max_pts) |
31558 | 929 return -1; |
930 } | |
931 } | |
27055 | 932 len = ds->buffer_size - ds->buffer_pos; |
24826 | 933 *start = &ds->buffer[ds->buffer_pos]; |
27055 | 934 ds->buffer_pos += len; |
24826 | 935 return len; |
554 | 936 } |
937 | |
18309
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
938 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
|
939 { |
27055 | 940 demuxer_t *demux = ds->demuxer; |
31272
e340fa125680
Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents:
31250
diff
changeset
|
941 // if we have not read from the "current" packet, consider it |
e340fa125680
Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents:
31250
diff
changeset
|
942 // as the next, otherwise we never get the pts for the first packet. |
e340fa125680
Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents:
31250
diff
changeset
|
943 while (!ds->first && (!ds->current || ds->buffer_pos)) { |
27056 | 944 if (demux->audio->packs >= MAX_PACKS |
945 || demux->audio->bytes >= MAX_PACK_BYTES) { | |
946 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, | |
947 demux->audio->packs, demux->audio->bytes); | |
27055 | 948 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
949 return MP_NOPTS_VALUE; | |
950 } | |
27056 | 951 if (demux->video->packs >= MAX_PACKS |
952 || demux->video->bytes >= MAX_PACK_BYTES) { | |
953 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, | |
954 demux->video->packs, demux->video->bytes); | |
27055 | 955 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
956 return MP_NOPTS_VALUE; | |
957 } | |
958 if (!demux_fill_buffer(demux, ds)) | |
959 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
|
960 } |
31272
e340fa125680
Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents:
31250
diff
changeset
|
961 // take pts from "current" if we never read from it. |
e340fa125680
Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents:
31250
diff
changeset
|
962 if (ds->current && !ds->buffer_pos) |
e340fa125680
Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents:
31250
diff
changeset
|
963 return ds->current->pts; |
27055 | 964 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
|
965 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
966 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
967 // ==================================================================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
968 |
16175 | 969 void demuxer_help(void) |
970 { | |
27055 | 971 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
|
972 |
27055 | 973 mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n"); |
974 mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n"); | |
975 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n"); | |
976 for (i = 0; demuxer_list[i]; i++) { | |
977 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers | |
978 continue; | |
979 if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment)) | |
980 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n", | |
27056 | 981 demuxer_list[i]->name, demuxer_list[i]->type, |
982 demuxer_list[i]->info, demuxer_list[i]->comment); | |
27055 | 983 else |
984 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s\n", | |
27056 | 985 demuxer_list[i]->name, demuxer_list[i]->type, |
986 demuxer_list[i]->info); | |
27055 | 987 } |
16175 | 988 } |
989 | |
14693
37116118ab6a
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
14666
diff
changeset
|
990 |
16175 | 991 /** |
992 * Get demuxer type for a given demuxer name | |
993 * | |
994 * @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
|
995 * @param force will be set if demuxer should be forced. |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
996 * May be NULL. |
16175 | 997 * @return DEMUXER_TYPE_xxx, -1 if error or not found |
998 */ | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
999 int get_demuxer_type_from_name(char *demuxer_name, int *force) |
16175 | 1000 { |
27055 | 1001 int i; |
1002 long type_int; | |
1003 char *endptr; | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
1004 |
27055 | 1005 if (!demuxer_name || !demuxer_name[0]) |
1006 return DEMUXER_TYPE_UNKNOWN; | |
1007 if (force) | |
1008 *force = demuxer_name[0] == '+'; | |
1009 if (demuxer_name[0] == '+') | |
1010 demuxer_name = &demuxer_name[1]; | |
1011 for (i = 0; demuxer_list[i]; i++) { | |
1012 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Can't select special demuxers from commandline | |
1013 continue; | |
1014 if (strcmp(demuxer_name, demuxer_list[i]->name) == 0) | |
1015 return demuxer_list[i]->type; | |
1016 } | |
16175 | 1017 |
27055 | 1018 // No match found, try to parse name as an integer (demuxer number) |
1019 type_int = strtol(demuxer_name, &endptr, 0); | |
1020 if (*endptr) // Conversion failed | |
1021 return -1; | |
1022 if ((type_int > 0) && (type_int <= DEMUXER_TYPE_MAX)) | |
1023 return (int) type_int; | |
1024 | |
26437 | 1025 return -1; |
16175 | 1026 } |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
1027 |
27055 | 1028 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
|
1029 |
27055 | 1030 int correct_pts = 0; |
1031 int user_correct_pts = -1; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18900
diff
changeset
|
1032 |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
1033 /* |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
1034 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
|
1035 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
|
1036 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
|
1037 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
|
1038 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
|
1039 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
|
1040 to the right type (ex: rawaudio,rawvideo). |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
1041 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
|
1042 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
|
1043 (ex: tv,mf). |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
1044 */ |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1045 |
27054 | 1046 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
|
1047 int force, int audio_id, int video_id, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1048 int dvdsub_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1049 { |
27055 | 1050 demuxer_t *demuxer = NULL; |
1659 | 1051 |
27055 | 1052 sh_video_t *sh_video = NULL; |
26437 | 1053 |
27055 | 1054 const demuxer_desc_t *demuxer_desc; |
1055 int fformat = 0; | |
1056 int i; | |
26437 | 1057 |
27055 | 1058 // If somebody requested a demuxer check it |
1059 if (file_format) { | |
1060 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) { | |
27056 | 1061 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
1062 video_id, dvdsub_id, filename); | |
27055 | 1063 if (demuxer_desc->check_file) |
1064 fformat = demuxer_desc->check_file(demuxer); | |
1065 if (force || !demuxer_desc->check_file) | |
1066 fformat = demuxer_desc->type; | |
1067 if (fformat != 0) { | |
1068 if (fformat == demuxer_desc->type) { | |
1069 demuxer_t *demux2 = demuxer; | |
1070 // Move messages to demuxer detection code? | |
27056 | 1071 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
1072 MSGTR_Detected_XXX_FileFormat, | |
1073 demuxer_desc->shortdesc); | |
27055 | 1074 file_format = fformat; |
27056 | 1075 if (!demuxer->desc->open |
1076 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 1077 demuxer = demux2; |
1078 goto dmx_open; | |
1079 } | |
1080 } else { | |
1081 // Format changed after check, recurse | |
1082 free_demuxer(demuxer); | |
27056 | 1083 return demux_open_stream(stream, fformat, force, audio_id, |
1084 video_id, dvdsub_id, filename); | |
27055 | 1085 } |
1086 } | |
1087 // Check failed for forced demuxer, quit | |
1088 free_demuxer(demuxer); | |
1089 return NULL; | |
20303 | 1090 } |
1091 } | |
27055 | 1092 // Test demuxers with safe file checks |
1093 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
1094 if (demuxer_desc->safe_check) { | |
27056 | 1095 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
1096 video_id, dvdsub_id, filename); | |
27055 | 1097 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { |
1098 if (fformat == demuxer_desc->type) { | |
1099 demuxer_t *demux2 = demuxer; | |
27056 | 1100 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
1101 MSGTR_Detected_XXX_FileFormat, | |
1102 demuxer_desc->shortdesc); | |
27055 | 1103 file_format = fformat; |
27056 | 1104 if (!demuxer->desc->open |
1105 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 1106 demuxer = demux2; |
1107 goto dmx_open; | |
1108 } | |
1109 } else { | |
1110 if (fformat == DEMUXER_TYPE_PLAYLIST) | |
1111 return demuxer; // handled in mplayer.c | |
1112 // Format changed after check, recurse | |
1113 free_demuxer(demuxer); | |
1114 demuxer = demux_open_stream(stream, fformat, force, | |
27056 | 1115 audio_id, video_id, |
1116 dvdsub_id, filename); | |
27055 | 1117 if (demuxer) |
1118 return demuxer; // done! | |
1119 file_format = DEMUXER_TYPE_UNKNOWN; | |
1120 } | |
1121 } | |
1122 free_demuxer(demuxer); | |
1123 demuxer = NULL; | |
26379 | 1124 } |
1125 } | |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
1126 |
27055 | 1127 // If no forced demuxer perform file extension based detection |
27056 | 1128 // Ok. We're over the stable detectable fileformats, the next ones are |
1129 // a bit fuzzy. So by default (extension_parsing==1) try extension-based | |
1130 // detection first: | |
1131 if (file_format == DEMUXER_TYPE_UNKNOWN && filename | |
1132 && extension_parsing == 1) { | |
27055 | 1133 file_format = demuxer_type_by_filename(filename); |
1134 if (file_format != DEMUXER_TYPE_UNKNOWN) { | |
1135 // we like recursion :) | |
27056 | 1136 demuxer = demux_open_stream(stream, file_format, force, audio_id, |
1137 video_id, dvdsub_id, filename); | |
27055 | 1138 if (demuxer) |
1139 return demuxer; // done! | |
1140 file_format = DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing... | |
27056 | 1141 mp_msg(MSGT_DEMUXER, MSGL_V, |
1142 "demuxer: continue fuzzy content-based format guessing...\n"); | |
26437 | 1143 } |
1144 } | |
27055 | 1145 // Try detection for all other demuxers |
1146 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
1147 if (!demuxer_desc->safe_check && demuxer_desc->check_file) { | |
27056 | 1148 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
1149 video_id, dvdsub_id, filename); | |
27055 | 1150 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { |
1151 if (fformat == demuxer_desc->type) { | |
1152 demuxer_t *demux2 = demuxer; | |
27056 | 1153 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
1154 MSGTR_Detected_XXX_FileFormat, | |
1155 demuxer_desc->shortdesc); | |
27055 | 1156 file_format = fformat; |
27056 | 1157 if (!demuxer->desc->open |
1158 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 1159 demuxer = demux2; |
1160 goto dmx_open; | |
1161 } | |
1162 } else { | |
1163 if (fformat == DEMUXER_TYPE_PLAYLIST) | |
1164 return demuxer; // handled in mplayer.c | |
1165 // Format changed after check, recurse | |
1166 free_demuxer(demuxer); | |
1167 demuxer = demux_open_stream(stream, fformat, force, | |
27056 | 1168 audio_id, video_id, |
1169 dvdsub_id, filename); | |
27055 | 1170 if (demuxer) |
1171 return demuxer; // done! | |
1172 file_format = DEMUXER_TYPE_UNKNOWN; | |
1173 } | |
1174 } | |
1175 free_demuxer(demuxer); | |
1176 demuxer = NULL; | |
1177 } | |
1178 } | |
26437 | 1179 |
27055 | 1180 return NULL; |
1181 //====== File format recognized, set up these for compatibility: ========= | |
1182 dmx_open: | |
1183 | |
1184 demuxer->file_format = file_format; | |
1185 | |
1186 if ((sh_video = demuxer->video->sh) && sh_video->bih) { | |
1187 int biComp = le2me_32(sh_video->bih->biCompression); | |
27056 | 1188 mp_msg(MSGT_DEMUX, MSGL_INFO, |
1189 "VIDEO: [%.4s] %dx%d %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", | |
1190 (char *) &biComp, sh_video->bih->biWidth, | |
1191 sh_video->bih->biHeight, sh_video->bih->biBitCount, | |
1192 sh_video->fps, sh_video->i_bps * 0.008f, | |
27055 | 1193 sh_video->i_bps / 1024.0f); |
1194 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
1195 #ifdef CONFIG_ASS |
27055 | 1196 if (ass_enabled && ass_library) { |
1197 for (i = 0; i < MAX_S_STREAMS; ++i) { | |
1198 sh_sub_t *sh = demuxer->s_streams[i]; | |
1199 if (sh && sh->type == 'a') { | |
1200 sh->ass_track = ass_new_track(ass_library); | |
1201 if (sh->ass_track && sh->extradata) | |
27056 | 1202 ass_process_codec_private(sh->ass_track, sh->extradata, |
1203 sh->extradata_len); | |
27055 | 1204 } else if (sh && sh->type != 'v') |
1205 sh->ass_track = ass_default_track(ass_library); | |
1206 } | |
1207 } | |
26437 | 1208 #endif |
27055 | 1209 return demuxer; |
26437 | 1210 } |
1211 | |
27054 | 1212 char *audio_stream = NULL; |
27056 | 1213 char *sub_stream = NULL; |
9709 | 1214 int audio_stream_cache = 0; |
7867 | 1215 |
27056 | 1216 char *demuxer_name = NULL; // parameter from -demuxer |
16175 | 1217 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer |
27056 | 1218 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer |
16175 | 1219 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1220 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
|
1221 int video_id, int dvdsub_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1222 { |
27055 | 1223 stream_t *as = NULL, *ss = NULL; |
1224 demuxer_t *vd, *ad = NULL, *sd = NULL; | |
1225 demuxer_t *res; | |
1226 int afmt = DEMUXER_TYPE_UNKNOWN, sfmt = DEMUXER_TYPE_UNKNOWN; | |
1227 int demuxer_type; | |
1228 int audio_demuxer_type = 0, sub_demuxer_type = 0; | |
1229 int demuxer_force = 0, audio_demuxer_force = 0, sub_demuxer_force = 0; | |
16175 | 1230 |
27056 | 1231 if ((demuxer_type = |
1232 get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) { | |
1233 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-demuxer %s does not exist.\n", | |
1234 demuxer_name); | |
27055 | 1235 } |
27056 | 1236 if ((audio_demuxer_type = |
1237 get_demuxer_type_from_name(audio_demuxer_name, | |
1238 &audio_demuxer_force)) < 0) { | |
1239 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-audio-demuxer %s does not exist.\n", | |
1240 audio_demuxer_name); | |
27055 | 1241 } |
27056 | 1242 if ((sub_demuxer_type = |
1243 get_demuxer_type_from_name(sub_demuxer_name, | |
1244 &sub_demuxer_force)) < 0) { | |
1245 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-sub-demuxer %s does not exist.\n", | |
1246 sub_demuxer_name); | |
27055 | 1247 } |
26437 | 1248 |
27055 | 1249 if (audio_stream) { |
1250 as = open_stream(audio_stream, 0, &afmt); | |
1251 if (!as) { | |
27056 | 1252 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenAudioStream, |
1253 audio_stream); | |
27055 | 1254 return NULL; |
1255 } | |
1256 if (audio_stream_cache) { | |
27056 | 1257 if (!stream_enable_cache |
1258 (as, audio_stream_cache * 1024, | |
1259 audio_stream_cache * 1024 * (stream_cache_min_percent / | |
1260 100.0), | |
1261 audio_stream_cache * 1024 * (stream_cache_seek_min_percent / | |
1262 100.0))) { | |
27055 | 1263 free_stream(as); |
27056 | 1264 mp_msg(MSGT_DEMUXER, MSGL_ERR, |
1265 "Can't enable audio stream cache\n"); | |
27055 | 1266 return NULL; |
1267 } | |
1268 } | |
26379 | 1269 } |
27055 | 1270 if (sub_stream) { |
1271 ss = open_stream(sub_stream, 0, &sfmt); | |
1272 if (!ss) { | |
27056 | 1273 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenSubtitlesStream, |
1274 sub_stream); | |
27055 | 1275 return NULL; |
1276 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1277 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1278 |
27055 | 1279 vd = demux_open_stream(vs, demuxer_type ? demuxer_type : file_format, |
27056 | 1280 demuxer_force, audio_stream ? -2 : audio_id, |
1281 video_id, sub_stream ? -2 : dvdsub_id, filename); | |
27055 | 1282 if (!vd) { |
1283 if (as) | |
1284 free_stream(as); | |
1285 if (ss) | |
1286 free_stream(ss); | |
1287 return NULL; | |
1288 } | |
1289 if (as) { | |
27056 | 1290 ad = demux_open_stream(as, |
1291 audio_demuxer_type ? audio_demuxer_type : afmt, | |
1292 audio_demuxer_force, audio_id, -2, -2, | |
1293 audio_stream); | |
27055 | 1294 if (!ad) { |
27056 | 1295 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_OpeningAudioDemuxerFailed, |
1296 audio_stream); | |
27055 | 1297 free_stream(as); |
27056 | 1298 } else if (ad->audio->sh |
1299 && ((sh_audio_t *) ad->audio->sh)->format == 0x55) // MP3 | |
27055 | 1300 hr_mp3_seek = 1; // Enable high res seeking |
9709 | 1301 } |
27055 | 1302 if (ss) { |
1303 sd = demux_open_stream(ss, sub_demuxer_type ? sub_demuxer_type : sfmt, | |
27056 | 1304 sub_demuxer_force, -2, -2, dvdsub_id, |
1305 sub_stream); | |
27055 | 1306 if (!sd) { |
27056 | 1307 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
1308 MSGTR_OpeningSubtitlesDemuxerFailed, sub_stream); | |
27055 | 1309 free_stream(ss); |
1310 } | |
1311 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1312 |
27055 | 1313 if (ad && sd) |
1314 res = new_demuxers_demuxer(vd, ad, sd); | |
1315 else if (ad) | |
1316 res = new_demuxers_demuxer(vd, ad, vd); | |
1317 else if (sd) | |
1318 res = new_demuxers_demuxer(vd, vd, sd); | |
1319 else | |
1320 res = vd; | |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25883
diff
changeset
|
1321 |
27055 | 1322 correct_pts = user_correct_pts; |
1323 if (correct_pts < 0) | |
31250
a7c91e121d79
Default to -correct-pts off if -fps was given, since -fps has no effect
reimar
parents:
30702
diff
changeset
|
1324 correct_pts = !force_fps && demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL) |
27056 | 1325 == DEMUXER_CTRL_OK; |
27055 | 1326 return res; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1327 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1328 |
30396
5fe2615e5db7
Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents:
30385
diff
changeset
|
1329 /** |
5fe2615e5db7
Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents:
30385
diff
changeset
|
1330 * Do necessary reinitialization after e.g. a seek. |
5fe2615e5db7
Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents:
30385
diff
changeset
|
1331 * Do _not_ call ds_fill_buffer between the seek and this, it breaks at least |
5fe2615e5db7
Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents:
30385
diff
changeset
|
1332 * seeking with ASF demuxer. |
5fe2615e5db7
Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents:
30385
diff
changeset
|
1333 */ |
30378
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1334 static void demux_resync(demuxer_t *demuxer) |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1335 { |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1336 sh_video_t *sh_video = demuxer->video->sh; |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1337 sh_audio_t *sh_audio = demuxer->audio->sh; |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1338 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); |
35892
a8c33658bd4e
Allow audio/video queues to fill up a bit more right after seeking.
reimar
parents:
35864
diff
changeset
|
1339 demuxer->audio->fill_count = -80; |
a8c33658bd4e
Allow audio/video queues to fill up a bit more right after seeking.
reimar
parents:
35864
diff
changeset
|
1340 demuxer->video->fill_count = -80; |
30378
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1341 if (sh_video) { |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1342 resync_video_stream(sh_video); |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1343 } |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1344 if (sh_audio) { |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1345 resync_audio_stream(sh_audio); |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1346 } |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1347 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1348 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1349 void demux_flush(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1350 { |
30379
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
1351 #if PARSE_ON_ADD |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
1352 ds_clear_parser(demuxer->video); |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
1353 ds_clear_parser(demuxer->audio); |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
1354 ds_clear_parser(demuxer->sub); |
0140d505dd91
Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents:
30378
diff
changeset
|
1355 #endif |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1356 ds_free_packs(demuxer->video); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1357 ds_free_packs(demuxer->audio); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1358 ds_free_packs(demuxer->sub); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1359 } |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1360 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1361 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
|
1362 int flags) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1363 { |
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
|
1364 double tmp = 0; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1365 double pts; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1366 |
27055 | 1367 if (!demuxer->seekable) { |
1368 if (demuxer->file_format == DEMUXER_TYPE_AVI) | |
1369 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekRawAVI); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
1370 #ifdef CONFIG_TV |
27055 | 1371 else if (demuxer->file_format == DEMUXER_TYPE_TV) |
1372 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_TVInputNotSeekable); | |
2790 | 1373 #endif |
27055 | 1374 else |
1375 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekFile); | |
1376 return 0; | |
1377 } | |
26437 | 1378 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1379 demux_flush(demuxer); |
27055 | 1380 |
27045 | 1381 demuxer->stream->eof = 0; |
27055 | 1382 demuxer->video->eof = 0; |
1383 demuxer->audio->eof = 0; | |
31949 | 1384 demuxer->sub->eof = 0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1385 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1386 if (flags & SEEK_ABSOLUTE) |
27055 | 1387 pts = 0.0f; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1388 else { |
27055 | 1389 if (demuxer->stream_pts == MP_NOPTS_VALUE) |
1390 goto dmx_seek; | |
1391 pts = demuxer->stream_pts; | |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1392 } |
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1393 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1394 if (flags & SEEK_FACTOR) { |
27056 | 1395 if (stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp) |
1396 == STREAM_UNSUPPORTED) | |
27055 | 1397 goto dmx_seek; |
1398 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
|
1399 } else |
27055 | 1400 pts += rel_seek_secs; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1401 |
27056 | 1402 if (stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, &pts) != |
1403 STREAM_UNSUPPORTED) { | |
30378
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1404 demux_resync(demuxer); |
27055 | 1405 return 1; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1406 } |
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1407 |
27055 | 1408 dmx_seek: |
1409 if (demuxer->desc->seek) | |
1410 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
|
1411 |
30378
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1412 demux_resync(demuxer); |
16877
9081ae3a702c
move resync_audio_stream after seeking to demuxer.c
reimar
parents:
16572
diff
changeset
|
1413 |
27055 | 1414 return 1; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1415 } |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1416 |
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
|
1417 int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param) |
3050 | 1418 { |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1419 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1420 int n = 0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1421 |
3050 | 1422 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1423 for (n = 0; info && info[2 * n] != NULL; n++) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1424 if (!strcasecmp(opt, info[2 * n])) { |
29634
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1425 if (!strcmp(param, info[2 * n + 1])) { |
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1426 mp_msg(MSGT_DEMUX, MSGL_V, "Demuxer info %s set to unchanged value %s\n", opt, param); |
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1427 return 0; |
342a78c13eeb
Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents:
29504
diff
changeset
|
1428 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1429 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_DemuxerInfoChanged, opt, |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1430 param); |
27055 | 1431 free(info[2 * n + 1]); |
1432 info[2 * n + 1] = strdup(param); | |
27052 | 1433 return 0; |
27055 | 1434 } |
1435 } | |
27051 | 1436 |
30702 | 1437 info = demuxer->info = realloc(info, (2 * (n + 2)) * sizeof(char *)); |
27055 | 1438 info[2 * n] = strdup(opt); |
1439 info[2 * n + 1] = strdup(param); | |
1440 memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *)); | |
3050 | 1441 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1442 return 1; |
3050 | 1443 } |
1444 | |
1445 int demux_info_print(demuxer_t *demuxer) | |
1446 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1447 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1448 int n; |
3050 | 1449 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1450 if (!info) |
27055 | 1451 return 0; |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1452 |
27055 | 1453 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_ClipInfo); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1454 for (n = 0; info[2 * n] != NULL; n++) { |
27056 | 1455 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n", info[2 * n], |
1456 info[2 * n + 1]); | |
1457 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, | |
1458 info[2 * n]); | |
1459 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, | |
1460 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
|
1461 } |
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
|
1462 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n); |
4189 | 1463 |
1464 return 0; | |
3050 | 1465 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1466 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1467 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
|
1468 { |
27055 | 1469 int i; |
1470 char **info = demuxer->info; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1471 |
27055 | 1472 for (i = 0; info && info[2 * i] != NULL; i++) { |
1473 if (!strcasecmp(opt, info[2 * i])) | |
1474 return info[2 * i + 1]; | |
1475 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1476 |
27055 | 1477 return NULL; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1478 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1479 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1480 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
|
1481 { |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1482 |
16175 | 1483 if (demuxer->desc->control) |
27055 | 1484 return demuxer->desc->control(demuxer, cmd, arg); |
16175 | 1485 |
1486 return DEMUXER_CTRL_NOTIMPL; | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1487 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1488 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1489 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1490 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1491 double demuxer_get_time_length(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1492 { |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16326
diff
changeset
|
1493 double get_time_ans; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1494 sh_video_t *sh_video = demuxer->video->sh; |
16925 | 1495 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
|
1496 // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW |
27056 | 1497 if (demux_control |
1498 (demuxer, DEMUXER_CTRL_GET_TIME_LENGTH, (void *) &get_time_ans) <= 0) { | |
27055 | 1499 if (sh_video && sh_video->i_bps && sh_audio && sh_audio->i_bps) |
27056 | 1500 get_time_ans = (double) (demuxer->movi_end - |
1501 demuxer->movi_start) / (sh_video->i_bps + | |
1502 sh_audio->i_bps); | |
27055 | 1503 else if (sh_video && sh_video->i_bps) |
27056 | 1504 get_time_ans = (double) (demuxer->movi_end - |
1505 demuxer->movi_start) / sh_video->i_bps; | |
27055 | 1506 else if (sh_audio && sh_audio->i_bps) |
27056 | 1507 get_time_ans = (double) (demuxer->movi_end - |
1508 demuxer->movi_start) / sh_audio->i_bps; | |
27055 | 1509 else |
1510 get_time_ans = 0; | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1511 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1512 return get_time_ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1513 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1514 |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1515 /** |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1516 * \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
|
1517 * 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
|
1518 * 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
|
1519 * 0 otherwise |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1520 * \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
|
1521 */ |
34312
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34146
diff
changeset
|
1522 double demuxer_get_current_time(demuxer_t *demuxer) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1523 { |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1524 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
|
1525 sh_video_t *sh_video = demuxer->video->sh; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1526 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
|
1527 get_time_ans = demuxer->stream_pts; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1528 else if (sh_video) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1529 get_time_ans = sh_video->pts; |
34312
d2a41814c879
Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents:
34146
diff
changeset
|
1530 return get_time_ans; |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1531 } |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1532 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1533 int demuxer_get_percent_pos(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1534 { |
14197
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1535 int ans = 0; |
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1536 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
|
1537 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
|
1538 if (res <= 0) { |
29486
a373af1e3b24
Handle demuxers that never set filepos by using stream_tell.
reimar
parents:
29366
diff
changeset
|
1539 off_t pos = demuxer->filepos > 0 ? demuxer->filepos : stream_tell(demuxer->stream); |
27055 | 1540 if (len > 0) |
29486
a373af1e3b24
Handle demuxers that never set filepos by using stream_tell.
reimar
parents:
29366
diff
changeset
|
1541 ans = (pos - demuxer->movi_start) / len; |
27055 | 1542 else |
1543 ans = 0; | |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1544 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1545 if (ans < 0) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1546 ans = 0; |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1547 if (ans > 100) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1548 ans = 100; |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1549 return ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1550 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1551 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1552 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
|
1553 { |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1554 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
|
1555 if (res == DEMUXER_CTRL_NOTIMPL) |
27055 | 1556 index = demuxer->audio->id; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1557 if (demuxer->audio->id >= 0) |
27055 | 1558 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
|
1559 else |
27055 | 1560 demuxer->audio->sh = NULL; |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1561 return index; |
15046
b7aa70b05d76
Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents:
14934
diff
changeset
|
1562 } |
19342 | 1563 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1564 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
|
1565 { |
20948 | 1566 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_VIDEO, &index); |
1567 if (res == DEMUXER_CTRL_NOTIMPL) | |
27055 | 1568 index = demuxer->video->id; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1569 if (demuxer->video->id >= 0) |
27055 | 1570 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
|
1571 else |
27055 | 1572 demuxer->video->sh = NULL; |
20948 | 1573 return index; |
1574 } | |
1575 | |
27054 | 1576 int demuxer_add_attachment(demuxer_t *demuxer, const char *name, |
1577 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
|
1578 { |
25657 | 1579 if (!(demuxer->num_attachments & 31)) |
27056 | 1580 demuxer->attachments = realloc(demuxer->attachments, |
1581 (demuxer->num_attachments + 32) * sizeof(demux_attachment_t)); | |
25657 | 1582 |
33189 | 1583 demuxer->attachments[demuxer->num_attachments].name = name ? strdup(name) : NULL; |
25657 | 1584 demuxer->attachments[demuxer->num_attachments].type = strdup(type); |
1585 demuxer->attachments[demuxer->num_attachments].data = malloc(size); | |
1586 memcpy(demuxer->attachments[demuxer->num_attachments].data, data, size); | |
1587 demuxer->attachments[demuxer->num_attachments].data_size = size; | |
1588 | |
27055 | 1589 return demuxer->num_attachments++; |
25657 | 1590 } |
1591 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1592 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
|
1593 uint64_t end) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1594 { |
19342 | 1595 if (demuxer->chapters == NULL) |
27055 | 1596 demuxer->chapters = malloc(32 * sizeof(*demuxer->chapters)); |
19342 | 1597 else if (!(demuxer->num_chapters % 32)) |
27056 | 1598 demuxer->chapters = realloc(demuxer->chapters, |
1599 (demuxer->num_chapters + 32) * | |
1600 sizeof(*demuxer->chapters)); | |
19342 | 1601 |
1602 demuxer->chapters[demuxer->num_chapters].start = start; | |
1603 demuxer->chapters[demuxer->num_chapters].end = end; | |
27057
42332b47d6aa
Support NULL name parameter for demuxer_add_chapter.
reimar
parents:
27056
diff
changeset
|
1604 demuxer->chapters[demuxer->num_chapters].name = strdup(name ? name : MSGTR_Unknown); |
19342 | 1605 |
29366 | 1606 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_ID=%d\n", demuxer->num_chapters); |
1607 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_START=%"PRIu64"\n", demuxer->num_chapters, start); | |
1608 if (end) | |
1609 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_END=%"PRIu64"\n", demuxer->num_chapters, end); | |
1610 if (name) | |
1611 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_NAME=%s\n", demuxer->num_chapters, name); | |
1612 | |
27055 | 1613 return demuxer->num_chapters++; |
19342 | 1614 } |
1615 | |
19435 | 1616 /** |
27051 | 1617 * \brief demuxer_seek_chapter() seeks to a chapter in two possible ways: |
19435 | 1618 * either using the demuxer->chapters structure set by the demuxer |
1619 * or asking help to the stream layer (e.g. dvd) | |
19439 | 1620 * \param chapter - chapter number wished - 0-based |
19435 | 1621 * \param mode 0: relative to current main pts, 1: absolute |
1622 * \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
|
1623 * \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
|
1624 * \param chapter_name name of chapter found (set by this function is param is not null) |
19435 | 1625 * \return -1 on error, current chapter if successful |
1626 */ | |
1627 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1628 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
|
1629 float *seek_pts, int *num_chapters, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1630 char **chapter_name) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1631 { |
19435 | 1632 int ris; |
1633 int current, total; | |
1634 | |
1635 if (!demuxer->num_chapters || !demuxer->chapters) { | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1636 if (!mode) { |
27056 | 1637 ris = stream_control(demuxer->stream, |
1638 STREAM_CTRL_GET_CURRENT_CHAPTER, ¤t); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1639 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1640 return -1; |
19438
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1641 chapter += current; |
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1642 } |
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1643 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1644 demux_flush(demuxer); |
19435 | 1645 |
27056 | 1646 ris = stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_CHAPTER, |
1647 &chapter); | |
19435 | 1648 |
30378
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1649 demux_resync(demuxer); |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1650 |
27056 | 1651 // exit status may be ok, but main() doesn't have to seek itself |
1652 // (because e.g. dvds depend on sectors, not on pts) | |
19435 | 1653 *seek_pts = -1.0; |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1654 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1655 if (num_chapters) { |
27056 | 1656 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, |
1657 num_chapters) == STREAM_UNSUPPORTED) | |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1658 *num_chapters = 0; |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1659 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1660 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1661 if (chapter_name) { |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1662 *chapter_name = NULL; |
25314
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1663 if (num_chapters && *num_chapters) { |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1664 char *tmp = malloc(16); |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1665 if (tmp) { |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1666 sprintf(tmp, " of %3d", *num_chapters); |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1667 *chapter_name = tmp; |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1668 } |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1669 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1670 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1671 |
26758
9fb1d2c3dbd4
cosmetics: Remove pointless parentheses from return statements.
diego
parents:
26437
diff
changeset
|
1672 return ris != STREAM_UNSUPPORTED ? chapter : -1; |
27055 | 1673 } else { // chapters structure is set in the demuxer |
30378
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1674 sh_video_t *sh_video = demuxer->video->sh; |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1675 sh_audio_t *sh_audio = demuxer->audio->sh; |
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1676 |
19435 | 1677 total = demuxer->num_chapters; |
1678 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1679 if (mode == 1) //absolute seeking |
19435 | 1680 current = chapter; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1681 else { //relative seeking |
19435 | 1682 uint64_t now; |
27056 | 1683 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0.)) |
1684 * 1000 + .5; | |
19435 | 1685 |
1686 for (current = total - 1; current >= 0; --current) { | |
27054 | 1687 demux_chapter_t *chapter = demuxer->chapters + current; |
19435 | 1688 if (chapter->start <= now) |
1689 break; | |
1690 } | |
1691 current += chapter; | |
1692 } | |
1693 | |
1694 if (current >= total) | |
27055 | 1695 return -1; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1696 if (current < 0) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1697 current = 0; |
19435 | 1698 |
1699 *seek_pts = demuxer->chapters[current].start / 1000.0; | |
1700 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1701 if (num_chapters) |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1702 *num_chapters = demuxer->num_chapters; |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1703 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1704 if (chapter_name) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1705 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
|
1706 *chapter_name = strdup(demuxer->chapters[current].name); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1707 else |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1708 *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
|
1709 } |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1710 |
19435 | 1711 return current; |
1712 } | |
1713 } | |
25358 | 1714 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1715 int demuxer_get_current_chapter(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1716 { |
25358 | 1717 int chapter = -1; |
1718 if (!demuxer->num_chapters || !demuxer->chapters) { | |
1719 if (stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, | |
1720 &chapter) == STREAM_UNSUPPORTED) | |
1721 chapter = -1; | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1722 } else { |
25358 | 1723 sh_video_t *sh_video = demuxer->video->sh; |
1724 sh_audio_t *sh_audio = demuxer->audio->sh; | |
1725 uint64_t now; | |
27056 | 1726 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0)) |
1727 * 1000 + 0.5; | |
25358 | 1728 for (chapter = demuxer->num_chapters - 1; chapter >= 0; --chapter) { |
1729 if (demuxer->chapters[chapter].start <= now) | |
1730 break; | |
1731 } | |
1732 } | |
1733 return chapter; | |
1734 } | |
1735 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1736 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
|
1737 { |
25358 | 1738 if (demuxer->num_chapters && demuxer->chapters) { |
27056 | 1739 if (chapter >= 0 && chapter < demuxer->num_chapters |
1740 && demuxer->chapters[chapter].name) | |
25358 | 1741 return strdup(demuxer->chapters[chapter].name); |
1742 } | |
1743 return NULL; | |
1744 } | |
1745 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1746 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
|
1747 { |
25358 | 1748 char *chapter_name = demuxer_chapter_name(demuxer, chapter); |
1749 if (chapter_name) { | |
1750 char *tmp = malloc(strlen(chapter_name) + 14); | |
1751 snprintf(tmp, 63, "(%d) %s", chapter + 1, chapter_name); | |
27051 | 1752 free(chapter_name); |
25358 | 1753 return tmp; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1754 } else { |
25358 | 1755 int chapter_num = demuxer_chapter_count(demuxer); |
1756 char tmp[30]; | |
1757 if (chapter_num <= 0) | |
1758 sprintf(tmp, "(%d)", chapter + 1); | |
1759 else | |
1760 sprintf(tmp, "(%d) of %d", chapter + 1, chapter_num); | |
1761 return strdup(tmp); | |
1762 } | |
1763 } | |
1764 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1765 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
|
1766 { |
25358 | 1767 if (demuxer->num_chapters && demuxer->chapters && chapter >= 0 |
27055 | 1768 && chapter < demuxer->num_chapters) { |
25358 | 1769 if (end) |
1770 *end = demuxer->chapters[chapter].end / 1000.0; | |
1771 return demuxer->chapters[chapter].start / 1000.0; | |
1772 } | |
1773 return -1.0; | |
1774 } | |
1775 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1776 int demuxer_chapter_count(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1777 { |
25358 | 1778 if (!demuxer->num_chapters || !demuxer->chapters) { |
1779 int num_chapters = 0; | |
1780 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, | |
1781 &num_chapters) == STREAM_UNSUPPORTED) | |
1782 num_chapters = 0; | |
1783 return num_chapters; | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1784 } else |
25358 | 1785 return demuxer->num_chapters; |
1786 } | |
1787 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1788 int demuxer_angles_count(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1789 { |
27055 | 1790 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
|
1791 |
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
|
1792 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
|
1793 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1794 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
|
1795 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
|
1796 } |
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
|
1797 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1798 int demuxer_get_current_angle(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1799 { |
27055 | 1800 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
|
1801 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
|
1802 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1803 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
|
1804 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
|
1805 } |
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
|
1806 |
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
|
1807 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1808 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
|
1809 { |
27055 | 1810 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
|
1811 |
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
|
1812 angles = demuxer_angles_count(demuxer); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1813 if ((angles < 1) || (angle > angles)) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1814 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
|
1815 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1816 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
|
1817 |
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
|
1818 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
|
1819 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1820 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
|
1821 |
30378
8339bca8e4b4
Move the resync-related code into more consistent places instead of having it
reimar
parents:
30088
diff
changeset
|
1822 demux_resync(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
|
1823 |
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
|
1824 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
|
1825 } |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1826 |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1827 int demuxer_audio_lang(demuxer_t *d, int id, char *buf, int buf_len) |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1828 { |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1829 struct stream_lang_req req; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1830 sh_audio_t *sh; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1831 if (id < 0 || id >= MAX_A_STREAMS) |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1832 return -1; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1833 sh = d->a_streams[id]; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1834 if (!sh) |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1835 return -1; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1836 if (sh->lang) { |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1837 av_strlcpy(buf, sh->lang, buf_len); |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1838 return 0; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1839 } |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1840 req.type = stream_ctrl_audio; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1841 req.id = sh->aid; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1842 if (stream_control(d->stream, STREAM_CTRL_GET_LANG, &req) == STREAM_OK) { |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1843 av_strlcpy(buf, req.buf, buf_len); |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1844 return 0; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1845 } |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1846 return -1; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1847 } |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1848 |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1849 int demuxer_sub_lang(demuxer_t *d, int id, char *buf, int buf_len) |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1850 { |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1851 struct stream_lang_req req; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1852 sh_sub_t *sh; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1853 if (id < 0 || id >= MAX_S_STREAMS) |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1854 return -1; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1855 sh = d->s_streams[id]; |
34689
e92fb6cc0836
Fix DVDs showing the subtitle language as "unknown"
reimar
parents:
34648
diff
changeset
|
1856 if (sh && sh->lang) { |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1857 av_strlcpy(buf, sh->lang, buf_len); |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1858 return 0; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1859 } |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1860 req.type = stream_ctrl_sub; |
34689
e92fb6cc0836
Fix DVDs showing the subtitle language as "unknown"
reimar
parents:
34648
diff
changeset
|
1861 // assume 1:1 mapping so we can show the language of |
e92fb6cc0836
Fix DVDs showing the subtitle language as "unknown"
reimar
parents:
34648
diff
changeset
|
1862 // DVD subs even when we have not yet created the stream. |
e92fb6cc0836
Fix DVDs showing the subtitle language as "unknown"
reimar
parents:
34648
diff
changeset
|
1863 req.id = sh ? sh->sid : id; |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1864 if (stream_control(d->stream, STREAM_CTRL_GET_LANG, &req) == STREAM_OK) { |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1865 av_strlcpy(buf, req.buf, buf_len); |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1866 return 0; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1867 } |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1868 return -1; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1869 } |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34566
diff
changeset
|
1870 |
27054 | 1871 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
|
1872 { |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1873 int i, len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1874 lang += strspn(lang, ","); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1875 while ((len = strcspn(lang, ",")) > 0) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1876 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1877 sh_audio_t *sh = d->a_streams[i]; |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1878 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
|
1879 return sh->aid; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1880 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1881 lang += len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1882 lang += strspn(lang, ","); |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1883 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1884 return -1; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1885 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1886 |
27054 | 1887 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
|
1888 { |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1889 int i, len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1890 lang += strspn(lang, ","); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1891 while ((len = strcspn(lang, ",")) > 0) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1892 for (i = 0; i < MAX_S_STREAMS; ++i) { |
27054 | 1893 sh_sub_t *sh = d->s_streams[i]; |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1894 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
|
1895 return sh->sid; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1896 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1897 lang += len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1898 lang += strspn(lang, ","); |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1899 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1900 return -1; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1901 } |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1902 |
27054 | 1903 int demuxer_default_audio_track(demuxer_t *d) |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1904 { |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1905 int i; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1906 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1907 sh_audio_t *sh = d->a_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1908 if (sh && sh->default_track) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1909 return sh->aid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1910 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1911 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1912 sh_audio_t *sh = d->a_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1913 if (sh) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1914 return sh->aid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1915 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1916 return -1; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1917 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1918 |
36682 | 1919 int demuxer_default_video_track(demuxer_t *d) |
1920 { | |
1921 int i; | |
1922 for (i = 0; i < MAX_V_STREAMS; ++i) { | |
1923 sh_video_t *sh = d->v_streams[i]; | |
1924 if (sh && sh->default_track) | |
1925 return sh->vid; | |
1926 } | |
1927 for (i = 0; i < MAX_V_STREAMS; ++i) { | |
1928 sh_video_t *sh = d->v_streams[i]; | |
1929 if (sh) | |
1930 return sh->vid; | |
1931 } | |
1932 return -1; | |
1933 } | |
1934 | |
27054 | 1935 int demuxer_default_sub_track(demuxer_t *d) |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1936 { |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1937 int i; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1938 for (i = 0; i < MAX_S_STREAMS; ++i) { |
27054 | 1939 sh_sub_t *sh = d->s_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1940 if (sh && sh->default_track) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1941 return sh->sid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1942 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1943 return -1; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1944 } |