Mercurial > mplayer.hg
annotate libmpdemux/demux_lavf.c @ 23490:72db608dc10a
Add -Wdeclaration-after-statement etc. only to gcc.
author | cehoyos |
---|---|
date | Fri, 08 Jun 2007 08:16:54 +0000 |
parents | f3e72ce8a9fd |
children | 795631068b92 |
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" | |
23010
74efb0fa8a0b
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents:
22990
diff
changeset
|
26 #include "help_mp.h" |
12164 | 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[] = { |
23088 | 96 { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, |
22918 | 97 { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, |
20940 | 98 { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, |
22690 | 99 { CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')}, |
20963 | 100 { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, |
20980
70ca50bcc4a8
support for some more fringe formats, still buggy ..
diego
parents:
20963
diff
changeset
|
101 { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, |
70ca50bcc4a8
support for some more fringe formats, still buggy ..
diego
parents:
20963
diff
changeset
|
102 { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, |
20942
2093d87ed14b
support for RoQ video and audio through libavformat
diego
parents:
20941
diff
changeset
|
103 { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, |
22876 | 104 { CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')}, |
20933 | 105 { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')}, |
23274
f3e72ce8a9fd
add txd codec, works with http://samples.mplayerhq.hu/game-formats/txd/fronten2.txd .
compn
parents:
23088
diff
changeset
|
106 { CODEC_ID_TXD, MKTAG('T', 'X', 'D', 'V')}, |
20935
4a8c67e44c7f
cosmetics: alphabetical order and prettyprinting for the CodecTag table
diego
parents:
20934
diff
changeset
|
107 { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')}, |
20980
70ca50bcc4a8
support for some more fringe formats, still buggy ..
diego
parents:
20963
diff
changeset
|
108 { 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
|
109 { 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
|
110 { 0, 0 }, |
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
111 }; |
404fb439acba
Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents:
20070
diff
changeset
|
112 |
21966
d9494ca70ca7
Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents:
21962
diff
changeset
|
113 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
|
114 |
12164 | 115 static int mp_open(URLContext *h, const char *filename, int flags){ |
116 return 0; | |
117 } | |
118 | |
119 static int mp_read(URLContext *h, unsigned char *buf, int size){ | |
120 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
|
121 int ret; |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
122 |
12164 | 123 if(stream_eof(stream)) //needed? |
124 return -1; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
125 ret=stream_read(stream, buf, size); |
12166 | 126 |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
127 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
|
128 return ret; |
12164 | 129 } |
130 | |
131 static int mp_write(URLContext *h, unsigned char *buf, int size){ | |
132 return -1; | |
133 } | |
134 | |
135 static offset_t mp_seek(URLContext *h, offset_t pos, int whence){ | |
136 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
|
137 |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
138 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", h, (int)pos, whence); |
12164 | 139 if(whence == SEEK_CUR) |
140 pos +=stream_tell(stream); | |
141 else if(whence == SEEK_END) | |
142 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
|
143 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
|
144 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
|
145 else |
12164 | 146 return -1; |
147 | |
12167 | 148 if(pos<stream->end_pos && stream->eof) |
12166 | 149 stream_reset(stream); |
12164 | 150 if(stream_seek(stream, pos)==0) |
151 return -1; | |
12166 | 152 |
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
|
153 return pos - stream->start_pos; |
12164 | 154 } |
155 | |
156 static int mp_close(URLContext *h){ | |
157 return 0; | |
158 } | |
159 | |
160 static URLProtocol mp_protocol = { | |
161 "mp", | |
162 mp_open, | |
163 mp_read, | |
164 mp_write, | |
165 mp_seek, | |
166 mp_close, | |
167 }; | |
168 | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
169 static void list_formats(void) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
170 AVInputFormat *fmt; |
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, "Available lavf input formats:\n"); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
172 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
|
173 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
|
174 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
175 |
16175 | 176 static int lavf_check_file(demuxer_t *demuxer){ |
12164 | 177 AVProbeData avpd; |
178 uint8_t buf[PROBE_BUF_SIZE]; | |
179 lavf_priv_t *priv; | |
180 | |
181 if(!demuxer->priv) | |
182 demuxer->priv=calloc(sizeof(lavf_priv_t),1); | |
183 priv= demuxer->priv; | |
184 | |
185 av_register_all(); | |
186 | |
15819 | 187 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) |
188 return 0; | |
12164 | 189 avpd.filename= demuxer->stream->url; |
190 avpd.buf= buf; | |
191 avpd.buf_size= PROBE_BUF_SIZE; | |
192 | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
193 if (opt_format) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
194 if (strcmp(opt_format, "help") == 0) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
195 list_formats(); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
196 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
197 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
198 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
|
199 if (!priv->avif) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
200 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
|
201 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
202 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
203 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
|
204 return DEMUXER_TYPE_LAVF; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
205 } |
12164 | 206 priv->avif= av_probe_input_format(&avpd, 1); |
207 if(!priv->avif){ | |
208 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n"); | |
209 return 0; | |
210 }else | |
211 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name); | |
212 | |
16175 | 213 return DEMUXER_TYPE_LAVF; |
12164 | 214 } |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
215 |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
216 static const char *preferred_list[] = { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
217 "dxa", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
218 "wv", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
219 "nuv", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
220 "nut", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
221 "gxf", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
222 "mxf", |
22972
46593cc4aeba
Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents:
22971
diff
changeset
|
223 "flv", |
46593cc4aeba
Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents:
22971
diff
changeset
|
224 "swf", |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
225 NULL |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
226 }; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
227 |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
228 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
|
229 if (lavf_check_file(demuxer)) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
230 char **p = preferred_list; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
231 lavf_priv_t *priv = demuxer->priv; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
232 while (*p) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
233 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
|
234 return DEMUXER_TYPE_LAVF_PREFERRED; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
235 p++; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
236 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
237 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
238 return 0; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
239 } |
12164 | 240 |
16175 | 241 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ |
12164 | 242 AVFormatContext *avfc; |
243 AVFormatParameters ap; | |
19598 | 244 AVOption *opt; |
12164 | 245 lavf_priv_t *priv= demuxer->priv; |
15011 | 246 int i,g; |
12164 | 247 char mp_filename[256]="mp:"; |
248 | |
249 memset(&ap, 0, sizeof(AVFormatParameters)); | |
250 | |
251 stream_seek(demuxer->stream, 0); | |
252 | |
253 register_protocol(&mp_protocol); | |
254 | |
19598 | 255 avfc = av_alloc_format_context(); |
21548 | 256 |
257 if (correct_pts) | |
258 avfc->flags |= AVFMT_FLAG_GENPTS; | |
21568 | 259 if (index_mode == 0) |
260 avfc->flags |= AVFMT_FLAG_IGNIDX; | |
21548 | 261 |
19598 | 262 ap.prealloced_context = 1; |
263 if(opt_probesize) { | |
264 double d = (double) opt_probesize; | |
265 opt = av_set_double(avfc, "probesize", opt_probesize); | |
266 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %.3f\r\n", d); | |
267 } | |
268 | |
12463 | 269 if(demuxer->stream->url) |
270 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3); | |
271 else | |
272 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3); | |
12164 | 273 |
274 url_fopen(&priv->pb, mp_filename, URL_RDONLY); | |
275 | |
276 ((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream; | |
277 | |
278 if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){ | |
279 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); | |
16175 | 280 return NULL; |
12164 | 281 } |
282 | |
283 priv->avfc= avfc; | |
284 | |
285 if(av_find_stream_info(avfc) < 0){ | |
286 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n"); | |
16175 | 287 return NULL; |
12164 | 288 } |
289 | |
12167 | 290 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title ); |
291 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author ); | |
292 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright); | |
293 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment ); | |
294 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album ); | |
295 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year ); | |
296 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track ); | |
297 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre ); | |
12164 | 298 |
299 for(i=0; i<avfc->nb_streams; i++){ | |
300 AVStream *st= avfc->streams[i]; | |
16000 | 301 AVCodecContext *codec= st->codec; |
19073
8b52dad54b1d
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents:
19062
diff
changeset
|
302 |
12164 | 303 switch(codec->codec_type){ |
304 case CODEC_TYPE_AUDIO:{ | |
305 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); | |
18985 | 306 sh_audio_t* sh_audio; |
18762 | 307 if(priv->audio_streams >= MAX_A_STREAMS) |
308 break; | |
18985 | 309 sh_audio=new_sh_audio(demuxer, i); |
23010
74efb0fa8a0b
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents:
22990
diff
changeset
|
310 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i); |
18762 | 311 if(!sh_audio) |
312 break; | |
313 priv->astreams[priv->audio_streams] = i; | |
12164 | 314 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
|
315 // 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
|
316 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
|
317 codec->codec_tag= 0; |
12164 | 318 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
|
319 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id); |
12164 | 320 wf->wFormatTag= codec->codec_tag; |
321 wf->nChannels= codec->channels; | |
322 wf->nSamplesPerSec= codec->sample_rate; | |
323 wf->nAvgBytesPerSec= codec->bit_rate/8; | |
22266 | 324 wf->nBlockAlign= codec->block_align ? codec->block_align : 1; |
12164 | 325 wf->wBitsPerSample= codec->bits_per_sample; |
326 wf->cbSize= codec->extradata_size; | |
327 if(codec->extradata_size){ | |
328 memcpy( | |
329 wf + 1, | |
330 codec->extradata, | |
331 codec->extradata_size); | |
332 } | |
333 sh_audio->wf= wf; | |
15011 | 334 sh_audio->audio.dwSampleSize= codec->block_align; |
335 if(codec->frame_size && codec->sample_rate){ | |
336 sh_audio->audio.dwScale=codec->frame_size; | |
337 sh_audio->audio.dwRate= codec->sample_rate; | |
338 }else{ | |
339 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8; | |
340 sh_audio->audio.dwRate = codec->bit_rate; | |
341 } | |
342 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate); | |
343 sh_audio->audio.dwScale /= g; | |
344 sh_audio->audio.dwRate /= g; | |
345 // 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 | 346 sh_audio->ds= demuxer->audio; |
347 sh_audio->format= codec->codec_tag; | |
348 sh_audio->channels= codec->channels; | |
349 sh_audio->samplerate= codec->sample_rate; | |
15007 | 350 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
|
351 switch (codec->codec_id) { |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
352 case CODEC_ID_PCM_S8: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
353 case CODEC_ID_PCM_U8: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
354 sh_audio->samplesize = 1; |
16135 | 355 break; |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
356 case CODEC_ID_PCM_S16LE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
357 case CODEC_ID_PCM_S16BE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
358 case CODEC_ID_PCM_U16LE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
359 case CODEC_ID_PCM_U16BE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
360 sh_audio->samplesize = 2; |
16135 | 361 break; |
362 case CODEC_ID_PCM_ALAW: | |
363 sh_audio->format = 0x6; | |
364 break; | |
365 case CODEC_ID_PCM_MULAW: | |
366 sh_audio->format = 0x7; | |
367 break; | |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
368 } |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
369 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V); |
18775 | 370 if((audio_lang && st->language[0] && !strncmp(audio_lang, st->language, 3)) |
371 || (demuxer->audio->id == i || demuxer->audio->id == -1) | |
372 ) { | |
373 demuxer->audio->id = i; | |
374 demuxer->audio->sh= demuxer->a_streams[i]; | |
375 } | |
376 else | |
15004 | 377 st->discard= AVDISCARD_ALL; |
12164 | 378 break;} |
379 case CODEC_TYPE_VIDEO:{ | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
380 sh_video_t* sh_video; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
381 BITMAPINFOHEADER *bih; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
382 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
|
383 break; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
384 sh_video=new_sh_video(demuxer, i); |
23010
74efb0fa8a0b
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents:
22990
diff
changeset
|
385 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "lavf", i); |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
386 if(!sh_video) break; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
387 priv->vstreams[priv->video_streams] = i; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
388 priv->video_streams++; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
389 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); |
12164 | 390 |
391 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
|
392 codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id); |
12164 | 393 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size; |
394 bih->biWidth= codec->width; | |
395 bih->biHeight= codec->height; | |
396 bih->biBitCount= codec->bits_per_sample; | |
397 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8; | |
398 bih->biCompression= codec->codec_tag; | |
399 sh_video->bih= bih; | |
400 sh_video->disp_w= codec->width; | |
401 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
|
402 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
|
403 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
|
404 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
|
405 } else { |
15308 | 406 sh_video->video.dwRate= codec->time_base.den; |
407 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
|
408 } |
17556 | 409 sh_video->fps=av_q2d(st->r_frame_rate); |
410 sh_video->frametime=1/av_q2d(st->r_frame_rate); | |
12164 | 411 sh_video->format = bih->biCompression; |
12167 | 412 sh_video->aspect= codec->width * codec->sample_aspect_ratio.num |
413 / (float)(codec->height * codec->sample_aspect_ratio.den); | |
15007 | 414 sh_video->i_bps= codec->bit_rate/8; |
12167 | 415 mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n", |
416 codec->width, codec->sample_aspect_ratio.num, | |
417 codec->height, codec->sample_aspect_ratio.den); | |
418 | |
12164 | 419 sh_video->ds= demuxer->video; |
420 if(codec->extradata_size) | |
421 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
|
422 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih, MSGL_V); |
12164 | 423 /* short biPlanes; |
424 int biXPelsPerMeter; | |
425 int biYPelsPerMeter; | |
426 int biClrUsed; | |
427 int biClrImportant;*/ | |
15004 | 428 if(demuxer->video->id != i && demuxer->video->id != -1) |
429 st->discard= AVDISCARD_ALL; | |
430 else{ | |
431 demuxer->video->id = i; | |
432 demuxer->video->sh= demuxer->v_streams[i]; | |
433 } | |
12164 | 434 break;} |
15004 | 435 default: |
436 st->discard= AVDISCARD_ALL; | |
12164 | 437 } |
438 } | |
439 | |
440 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: %d audio and %d video streams found\n",priv->audio_streams,priv->video_streams); | |
13749 | 441 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD); |
12164 | 442 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound |
443 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio; | |
444 if(!priv->video_streams){ | |
445 if(!priv->audio_streams){ | |
446 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n"); | |
16175 | 447 return NULL; |
12164 | 448 } |
449 demuxer->video->id=-2; // audio-only | |
450 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video; | |
451 | |
16175 | 452 return demuxer; |
12164 | 453 } |
454 | |
16175 | 455 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ |
12164 | 456 lavf_priv_t *priv= demux->priv; |
457 AVPacket pkt; | |
458 demux_packet_t *dp; | |
459 demux_stream_t *ds; | |
460 int id; | |
461 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n"); | |
462 | |
463 demux->filepos=stream_tell(demux->stream); | |
464 | |
465 if(av_read_frame(priv->avfc, &pkt) < 0) | |
466 return 0; | |
467 | |
468 id= pkt.stream_index; | |
469 | |
470 if(id==demux->audio->id){ | |
471 // audio | |
472 ds=demux->audio; | |
473 if(!ds->sh){ | |
474 ds->sh=demux->a_streams[id]; | |
475 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id); | |
476 } | |
477 } else if(id==demux->video->id){ | |
478 // video | |
479 ds=demux->video; | |
480 if(!ds->sh){ | |
481 ds->sh=demux->v_streams[id]; | |
482 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id); | |
483 } | |
14611 | 484 } else { |
485 av_free_packet(&pkt); | |
486 return 1; | |
487 } | |
12164 | 488 |
489 if(0/*pkt.destruct == av_destruct_packet*/){ | |
490 //ok kids, dont try this at home :) | |
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18985
diff
changeset
|
491 dp=malloc(sizeof(demux_packet_t)); |
12164 | 492 dp->len=pkt.size; |
493 dp->next=NULL; | |
494 dp->refcount=1; | |
495 dp->master=NULL; | |
496 dp->buffer=pkt.data; | |
497 pkt.destruct= NULL; | |
498 }else{ | |
499 dp=new_demux_packet(pkt.size); | |
500 memcpy(dp->buffer, pkt.data, pkt.size); | |
501 av_free_packet(&pkt); | |
502 } | |
503 | |
13747 | 504 if(pkt.pts != AV_NOPTS_VALUE){ |
15308 | 505 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); |
506 priv->last_pts= dp->pts * AV_TIME_BASE; | |
13747 | 507 } |
12164 | 508 dp->pos=demux->filepos; |
509 dp->flags= !!(pkt.flags&PKT_FLAG_KEY); | |
510 // append packet to DS stream: | |
511 ds_add_packet(ds,dp); | |
512 return 1; | |
513 } | |
514 | |
17636 | 515 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){ |
12168 | 516 lavf_priv_t *priv = demuxer->priv; |
20070 | 517 int avsflags = 0; |
17636 | 518 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
|
519 |
20070 | 520 if (flags & 1) // absolute seek |
521 priv->last_pts = priv->avfc->start_time; | |
522 if (flags & 2) { // percent seek | |
523 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) | |
524 return; | |
525 priv->last_pts += rel_seek_secs * priv->avfc->duration; | |
526 } else { | |
527 priv->last_pts += rel_seek_secs * AV_TIME_BASE; | |
528 if (rel_seek_secs < 0) avsflags = AVSEEK_FLAG_BACKWARD; | |
529 } | |
530 av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags); | |
12164 | 531 } |
532 | |
16175 | 533 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg) |
12164 | 534 { |
535 lavf_priv_t *priv = demuxer->priv; | |
536 | |
537 switch (cmd) { | |
12168 | 538 case DEMUXER_CTRL_GET_TIME_LENGTH: |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
539 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 540 return DEMUXER_CTRL_DONTKNOW; |
541 | |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16175
diff
changeset
|
542 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE; |
12164 | 543 return DEMUXER_CTRL_OK; |
544 | |
545 case DEMUXER_CTRL_GET_PERCENT_POS: | |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
546 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 547 return DEMUXER_CTRL_DONTKNOW; |
548 | |
19160
ccb42ce33c23
Take start time into consideration when calculation percentage position
reimar
parents:
19073
diff
changeset
|
549 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration); |
12168 | 550 return DEMUXER_CTRL_OK; |
18762 | 551 case DEMUXER_CTRL_SWITCH_AUDIO: |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
552 case DEMUXER_CTRL_SWITCH_VIDEO: |
18762 | 553 { |
554 int id = *((int*)arg); | |
555 int newid = -2; | |
556 int i, curridx = -2; | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
557 int nstreams, *pstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
558 demux_stream_t *ds; |
18762 | 559 |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
560 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO) |
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 ds = demuxer->video; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
563 nstreams = priv->video_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
564 pstreams = priv->vstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
565 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
566 else |
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 ds = demuxer->audio; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
569 nstreams = priv->audio_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
570 pstreams = priv->astreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
571 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
572 if(ds->id == -2) |
18762 | 573 return DEMUXER_CTRL_NOTIMPL; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
574 for(i = 0; i < nstreams; i++) |
18762 | 575 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
576 if(pstreams[i] == ds->id) //current stream id |
18762 | 577 { |
578 curridx = i; | |
579 break; | |
580 } | |
581 } | |
582 | |
583 if(id < 0) | |
584 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
585 i = (curridx + 1) % nstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
586 newid = pstreams[i]; |
18762 | 587 } |
588 else | |
589 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
590 for(i = 0; i < nstreams; i++) |
18762 | 591 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
592 if(pstreams[i] == id) |
18762 | 593 { |
594 newid = id; | |
595 break; | |
596 } | |
597 } | |
598 } | |
599 if(newid == -2 || i == curridx) | |
600 return DEMUXER_CTRL_NOTIMPL; | |
601 else | |
602 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
603 ds_free_packs(ds); |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
604 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
|
605 *((int*)arg) = ds->id = newid; |
18762 | 606 priv->avfc->streams[newid]->discard = AVDISCARD_NONE; |
607 return DEMUXER_CTRL_OK; | |
608 } | |
609 } | |
12164 | 610 default: |
611 return DEMUXER_CTRL_NOTIMPL; | |
612 } | |
613 } | |
614 | |
16175 | 615 static void demux_close_lavf(demuxer_t *demuxer) |
12164 | 616 { |
617 lavf_priv_t* priv = demuxer->priv; | |
618 if (priv){ | |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
619 if(priv->avfc) |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
620 { |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
621 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
|
622 } |
12164 | 623 free(priv); demuxer->priv= NULL; |
624 } | |
625 } | |
626 | |
16175 | 627 |
628 demuxer_desc_t demuxer_desc_lavf = { | |
629 "libavformat demuxer", | |
630 "lavf", | |
631 "libavformat", | |
632 "Michael Niedermayer", | |
633 "supports many formats, requires libavformat", | |
634 DEMUXER_TYPE_LAVF, | |
635 0, // Check after other demuxer | |
636 lavf_check_file, | |
637 demux_lavf_fill_buffer, | |
638 demux_open_lavf, | |
639 demux_close_lavf, | |
640 demux_seek_lavf, | |
641 demux_lavf_control | |
642 }; | |
643 | |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
644 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
|
645 "libavformat preferred demuxer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
646 "lavfpref", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
647 "libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
648 "Michael Niedermayer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
649 "supports many formats, requires libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
650 DEMUXER_TYPE_LAVF_PREFERRED, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
651 0, // Check after other demuxer |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
652 lavf_check_preferred_file, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
653 demux_lavf_fill_buffer, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
654 demux_open_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
655 demux_close_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
656 demux_seek_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
657 demux_lavf_control |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
658 }; |