Mercurial > mplayer.hg
annotate libmpdemux/demux_lavf.c @ 22990:a76748e71a18
Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
regardless of actual audio codec.
author | reimar |
---|---|
date | Mon, 16 Apr 2007 20:08:29 +0000 |
parents | 46593cc4aeba |
children | 74efb0fa8a0b |
rev | line source |
---|---|
12164 | 1 /* |
2 Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at> | |
3 | |
4 This program is free software; you can redistribute it and/or modify | |
5 it under the terms of the GNU General Public License as published by | |
6 the Free Software Foundation; either version 2 of the License, or | |
7 (at your option) any later version. | |
8 | |
9 This program is distributed in the hope that it will be useful, | |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 GNU General Public License for more details. | |
13 | |
14 You should have received a copy of the GNU General Public License | |
15 along with this program; if not, write to the Free Software | |
17367
401b440a6d76
Update licensing information: The FSF changed postal address.
diego
parents:
17354
diff
changeset
|
16 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
12164 | 17 */ |
18 | |
19 // #include <stdio.h> | |
20 #include <stdlib.h> | |
21 // #include <unistd.h> | |
19611 | 22 #include <limits.h> |
12164 | 23 |
24 #include "config.h" | |
25 #include "mp_msg.h" | |
26 // #include "help_mp.h" | |
27 | |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22440
diff
changeset
|
28 #include "stream/stream.h" |
12164 | 29 #include "demuxer.h" |
30 #include "stheader.h" | |
19598 | 31 #include "m_option.h" |
12164 | 32 |
17354 | 33 #ifdef USE_LIBAVFORMAT_SO |
34 #include <ffmpeg/avformat.h> | |
21995
f615c862f862
Remove ff_gcd prototype and include avutil.h instead where it is defined.
reimar
parents:
21966
diff
changeset
|
35 #include <ffmpeg/avutil.h> |
19598 | 36 #include <ffmpeg/opt.h> |
17354 | 37 #else |
12164 | 38 #include "avformat.h" |
21995
f615c862f862
Remove ff_gcd prototype and include avutil.h instead where it is defined.
reimar
parents:
21966
diff
changeset
|
39 #include "avutil.h" |
12164 | 40 #include "avi.h" |
19598 | 41 #include "opt.h" |
17354 | 42 #endif |
21822
fc4ce8a91a2e
Include "internal" libavformat/riff.h also when dynamic libavformat is used
reimar
parents:
21779
diff
changeset
|
43 #include "riff.h" |
12164 | 44 |
45 #define PROBE_BUF_SIZE 2048 | |
46 | |
18775 | 47 extern char *audio_lang; |
19598 | 48 static unsigned int opt_probesize = 0; |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
49 static char *opt_format; |
19598 | 50 |
51 m_option_t lavfdopts_conf[] = { | |
52 {"probesize", &(opt_probesize), CONF_TYPE_INT, CONF_RANGE, 32, INT_MAX, NULL}, | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
53 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, |
19598 | 54 {NULL, NULL, 0, 0, 0, 0, NULL} |
55 }; | |
56 | |
18775 | 57 |
12164 | 58 typedef struct lavf_priv_t{ |
59 AVInputFormat *avif; | |
60 AVFormatContext *avfc; | |
61 ByteIOContext pb; | |
62 int audio_streams; | |
63 int video_streams; | |
12168 | 64 int64_t last_pts; |
18762 | 65 int astreams[MAX_A_STREAMS]; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
66 int vstreams[MAX_V_STREAMS]; |
12164 | 67 }lavf_priv_t; |
68 | |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
69 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); |
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
70 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); |
12164 | 71 |
21966
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
72 static const AVCodecTag mp_wav_tags[] = { |
20944
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
73 { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, |
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
74 { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, |
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
75 { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, |
22916 | 76 { CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')}, |
21779 | 77 { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)}, |
20944
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
78 { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, |
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
79 { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, |
21763
43c8f1aa82bb
add support for musepack native decoder from ffmpeg (require -demuxer lavf)
aurel
parents:
21568
diff
changeset
|
80 { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, |
20944
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
81 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, |
22058
b149aa896f8d
Support 16bit bigendian PCM audio from libavformat
reimar
parents:
21995
diff
changeset
|
82 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')}, |
20944
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
83 { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, |
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
84 { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')}, |
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
85 { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')}, |
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
86 { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')}, |
20910582789d
cosmetics: Restore alphabetical order, align both tables.
diego
parents:
20942
diff
changeset
|
87 { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')}, |
21362 | 88 { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')}, |
20990 | 89 { CODEC_ID_XAN_DPCM, MKTAG('A', 'x', 'a', 'n')}, |
20733
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
90 { 0, 0 }, |
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
91 }; |
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
92 |
21966
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
93 const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0}; |
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
94 |
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
95 static const AVCodecTag mp_bmp_tags[] = { |
22918 | 96 { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, |
20940 | 97 { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, |
22690 | 98 { CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')}, |
20963 | 99 { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, |
20980
70ca50bcc4a8
support for some more fringe formats, still buggy ..
diego
parents:
20963
diff
changeset
|
100 { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, |
70ca50bcc4a8
support for some more fringe formats, still buggy ..
diego
parents:
20963
diff
changeset
|
101 { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, |
20942
2093d87ed14b
support for RoQ video and audio through libavformat
diego
parents:
20941
diff
changeset
|
102 { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, |
22876 | 103 { CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')}, |
20933 | 104 { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')}, |
20935
4a8c67e44c7f
cosmetics: alphabetical order and prettyprinting for the CodecTag table
diego
parents:
20934
diff
changeset
|
105 { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')}, |
20980
70ca50bcc4a8
support for some more fringe formats, still buggy ..
diego
parents:
20963
diff
changeset
|
106 { CODEC_ID_WS_VQA, MKTAG('V', 'Q', 'A', 'V')}, |
20935
4a8c67e44c7f
cosmetics: alphabetical order and prettyprinting for the CodecTag table
diego
parents:
20934
diff
changeset
|
107 { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')}, |
20733
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
108 { 0, 0 }, |
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
109 }; |
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
110 |
21966
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
111 const struct AVCodecTag *mp_bmp_taglists[] = {codec_bmp_tags, mp_bmp_tags, 0}; |
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
112 |
12164 | 113 static int mp_open(URLContext *h, const char *filename, int flags){ |
114 return 0; | |
115 } | |
116 | |
117 static int mp_read(URLContext *h, unsigned char *buf, int size){ | |
118 stream_t *stream = (stream_t*)h->priv_data; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
119 int ret; |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
120 |
12164 | 121 if(stream_eof(stream)) //needed? |
122 return -1; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
123 ret=stream_read(stream, buf, size); |
12166 | 124 |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
125 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, h, buf, size, stream->eof); |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
126 return ret; |
12164 | 127 } |
128 | |
129 static int mp_write(URLContext *h, unsigned char *buf, int size){ | |
130 return -1; | |
131 } | |
132 | |
133 static offset_t mp_seek(URLContext *h, offset_t pos, int whence){ | |
134 stream_t *stream = (stream_t*)h->priv_data; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
135 |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
136 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", h, (int)pos, whence); |
12164 | 137 if(whence == SEEK_CUR) |
138 pos +=stream_tell(stream); | |
139 else if(whence == SEEK_END) | |
140 pos += stream->end_pos; | |
22440
ee6b8e74d727
when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents:
22266
diff
changeset
|
141 else if(whence == SEEK_SET) |
ee6b8e74d727
when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents:
22266
diff
changeset
|
142 pos += stream->start_pos; |
ee6b8e74d727
when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents:
22266
diff
changeset
|
143 else |
12164 | 144 return -1; |
145 | |
12167 | 146 if(pos<stream->end_pos && stream->eof) |
12166 | 147 stream_reset(stream); |
12164 | 148 if(stream_seek(stream, pos)==0) |
149 return -1; | |
12166 | 150 |
22440
ee6b8e74d727
when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents:
22266
diff
changeset
|
151 return pos - stream->start_pos; |
12164 | 152 } |
153 | |
154 static int mp_close(URLContext *h){ | |
155 return 0; | |
156 } | |
157 | |
158 static URLProtocol mp_protocol = { | |
159 "mp", | |
160 mp_open, | |
161 mp_read, | |
162 mp_write, | |
163 mp_seek, | |
164 mp_close, | |
165 }; | |
166 | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
167 static void list_formats(void) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
168 AVInputFormat *fmt; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
169 mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n"); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
170 for (fmt = first_iformat; fmt; fmt = fmt->next) |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
171 mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
172 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
173 |
16175 | 174 static int lavf_check_file(demuxer_t *demuxer){ |
12164 | 175 AVProbeData avpd; |
176 uint8_t buf[PROBE_BUF_SIZE]; | |
177 lavf_priv_t *priv; | |
178 | |
179 if(!demuxer->priv) | |
180 demuxer->priv=calloc(sizeof(lavf_priv_t),1); | |
181 priv= demuxer->priv; | |
182 | |
183 av_register_all(); | |
184 | |
15819 | 185 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) |
186 return 0; | |
12164 | 187 avpd.filename= demuxer->stream->url; |
188 avpd.buf= buf; | |
189 avpd.buf_size= PROBE_BUF_SIZE; | |
190 | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
191 if (opt_format) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
192 if (strcmp(opt_format, "help") == 0) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
193 list_formats(); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
194 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
195 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
196 priv->avif= av_find_input_format(opt_format); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
197 if (!priv->avif) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
198 mp_msg(MSGT_DEMUX,MSGL_FATAL,"Unknown lavf format %s\n", opt_format); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
199 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
200 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
201 mp_msg(MSGT_DEMUX,MSGL_INFO,"Forced lavf %s demuxer\n", priv->avif->long_name); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
202 return DEMUXER_TYPE_LAVF; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
203 } |
12164 | 204 priv->avif= av_probe_input_format(&avpd, 1); |
205 if(!priv->avif){ | |
206 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n"); | |
207 return 0; | |
208 }else | |
209 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name); | |
210 | |
16175 | 211 return DEMUXER_TYPE_LAVF; |
12164 | 212 } |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
213 |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
214 static const char *preferred_list[] = { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
215 "dxa", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
216 "wv", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
217 "nuv", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
218 "nut", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
219 "gxf", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
220 "mxf", |
22972
46593cc4aeba
Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents:
22971
diff
changeset
|
221 "flv", |
46593cc4aeba
Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents:
22971
diff
changeset
|
222 "swf", |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
223 NULL |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
224 }; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
225 |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
226 static int lavf_check_preferred_file(demuxer_t *demuxer){ |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
227 if (lavf_check_file(demuxer)) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
228 char **p = preferred_list; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
229 lavf_priv_t *priv = demuxer->priv; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
230 while (*p) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
231 if (strcmp(*p, priv->avif->name) == 0) |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
232 return DEMUXER_TYPE_LAVF_PREFERRED; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
233 p++; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
234 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
235 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
236 return 0; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
237 } |
12164 | 238 |
16175 | 239 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ |
12164 | 240 AVFormatContext *avfc; |
241 AVFormatParameters ap; | |
19598 | 242 AVOption *opt; |
12164 | 243 lavf_priv_t *priv= demuxer->priv; |
15011 | 244 int i,g; |
12164 | 245 char mp_filename[256]="mp:"; |
246 | |
247 memset(&ap, 0, sizeof(AVFormatParameters)); | |
248 | |
249 stream_seek(demuxer->stream, 0); | |
250 | |
251 register_protocol(&mp_protocol); | |
252 | |
19598 | 253 avfc = av_alloc_format_context(); |
21548 | 254 |
255 if (correct_pts) | |
256 avfc->flags |= AVFMT_FLAG_GENPTS; | |
21568 | 257 if (index_mode == 0) |
258 avfc->flags |= AVFMT_FLAG_IGNIDX; | |
21548 | 259 |
19598 | 260 ap.prealloced_context = 1; |
261 if(opt_probesize) { | |
262 double d = (double) opt_probesize; | |
263 opt = av_set_double(avfc, "probesize", opt_probesize); | |
264 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %.3f\r\n", d); | |
265 } | |
266 | |
12463 | 267 if(demuxer->stream->url) |
268 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3); | |
269 else | |
270 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3); | |
12164 | 271 |
272 url_fopen(&priv->pb, mp_filename, URL_RDONLY); | |
273 | |
274 ((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream; | |
275 | |
276 if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){ | |
277 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); | |
16175 | 278 return NULL; |
12164 | 279 } |
280 | |
281 priv->avfc= avfc; | |
282 | |
283 if(av_find_stream_info(avfc) < 0){ | |
284 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n"); | |
16175 | 285 return NULL; |
12164 | 286 } |
287 | |
12167 | 288 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title ); |
289 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author ); | |
290 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright); | |
291 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment ); | |
292 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album ); | |
293 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year ); | |
294 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track ); | |
295 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre ); | |
12164 | 296 |
297 for(i=0; i<avfc->nb_streams; i++){ | |
298 AVStream *st= avfc->streams[i]; | |
16000 | 299 AVCodecContext *codec= st->codec; |
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
19062
diff
changeset
|
300 |
12164 | 301 switch(codec->codec_type){ |
302 case CODEC_TYPE_AUDIO:{ | |
303 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); | |
18985 | 304 sh_audio_t* sh_audio; |
18762 | 305 if(priv->audio_streams >= MAX_A_STREAMS) |
306 break; | |
18985 | 307 sh_audio=new_sh_audio(demuxer, i); |
18762 | 308 if(!sh_audio) |
309 break; | |
310 priv->astreams[priv->audio_streams] = i; | |
12164 | 311 priv->audio_streams++; |
22990
a76748e71a18
Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
reimar
parents:
22972
diff
changeset
|
312 // mp4a tag is used for all mp4 files no matter what they actually contain |
a76748e71a18
Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
reimar
parents:
22972
diff
changeset
|
313 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a')) |
a76748e71a18
Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
reimar
parents:
22972
diff
changeset
|
314 codec->codec_tag= 0; |
12164 | 315 if(!codec->codec_tag) |
21966
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
316 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id); |
12164 | 317 wf->wFormatTag= codec->codec_tag; |
318 wf->nChannels= codec->channels; | |
319 wf->nSamplesPerSec= codec->sample_rate; | |
320 wf->nAvgBytesPerSec= codec->bit_rate/8; | |
22266 | 321 wf->nBlockAlign= codec->block_align ? codec->block_align : 1; |
12164 | 322 wf->wBitsPerSample= codec->bits_per_sample; |
323 wf->cbSize= codec->extradata_size; | |
324 if(codec->extradata_size){ | |
325 memcpy( | |
326 wf + 1, | |
327 codec->extradata, | |
328 codec->extradata_size); | |
329 } | |
330 sh_audio->wf= wf; | |
15011 | 331 sh_audio->audio.dwSampleSize= codec->block_align; |
332 if(codec->frame_size && codec->sample_rate){ | |
333 sh_audio->audio.dwScale=codec->frame_size; | |
334 sh_audio->audio.dwRate= codec->sample_rate; | |
335 }else{ | |
336 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8; | |
337 sh_audio->audio.dwRate = codec->bit_rate; | |
338 } | |
339 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate); | |
340 sh_audio->audio.dwScale /= g; | |
341 sh_audio->audio.dwRate /= g; | |
342 // printf("sca:%d rat:%d fs:%d sr:%d ba:%d\n", sh_audio->audio.dwScale, sh_audio->audio.dwRate, codec->frame_size, codec->sample_rate, codec->block_align); | |
12164 | 343 sh_audio->ds= demuxer->audio; |
344 sh_audio->format= codec->codec_tag; | |
345 sh_audio->channels= codec->channels; | |
346 sh_audio->samplerate= codec->sample_rate; | |
15007 | 347 sh_audio->i_bps= codec->bit_rate/8; |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
348 switch (codec->codec_id) { |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
349 case CODEC_ID_PCM_S8: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
350 case CODEC_ID_PCM_U8: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
351 sh_audio->samplesize = 1; |
16135 | 352 break; |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
353 case CODEC_ID_PCM_S16LE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
354 case CODEC_ID_PCM_S16BE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
355 case CODEC_ID_PCM_U16LE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
356 case CODEC_ID_PCM_U16BE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
357 sh_audio->samplesize = 2; |
16135 | 358 break; |
359 case CODEC_ID_PCM_ALAW: | |
360 sh_audio->format = 0x6; | |
361 break; | |
362 case CODEC_ID_PCM_MULAW: | |
363 sh_audio->format = 0x7; | |
364 break; | |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
365 } |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
366 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V); |
18775 | 367 if((audio_lang && st->language[0] && !strncmp(audio_lang, st->language, 3)) |
368 || (demuxer->audio->id == i || demuxer->audio->id == -1) | |
369 ) { | |
370 demuxer->audio->id = i; | |
371 demuxer->audio->sh= demuxer->a_streams[i]; | |
372 } | |
373 else | |
15004 | 374 st->discard= AVDISCARD_ALL; |
12164 | 375 break;} |
376 case CODEC_TYPE_VIDEO:{ | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
377 sh_video_t* sh_video; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
378 BITMAPINFOHEADER *bih; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
379 if(priv->video_streams >= MAX_V_STREAMS) |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
380 break; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
381 sh_video=new_sh_video(demuxer, i); |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
382 if(!sh_video) break; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
383 priv->vstreams[priv->video_streams] = i; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
384 priv->video_streams++; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
385 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); |
12164 | 386 |
387 if(!codec->codec_tag) | |
21966
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
388 codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id); |
12164 | 389 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size; |
390 bih->biWidth= codec->width; | |
391 bih->biHeight= codec->height; | |
392 bih->biBitCount= codec->bits_per_sample; | |
393 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8; | |
394 bih->biCompression= codec->codec_tag; | |
395 sh_video->bih= bih; | |
396 sh_video->disp_w= codec->width; | |
397 sh_video->disp_h= codec->height; | |
16718
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
398 if (st->time_base.den) { /* if container has time_base, use that */ |
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
399 sh_video->video.dwRate= st->time_base.den; |
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
400 sh_video->video.dwScale= st->time_base.num; |
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
401 } else { |
15308 | 402 sh_video->video.dwRate= codec->time_base.den; |
403 sh_video->video.dwScale= codec->time_base.num; | |
16718
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
404 } |
17556 | 405 sh_video->fps=av_q2d(st->r_frame_rate); |
406 sh_video->frametime=1/av_q2d(st->r_frame_rate); | |
12164 | 407 sh_video->format = bih->biCompression; |
12167 | 408 sh_video->aspect= codec->width * codec->sample_aspect_ratio.num |
409 / (float)(codec->height * codec->sample_aspect_ratio.den); | |
15007 | 410 sh_video->i_bps= codec->bit_rate/8; |
12167 | 411 mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n", |
412 codec->width, codec->sample_aspect_ratio.num, | |
413 codec->height, codec->sample_aspect_ratio.den); | |
414 | |
12164 | 415 sh_video->ds= demuxer->video; |
416 if(codec->extradata_size) | |
417 memcpy(sh_video->bih + 1, codec->extradata, codec->extradata_size); | |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
418 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih, MSGL_V); |
12164 | 419 /* short biPlanes; |
420 int biXPelsPerMeter; | |
421 int biYPelsPerMeter; | |
422 int biClrUsed; | |
423 int biClrImportant;*/ | |
15004 | 424 if(demuxer->video->id != i && demuxer->video->id != -1) |
425 st->discard= AVDISCARD_ALL; | |
426 else{ | |
427 demuxer->video->id = i; | |
428 demuxer->video->sh= demuxer->v_streams[i]; | |
429 } | |
12164 | 430 break;} |
15004 | 431 default: |
432 st->discard= AVDISCARD_ALL; | |
12164 | 433 } |
434 } | |
435 | |
436 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: %d audio and %d video streams found\n",priv->audio_streams,priv->video_streams); | |
13749 | 437 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD); |
12164 | 438 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound |
439 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio; | |
440 if(!priv->video_streams){ | |
441 if(!priv->audio_streams){ | |
442 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n"); | |
16175 | 443 return NULL; |
12164 | 444 } |
445 demuxer->video->id=-2; // audio-only | |
446 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video; | |
447 | |
16175 | 448 return demuxer; |
12164 | 449 } |
450 | |
16175 | 451 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ |
12164 | 452 lavf_priv_t *priv= demux->priv; |
453 AVPacket pkt; | |
454 demux_packet_t *dp; | |
455 demux_stream_t *ds; | |
456 int id; | |
457 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n"); | |
458 | |
459 demux->filepos=stream_tell(demux->stream); | |
460 | |
461 if(av_read_frame(priv->avfc, &pkt) < 0) | |
462 return 0; | |
463 | |
464 id= pkt.stream_index; | |
465 | |
466 if(id==demux->audio->id){ | |
467 // audio | |
468 ds=demux->audio; | |
469 if(!ds->sh){ | |
470 ds->sh=demux->a_streams[id]; | |
471 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id); | |
472 } | |
473 } else if(id==demux->video->id){ | |
474 // video | |
475 ds=demux->video; | |
476 if(!ds->sh){ | |
477 ds->sh=demux->v_streams[id]; | |
478 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id); | |
479 } | |
14611 | 480 } else { |
481 av_free_packet(&pkt); | |
482 return 1; | |
483 } | |
12164 | 484 |
485 if(0/*pkt.destruct == av_destruct_packet*/){ | |
486 //ok kids, dont try this at home :) | |
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18985
diff
changeset
|
487 dp=malloc(sizeof(demux_packet_t)); |
12164 | 488 dp->len=pkt.size; |
489 dp->next=NULL; | |
490 dp->refcount=1; | |
491 dp->master=NULL; | |
492 dp->buffer=pkt.data; | |
493 pkt.destruct= NULL; | |
494 }else{ | |
495 dp=new_demux_packet(pkt.size); | |
496 memcpy(dp->buffer, pkt.data, pkt.size); | |
497 av_free_packet(&pkt); | |
498 } | |
499 | |
13747 | 500 if(pkt.pts != AV_NOPTS_VALUE){ |
15308 | 501 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); |
502 priv->last_pts= dp->pts * AV_TIME_BASE; | |
13747 | 503 } |
12164 | 504 dp->pos=demux->filepos; |
505 dp->flags= !!(pkt.flags&PKT_FLAG_KEY); | |
506 // append packet to DS stream: | |
507 ds_add_packet(ds,dp); | |
508 return 1; | |
509 } | |
510 | |
17636 | 511 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){ |
12168 | 512 lavf_priv_t *priv = demuxer->priv; |
20070 | 513 int avsflags = 0; |
17636 | 514 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_seek_lavf(%p, %f, %f, %d)\n", demuxer, rel_seek_secs, audio_delay, flags); |
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
19062
diff
changeset
|
515 |
20070 | 516 if (flags & 1) // absolute seek |
517 priv->last_pts = priv->avfc->start_time; | |
518 if (flags & 2) { // percent seek | |
519 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) | |
520 return; | |
521 priv->last_pts += rel_seek_secs * priv->avfc->duration; | |
522 } else { | |
523 priv->last_pts += rel_seek_secs * AV_TIME_BASE; | |
524 if (rel_seek_secs < 0) avsflags = AVSEEK_FLAG_BACKWARD; | |
525 } | |
526 av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags); | |
12164 | 527 } |
528 | |
16175 | 529 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg) |
12164 | 530 { |
531 lavf_priv_t *priv = demuxer->priv; | |
532 | |
533 switch (cmd) { | |
12168 | 534 case DEMUXER_CTRL_GET_TIME_LENGTH: |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
535 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 536 return DEMUXER_CTRL_DONTKNOW; |
537 | |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16175
diff
changeset
|
538 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE; |
12164 | 539 return DEMUXER_CTRL_OK; |
540 | |
541 case DEMUXER_CTRL_GET_PERCENT_POS: | |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
542 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 543 return DEMUXER_CTRL_DONTKNOW; |
544 | |
19160
ccb42ce33c23
Take start time into consideration when calculation percentage position
reimar
parents:
19073
diff
changeset
|
545 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration); |
12168 | 546 return DEMUXER_CTRL_OK; |
18762 | 547 case DEMUXER_CTRL_SWITCH_AUDIO: |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
548 case DEMUXER_CTRL_SWITCH_VIDEO: |
18762 | 549 { |
550 int id = *((int*)arg); | |
551 int newid = -2; | |
552 int i, curridx = -2; | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
553 int nstreams, *pstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
554 demux_stream_t *ds; |
18762 | 555 |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
556 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO) |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
557 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
558 ds = demuxer->video; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
559 nstreams = priv->video_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
560 pstreams = priv->vstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
561 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
562 else |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
563 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
564 ds = demuxer->audio; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
565 nstreams = priv->audio_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
566 pstreams = priv->astreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
567 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
568 if(ds->id == -2) |
18762 | 569 return DEMUXER_CTRL_NOTIMPL; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
570 for(i = 0; i < nstreams; i++) |
18762 | 571 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
572 if(pstreams[i] == ds->id) //current stream id |
18762 | 573 { |
574 curridx = i; | |
575 break; | |
576 } | |
577 } | |
578 | |
579 if(id < 0) | |
580 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
581 i = (curridx + 1) % nstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
582 newid = pstreams[i]; |
18762 | 583 } |
584 else | |
585 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
586 for(i = 0; i < nstreams; i++) |
18762 | 587 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
588 if(pstreams[i] == id) |
18762 | 589 { |
590 newid = id; | |
591 break; | |
592 } | |
593 } | |
594 } | |
595 if(newid == -2 || i == curridx) | |
596 return DEMUXER_CTRL_NOTIMPL; | |
597 else | |
598 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
599 ds_free_packs(ds); |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
600 priv->avfc->streams[ds->id]->discard = AVDISCARD_ALL; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
601 *((int*)arg) = ds->id = newid; |
18762 | 602 priv->avfc->streams[newid]->discard = AVDISCARD_NONE; |
603 return DEMUXER_CTRL_OK; | |
604 } | |
605 } | |
12164 | 606 default: |
607 return DEMUXER_CTRL_NOTIMPL; | |
608 } | |
609 } | |
610 | |
16175 | 611 static void demux_close_lavf(demuxer_t *demuxer) |
12164 | 612 { |
613 lavf_priv_t* priv = demuxer->priv; | |
614 if (priv){ | |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
615 if(priv->avfc) |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
616 { |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
617 av_close_input_file(priv->avfc); priv->avfc= NULL; |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
618 } |
12164 | 619 free(priv); demuxer->priv= NULL; |
620 } | |
621 } | |
622 | |
16175 | 623 |
624 demuxer_desc_t demuxer_desc_lavf = { | |
625 "libavformat demuxer", | |
626 "lavf", | |
627 "libavformat", | |
628 "Michael Niedermayer", | |
629 "supports many formats, requires libavformat", | |
630 DEMUXER_TYPE_LAVF, | |
631 0, // Check after other demuxer | |
632 lavf_check_file, | |
633 demux_lavf_fill_buffer, | |
634 demux_open_lavf, | |
635 demux_close_lavf, | |
636 demux_seek_lavf, | |
637 demux_lavf_control | |
638 }; | |
639 | |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
640 demuxer_desc_t demuxer_desc_lavf_preferred = { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
641 "libavformat preferred demuxer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
642 "lavfpref", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
643 "libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
644 "Michael Niedermayer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
645 "supports many formats, requires libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
646 DEMUXER_TYPE_LAVF_PREFERRED, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
647 0, // Check after other demuxer |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
648 lavf_check_preferred_file, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
649 demux_lavf_fill_buffer, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
650 demux_open_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
651 demux_close_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
652 demux_seek_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
653 demux_lavf_control |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
654 }; |