Mercurial > mplayer.hg
annotate libmpdemux/demux_lavf.c @ 26696:53b6cf6b971d
AVOption support for lavf demuxing
author | michael |
---|---|
date | Sat, 10 May 2008 19:29:38 +0000 |
parents | 38b8096cae32 |
children | 0c1db5fd3f79 |
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" |
26696 | 27 #include "av_opts.h" |
12164 | 28 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22440
diff
changeset
|
29 #include "stream/stream.h" |
12164 | 30 #include "demuxer.h" |
31 #include "stheader.h" | |
19598 | 32 #include "m_option.h" |
23758 | 33 #include "libvo/sub.h" |
12164 | 34 |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
35 #include "libavformat/avformat.h" |
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
36 #include "libavutil/avutil.h" |
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
37 #include "libavformat/avi.h" |
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
38 #include "libavcodec/opt.h" |
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
39 #include "libavformat/riff.h" |
12164 | 40 |
26328
11aac031b4b7
Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents:
26294
diff
changeset
|
41 #include "mp_taglists.h" |
11aac031b4b7
Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents:
26294
diff
changeset
|
42 |
12164 | 43 #define PROBE_BUF_SIZE 2048 |
44 | |
18775 | 45 extern char *audio_lang; |
26000 | 46 extern char *dvdsub_lang; |
47 extern int dvdsub_id; | |
19598 | 48 static unsigned int opt_probesize = 0; |
24635 | 49 static unsigned int opt_analyzeduration = 0; |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
50 static char *opt_format; |
24757 | 51 static char *opt_cryptokey; |
24844 | 52 extern int ts_prog; |
26696 | 53 static char *opt_avopt = NULL; |
19598 | 54 |
25241
bb7c65f2a289
Make m_option_t arrays referenced by cfg-common.h const
reimar
parents:
25117
diff
changeset
|
55 const m_option_t lavfdopts_conf[] = { |
19598 | 56 {"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
|
57 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, |
24635 | 58 {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, |
24757 | 59 {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL}, |
26696 | 60 {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
19598 | 61 {NULL, NULL, 0, 0, 0, 0, NULL} |
62 }; | |
63 | |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
64 #define BIO_BUFFER_SIZE 32768 |
18775 | 65 |
12164 | 66 typedef struct lavf_priv_t{ |
67 AVInputFormat *avif; | |
68 AVFormatContext *avfc; | |
25117
c6702b710b2c
Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
iive
parents:
25092
diff
changeset
|
69 ByteIOContext *pb; |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
70 uint8_t buffer[BIO_BUFFER_SIZE]; |
12164 | 71 int audio_streams; |
72 int video_streams; | |
23758 | 73 int sub_streams; |
12168 | 74 int64_t last_pts; |
18762 | 75 int astreams[MAX_A_STREAMS]; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
76 int vstreams[MAX_V_STREAMS]; |
23758 | 77 int sstreams[MAX_S_STREAMS]; |
24844 | 78 int cur_program; |
12164 | 79 }lavf_priv_t; |
80 | |
17977
f70772d02eaa
Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents:
17932
diff
changeset
|
81 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
|
82 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); |
12164 | 83 |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
84 static int mp_read(void *opaque, uint8_t *buf, int size) { |
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
85 stream_t *stream = opaque; |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
86 int ret; |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
87 |
12164 | 88 if(stream_eof(stream)) //needed? |
89 return -1; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
90 ret=stream_read(stream, buf, size); |
12166 | 91 |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
92 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, stream, buf, size, stream->eof); |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
93 return ret; |
12164 | 94 } |
95 | |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
96 static offset_t mp_seek(void *opaque, offset_t pos, int whence) { |
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
97 stream_t *stream = opaque; |
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
98 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", stream, (int)pos, whence); |
12164 | 99 if(whence == SEEK_CUR) |
100 pos +=stream_tell(stream); | |
24085
71d17c28f545
We can support SEEK_END seeks only when stream->end_pos is known
reimar
parents:
24084
diff
changeset
|
101 else if(whence == SEEK_END && stream->end_pos > 0) |
12164 | 102 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
|
103 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
|
104 pos += stream->start_pos; |
24084 | 105 else if(whence == AVSEEK_SIZE && stream->end_pos > 0) |
106 return stream->end_pos - stream->start_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
|
107 else |
12164 | 108 return -1; |
109 | |
24082 | 110 if(pos<0) |
111 return -1; | |
12167 | 112 if(pos<stream->end_pos && stream->eof) |
12166 | 113 stream_reset(stream); |
12164 | 114 if(stream_seek(stream, pos)==0) |
115 return -1; | |
12166 | 116 |
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
|
117 return pos - stream->start_pos; |
12164 | 118 } |
119 | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
120 static void list_formats(void) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
121 AVInputFormat *fmt; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
122 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
|
123 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
|
124 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
|
125 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
126 |
16175 | 127 static int lavf_check_file(demuxer_t *demuxer){ |
12164 | 128 AVProbeData avpd; |
129 uint8_t buf[PROBE_BUF_SIZE]; | |
130 lavf_priv_t *priv; | |
25841 | 131 |
132 if(!demuxer->priv) | |
12164 | 133 demuxer->priv=calloc(sizeof(lavf_priv_t),1); |
134 priv= demuxer->priv; | |
135 | |
136 av_register_all(); | |
137 | |
15819 | 138 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) |
139 return 0; | |
12164 | 140 avpd.filename= demuxer->stream->url; |
141 avpd.buf= buf; | |
142 avpd.buf_size= PROBE_BUF_SIZE; | |
143 | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
144 if (opt_format) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
145 if (strcmp(opt_format, "help") == 0) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
146 list_formats(); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
147 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
148 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
149 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
|
150 if (!priv->avif) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
151 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
|
152 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
153 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
154 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
|
155 return DEMUXER_TYPE_LAVF; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
156 } |
12164 | 157 priv->avif= av_probe_input_format(&avpd, 1); |
158 if(!priv->avif){ | |
159 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n"); | |
160 return 0; | |
161 }else | |
162 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name); | |
163 | |
16175 | 164 return DEMUXER_TYPE_LAVF; |
12164 | 165 } |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
166 |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
167 static const char *preferred_list[] = { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
168 "dxa", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
169 "wv", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
170 "nuv", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
171 "nut", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
172 "gxf", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
173 "mxf", |
22972
46593cc4aeba
Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents:
22971
diff
changeset
|
174 "flv", |
46593cc4aeba
Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents:
22971
diff
changeset
|
175 "swf", |
25846
f3ae700cc317
Prefer lavf mov demuxer over our own, it should work better most of the time now.
reimar
parents:
25843
diff
changeset
|
176 "mov,mp4,m4a,3gp,3g2,mj2", |
26423
38b8096cae32
Prefer libavformat musepack demuxer over internal one (which does not even support v8).
reimar
parents:
26328
diff
changeset
|
177 "mpc", |
38b8096cae32
Prefer libavformat musepack demuxer over internal one (which does not even support v8).
reimar
parents:
26328
diff
changeset
|
178 "mpc8", |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
179 NULL |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
180 }; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
181 |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
182 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
|
183 if (lavf_check_file(demuxer)) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
184 char **p = preferred_list; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
185 lavf_priv_t *priv = demuxer->priv; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
186 while (*p) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
187 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
|
188 return DEMUXER_TYPE_LAVF_PREFERRED; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
189 p++; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
190 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
191 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
192 return 0; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
193 } |
25841 | 194 |
24757 | 195 static uint8_t char2int(char c) { |
196 if (c >= '0' && c <= '9') return c - '0'; | |
197 if (c >= 'a' && c <= 'f') return c - 'a' + 10; | |
198 if (c >= 'A' && c <= 'F') return c - 'A' + 10; | |
199 return 0; | |
200 } | |
201 | |
202 static void parse_cryptokey(AVFormatContext *avfc, const char *str) { | |
203 int len = strlen(str) / 2; | |
204 uint8_t *key = av_mallocz(len); | |
205 int i; | |
206 avfc->keylen = len; | |
207 avfc->key = key; | |
208 for (i = 0; i < len; i++, str += 2) | |
209 *key++ = (char2int(str[0]) << 4) | char2int(str[1]); | |
210 } | |
211 | |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
212 static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
213 lavf_priv_t *priv= demuxer->priv; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
214 AVStream *st= avfc->streams[i]; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
215 AVCodecContext *codec= st->codec; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
216 int g; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
217 |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
218 switch(codec->codec_type){ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
219 case CODEC_TYPE_AUDIO:{ |
25886
feb0f4e3c81f
Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents:
25883
diff
changeset
|
220 int override_tag; |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
221 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
222 sh_audio_t* sh_audio; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
223 if(priv->audio_streams >= MAX_A_STREAMS) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
224 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
225 sh_audio=new_sh_audio(demuxer, i); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
226 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
227 if(!sh_audio) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
228 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
229 priv->astreams[priv->audio_streams] = i; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
230 priv->audio_streams++; |
25789
5cdba0d1c4cf
Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents:
25707
diff
changeset
|
231 // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag |
25886
feb0f4e3c81f
Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents:
25883
diff
changeset
|
232 override_tag= av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); |
feb0f4e3c81f
Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents:
25883
diff
changeset
|
233 if (override_tag) |
feb0f4e3c81f
Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents:
25883
diff
changeset
|
234 codec->codec_tag= override_tag; |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
235 // mp4a tag is used for all mp4 files no matter what they actually contain |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
236 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a')) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
237 codec->codec_tag= 0; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
238 if(codec->codec_id == CODEC_ID_ADPCM_IMA_AMV) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
239 codec->codec_tag= MKTAG('A','M','V','A'); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
240 if(!codec->codec_tag) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
241 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
242 wf->wFormatTag= codec->codec_tag; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
243 wf->nChannels= codec->channels; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
244 wf->nSamplesPerSec= codec->sample_rate; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
245 wf->nAvgBytesPerSec= codec->bit_rate/8; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
246 wf->nBlockAlign= codec->block_align ? codec->block_align : 1; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
247 wf->wBitsPerSample= codec->bits_per_sample; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
248 wf->cbSize= codec->extradata_size; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
249 if(codec->extradata_size) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
250 memcpy(wf + 1, codec->extradata, codec->extradata_size); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
251 sh_audio->wf= wf; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
252 sh_audio->audio.dwSampleSize= codec->block_align; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
253 if(codec->frame_size && codec->sample_rate){ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
254 sh_audio->audio.dwScale=codec->frame_size; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
255 sh_audio->audio.dwRate= codec->sample_rate; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
256 }else{ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
257 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
258 sh_audio->audio.dwRate = codec->bit_rate; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
259 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
260 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
261 sh_audio->audio.dwScale /= g; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
262 sh_audio->audio.dwRate /= g; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
263 // 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); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
264 sh_audio->ds= demuxer->audio; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
265 sh_audio->format= codec->codec_tag; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
266 sh_audio->channels= codec->channels; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
267 sh_audio->samplerate= codec->sample_rate; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
268 sh_audio->i_bps= codec->bit_rate/8; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
269 switch (codec->codec_id) { |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
270 case CODEC_ID_PCM_S8: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
271 case CODEC_ID_PCM_U8: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
272 sh_audio->samplesize = 1; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
273 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
274 case CODEC_ID_PCM_S16LE: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
275 case CODEC_ID_PCM_S16BE: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
276 case CODEC_ID_PCM_U16LE: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
277 case CODEC_ID_PCM_U16BE: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
278 sh_audio->samplesize = 2; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
279 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
280 case CODEC_ID_PCM_ALAW: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
281 sh_audio->format = 0x6; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
282 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
283 case CODEC_ID_PCM_MULAW: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
284 sh_audio->format = 0x7; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
285 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
286 } |
26083
19fa7a56ed04
Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
eugeni
parents:
26069
diff
changeset
|
287 if (st->language) |
19fa7a56ed04
Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
eugeni
parents:
26069
diff
changeset
|
288 sh_audio->lang = strdup(st->language); |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
289 if (st->disposition & AV_DISPOSITION_DEFAULT) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
290 sh_audio->default_track = 1; |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
291 if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V); |
26091
8732f2107b56
Don't select audio stream in lavf and mkv demuxers.
eugeni
parents:
26088
diff
changeset
|
292 // select the first audio stream |
8732f2107b56
Don't select audio stream in lavf and mkv demuxers.
eugeni
parents:
26088
diff
changeset
|
293 if (!demuxer->audio->sh) { |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
294 demuxer->audio->id = i; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
295 demuxer->audio->sh= demuxer->a_streams[i]; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
296 } else |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
297 st->discard= AVDISCARD_ALL; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
298 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
299 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
300 case CODEC_TYPE_VIDEO:{ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
301 sh_video_t* sh_video; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
302 BITMAPINFOHEADER *bih; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
303 if(priv->video_streams >= MAX_V_STREAMS) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
304 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
305 sh_video=new_sh_video(demuxer, i); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
306 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "lavf", i); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
307 if(!sh_video) break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
308 priv->vstreams[priv->video_streams] = i; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
309 priv->video_streams++; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
310 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
311 |
26294 | 312 if(codec->codec_id == CODEC_ID_RAWVIDEO) { |
313 switch (codec->pix_fmt) { | |
314 case PIX_FMT_RGB24: | |
315 codec->codec_tag= MKTAG(24, 'B', 'G', 'R'); | |
316 } | |
317 } | |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
318 if(!codec->codec_tag) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
319 codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
320 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
321 bih->biWidth= codec->width; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
322 bih->biHeight= codec->height; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
323 bih->biBitCount= codec->bits_per_sample; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
324 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
325 bih->biCompression= codec->codec_tag; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
326 sh_video->bih= bih; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
327 sh_video->disp_w= codec->width; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
328 sh_video->disp_h= codec->height; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
329 if (st->time_base.den) { /* if container has time_base, use that */ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
330 sh_video->video.dwRate= st->time_base.den; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
331 sh_video->video.dwScale= st->time_base.num; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
332 } else { |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
333 sh_video->video.dwRate= codec->time_base.den; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
334 sh_video->video.dwScale= codec->time_base.num; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
335 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
336 sh_video->fps=av_q2d(st->r_frame_rate); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
337 sh_video->frametime=1/av_q2d(st->r_frame_rate); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
338 sh_video->format=bih->biCompression; |
25841 | 339 sh_video->aspect=codec->width * codec->sample_aspect_ratio.num |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
340 / (float)(codec->height * codec->sample_aspect_ratio.den); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
341 sh_video->i_bps=codec->bit_rate/8; |
25841 | 342 mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n", |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
343 codec->width, codec->sample_aspect_ratio.num, |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
344 codec->height, codec->sample_aspect_ratio.den); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
345 |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
346 sh_video->ds= demuxer->video; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
347 if(codec->extradata_size) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
348 memcpy(sh_video->bih + 1, codec->extradata, codec->extradata_size); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
349 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih, MSGL_V); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
350 /* |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
351 short biPlanes; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
352 int biXPelsPerMeter; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
353 int biYPelsPerMeter; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
354 int biClrUsed; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
355 int biClrImportant; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
356 */ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
357 if(demuxer->video->id != i && demuxer->video->id != -1) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
358 st->discard= AVDISCARD_ALL; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
359 else{ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
360 demuxer->video->id = i; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
361 demuxer->video->sh= demuxer->v_streams[i]; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
362 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
363 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
364 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
365 case CODEC_TYPE_SUBTITLE:{ |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
366 sh_sub_t* sh_sub; |
25659 | 367 char type; |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
368 if(priv->sub_streams >= MAX_S_STREAMS) |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
369 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
370 /* only support text subtitles for now */ |
25659 | 371 if(codec->codec_id == CODEC_ID_TEXT) |
372 type = 't'; | |
25879 | 373 else if(codec->codec_id == CODEC_ID_MOV_TEXT) |
374 type = 'm'; | |
25659 | 375 else if(codec->codec_id == CODEC_ID_SSA) |
376 type = 'a'; | |
25839
327e98d7d2be
Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents:
25789
diff
changeset
|
377 else if(codec->codec_id == CODEC_ID_DVD_SUBTITLE) |
327e98d7d2be
Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents:
25789
diff
changeset
|
378 type = 'v'; |
25659 | 379 else |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
380 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
381 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
382 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_SubtitleID, "lavf", priv->sub_streams); |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
383 if(!sh_sub) break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
384 priv->sstreams[priv->sub_streams] = i; |
25659 | 385 sh_sub->type = type; |
386 if (codec->extradata_size) { | |
387 sh_sub->extradata = malloc(codec->extradata_size); | |
388 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); | |
389 sh_sub->extradata_len = codec->extradata_size; | |
390 } | |
26084
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
391 if (st->language) |
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
392 sh_sub->lang = strdup(st->language); |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
393 if (st->disposition & AV_DISPOSITION_DEFAULT) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
394 sh_sub->default_track = 1; |
26000 | 395 priv->sub_streams++; |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
396 break; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
397 } |
25900 | 398 case CODEC_TYPE_ATTACHMENT:{ |
399 if (st->codec->codec_id == CODEC_ID_TTF) | |
400 demuxer_add_attachment(demuxer, st->filename, | |
401 "application/x-truetype-font", | |
402 codec->extradata, codec->extradata_size); | |
403 break; | |
404 } | |
24842
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
405 default: |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
406 st->discard= AVDISCARD_ALL; |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
407 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
408 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
409 |
16175 | 410 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ |
12164 | 411 AVFormatContext *avfc; |
412 AVFormatParameters ap; | |
24633 | 413 const AVOption *opt; |
12164 | 414 lavf_priv_t *priv= demuxer->priv; |
24868 | 415 int i; |
12164 | 416 char mp_filename[256]="mp:"; |
417 | |
418 memset(&ap, 0, sizeof(AVFormatParameters)); | |
419 | |
420 stream_seek(demuxer->stream, 0); | |
421 | |
19598 | 422 avfc = av_alloc_format_context(); |
21548 | 423 |
24757 | 424 if (opt_cryptokey) |
425 parse_cryptokey(avfc, opt_cryptokey); | |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25900
diff
changeset
|
426 if (user_correct_pts != 0) |
21548 | 427 avfc->flags |= AVFMT_FLAG_GENPTS; |
21568 | 428 if (index_mode == 0) |
429 avfc->flags |= AVFMT_FLAG_IGNIDX; | |
21548 | 430 |
19598 | 431 ap.prealloced_context = 1; |
432 if(opt_probesize) { | |
24634 | 433 opt = av_set_int(avfc, "probesize", opt_probesize); |
434 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %u\n", opt_probesize); | |
19598 | 435 } |
24635 | 436 if(opt_analyzeduration) { |
437 opt = av_set_int(avfc, "analyzeduration", opt_analyzeduration * AV_TIME_BASE); | |
438 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option analyzeduration to %u\n", opt_analyzeduration); | |
439 } | |
19598 | 440 |
26696 | 441 if(opt_avopt){ |
442 if(parse_avopts(avfc, opt_avopt) < 0){ | |
443 mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", opt_avopt); | |
444 return NULL; | |
445 } | |
446 } | |
447 | |
12463 | 448 if(demuxer->stream->url) |
449 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3); | |
450 else | |
451 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3); | |
25841 | 452 |
25478 | 453 priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0, |
454 demuxer->stream, mp_read, NULL, mp_seek); | |
25472
ace1b77375bd
Set is_streamed correctly, should make network playback work more reliably.
reimar
parents:
25471
diff
changeset
|
455 priv->pb->is_streamed = !demuxer->stream->end_pos; |
25841 | 456 |
25117
c6702b710b2c
Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
iive
parents:
25092
diff
changeset
|
457 if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){ |
12164 | 458 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); |
16175 | 459 return NULL; |
12164 | 460 } |
461 | |
462 priv->avfc= avfc; | |
463 | |
464 if(av_find_stream_info(avfc) < 0){ | |
465 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n"); | |
16175 | 466 return NULL; |
12164 | 467 } |
468 | |
12167 | 469 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title ); |
470 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author ); | |
471 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright); | |
472 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment ); | |
473 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album ); | |
474 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year ); | |
475 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track ); | |
476 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre ); | |
12164 | 477 |
24844 | 478 if(avfc->nb_programs) { |
479 int p, start=0, found=0; | |
480 | |
481 if(ts_prog) { | |
482 for(p=0; p<avfc->nb_programs; p++) { | |
483 if(avfc->programs[p]->id == ts_prog) { | |
484 start = p; | |
485 found = 1; | |
486 break; | |
487 } | |
488 } | |
489 if(!found) { | |
490 mp_msg(MSGT_HEADER,MSGL_ERR,"DEMUX_LAVF: program %d doesn't seem to be present\n", ts_prog); | |
491 return NULL; | |
492 } | |
493 } | |
494 p = start; | |
495 do { | |
496 AVProgram *program = avfc->programs[p]; | |
497 mp_msg(MSGT_HEADER,MSGL_INFO,"LAVF: Program %d %s\n", program->id, (program->name ? program->name : "")); | |
498 for(i=0; i<program->nb_stream_indexes; i++) | |
499 handle_stream(demuxer, avfc, program->stream_index[i]); | |
500 if(!priv->cur_program && (demuxer->video->sh || demuxer->audio->sh)) | |
501 priv->cur_program = program->id; | |
502 p = (p + 1) % avfc->nb_programs; | |
503 } while(p!=start); | |
504 } else | |
24848 | 505 for(i=0; i<avfc->nb_streams; i++) |
506 handle_stream(demuxer, avfc, i); | |
25841 | 507 |
12164 | 508 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: %d audio and %d video streams found\n",priv->audio_streams,priv->video_streams); |
13749 | 509 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD); |
12164 | 510 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound |
511 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio; | |
512 if(!priv->video_streams){ | |
513 if(!priv->audio_streams){ | |
514 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n"); | |
25841 | 515 return NULL; |
12164 | 516 } |
517 demuxer->video->id=-2; // audio-only | |
518 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video; | |
519 | |
16175 | 520 return demuxer; |
12164 | 521 } |
522 | |
16175 | 523 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ |
12164 | 524 lavf_priv_t *priv= demux->priv; |
525 AVPacket pkt; | |
526 demux_packet_t *dp; | |
527 demux_stream_t *ds; | |
528 int id; | |
529 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n"); | |
530 | |
531 demux->filepos=stream_tell(demux->stream); | |
532 | |
533 if(av_read_frame(priv->avfc, &pkt) < 0) | |
534 return 0; | |
25841 | 535 |
12164 | 536 id= pkt.stream_index; |
537 | |
538 if(id==demux->audio->id){ | |
539 // audio | |
540 ds=demux->audio; | |
541 if(!ds->sh){ | |
542 ds->sh=demux->a_streams[id]; | |
543 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id); | |
544 } | |
545 } else if(id==demux->video->id){ | |
546 // video | |
547 ds=demux->video; | |
548 if(!ds->sh){ | |
549 ds->sh=demux->v_streams[id]; | |
550 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id); | |
551 } | |
23758 | 552 } else if(id==demux->sub->id){ |
553 // subtitle | |
554 ds=demux->sub; | |
555 sub_utf8=1; | |
14611 | 556 } else { |
557 av_free_packet(&pkt); | |
558 return 1; | |
559 } | |
25841 | 560 |
12164 | 561 if(0/*pkt.destruct == av_destruct_packet*/){ |
562 //ok kids, dont try this at home :) | |
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18985
diff
changeset
|
563 dp=malloc(sizeof(demux_packet_t)); |
12164 | 564 dp->len=pkt.size; |
565 dp->next=NULL; | |
566 dp->refcount=1; | |
567 dp->master=NULL; | |
568 dp->buffer=pkt.data; | |
569 pkt.destruct= NULL; | |
570 }else{ | |
571 dp=new_demux_packet(pkt.size); | |
572 memcpy(dp->buffer, pkt.data, pkt.size); | |
573 av_free_packet(&pkt); | |
574 } | |
575 | |
13747 | 576 if(pkt.pts != AV_NOPTS_VALUE){ |
15308 | 577 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); |
578 priv->last_pts= dp->pts * AV_TIME_BASE; | |
23758 | 579 if(pkt.duration) |
580 dp->endpts = dp->pts + pkt.duration * av_q2d(priv->avfc->streams[id]->time_base); | |
13747 | 581 } |
12164 | 582 dp->pos=demux->filepos; |
583 dp->flags= !!(pkt.flags&PKT_FLAG_KEY); | |
584 // append packet to DS stream: | |
585 ds_add_packet(ds,dp); | |
586 return 1; | |
587 } | |
588 | |
17636 | 589 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){ |
12168 | 590 lavf_priv_t *priv = demuxer->priv; |
20070 | 591 int avsflags = 0; |
17636 | 592 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
|
593 |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25879
diff
changeset
|
594 if (flags & SEEK_ABSOLUTE) { |
20070 | 595 priv->last_pts = priv->avfc->start_time; |
25843 | 596 } else { |
25842
f8fe66772c3a
Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents:
25841
diff
changeset
|
597 if (rel_seek_secs < 0) avsflags = AVSEEK_FLAG_BACKWARD; |
f8fe66772c3a
Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents:
25841
diff
changeset
|
598 } |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25879
diff
changeset
|
599 if (flags & SEEK_FACTOR) { |
20070 | 600 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
601 return; | |
602 priv->last_pts += rel_seek_secs * priv->avfc->duration; | |
603 } else { | |
604 priv->last_pts += rel_seek_secs * AV_TIME_BASE; | |
605 } | |
606 av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags); | |
12164 | 607 } |
608 | |
16175 | 609 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg) |
12164 | 610 { |
611 lavf_priv_t *priv = demuxer->priv; | |
25841 | 612 |
12164 | 613 switch (cmd) { |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25900
diff
changeset
|
614 case DEMUXER_CTRL_CORRECT_PTS: |
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25900
diff
changeset
|
615 return DEMUXER_CTRL_OK; |
12168 | 616 case DEMUXER_CTRL_GET_TIME_LENGTH: |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
617 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 618 return DEMUXER_CTRL_DONTKNOW; |
25841 | 619 |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16175
diff
changeset
|
620 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE; |
12164 | 621 return DEMUXER_CTRL_OK; |
622 | |
623 case DEMUXER_CTRL_GET_PERCENT_POS: | |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
624 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 625 return DEMUXER_CTRL_DONTKNOW; |
25841 | 626 |
19160
ccb42ce33c23
Take start time into consideration when calculation percentage position
reimar
parents:
19073
diff
changeset
|
627 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration); |
12168 | 628 return DEMUXER_CTRL_OK; |
18762 | 629 case DEMUXER_CTRL_SWITCH_AUDIO: |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
630 case DEMUXER_CTRL_SWITCH_VIDEO: |
18762 | 631 { |
632 int id = *((int*)arg); | |
633 int newid = -2; | |
26094 | 634 int i, curridx = -1; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
635 int nstreams, *pstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
636 demux_stream_t *ds; |
18762 | 637 |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
638 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO) |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
639 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
640 ds = demuxer->video; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
641 nstreams = priv->video_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
642 pstreams = priv->vstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
643 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
644 else |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
645 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
646 ds = demuxer->audio; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
647 nstreams = priv->audio_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
648 pstreams = priv->astreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
649 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
650 for(i = 0; i < nstreams; i++) |
18762 | 651 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
652 if(pstreams[i] == ds->id) //current stream id |
18762 | 653 { |
654 curridx = i; | |
655 break; | |
656 } | |
657 } | |
658 | |
26094 | 659 if(id == -2) { // no sound |
660 i = -1; | |
661 } else if(id == -1) { // next track | |
662 i = (curridx + 2) % (nstreams + 1) - 1; | |
663 if (i >= 0) | |
664 newid = pstreams[i]; | |
18762 | 665 } |
26094 | 666 else // select track by id |
18762 | 667 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
668 for(i = 0; i < nstreams; i++) |
18762 | 669 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
670 if(pstreams[i] == id) |
18762 | 671 { |
672 newid = id; | |
673 break; | |
674 } | |
675 } | |
676 } | |
24843
2bd6d730782f
permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents:
24842
diff
changeset
|
677 if(i == curridx) |
18762 | 678 return DEMUXER_CTRL_NOTIMPL; |
679 else | |
680 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
681 ds_free_packs(ds); |
24843
2bd6d730782f
permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents:
24842
diff
changeset
|
682 if(ds->id >= 0) |
24848 | 683 priv->avfc->streams[ds->id]->discard = AVDISCARD_ALL; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
684 *((int*)arg) = ds->id = newid; |
24843
2bd6d730782f
permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents:
24842
diff
changeset
|
685 if(newid >= 0) |
24848 | 686 priv->avfc->streams[newid]->discard = AVDISCARD_NONE; |
18762 | 687 return DEMUXER_CTRL_OK; |
688 } | |
689 } | |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
690 case DEMUXER_CTRL_IDENTIFY_PROGRAM: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
691 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
692 demux_program_t *prog = arg; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
693 AVProgram *program; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
694 int p, i; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
695 |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
696 if(priv->avfc->nb_programs < 2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
697 return DEMUXER_CTRL_NOTIMPL; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
698 |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
699 if(prog->progid == -1) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
700 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
701 p = 0; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
702 while(p<priv->avfc->nb_programs && priv->avfc->programs[p]->id != priv->cur_program) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
703 p++; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
704 p = (p + 1) % priv->avfc->nb_programs; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
705 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
706 else |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
707 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
708 for(i=0; i<priv->avfc->nb_programs; i++) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
709 if(priv->avfc->programs[i]->id == prog->progid) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
710 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
711 if(i==priv->avfc->nb_programs) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
712 return DEMUXER_CTRL_NOTIMPL; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
713 p = i; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
714 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
715 prog->vid = prog->aid = prog->sid = -2; //no audio and no video by default |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
716 redo: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
717 program = priv->avfc->programs[p]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
718 for(i=0; i<program->nb_stream_indexes; i++) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
719 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
720 switch(priv->avfc->streams[program->stream_index[i]]->codec->codec_type) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
721 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
722 case CODEC_TYPE_VIDEO: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
723 if(prog->vid == -2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
724 prog->vid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
725 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
726 case CODEC_TYPE_AUDIO: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
727 if(prog->aid == -2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
728 prog->aid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
729 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
730 case CODEC_TYPE_SUBTITLE: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
731 if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
732 prog->sid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
733 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
734 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
735 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
736 if(prog->progid == -1 && prog->vid == -2 && prog->aid == -2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
737 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
738 p = (p + 1) % priv->avfc->nb_programs; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
739 goto redo; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
740 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
741 priv->cur_program = prog->progid = program->id; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
742 return DEMUXER_CTRL_OK; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
743 } |
12164 | 744 default: |
745 return DEMUXER_CTRL_NOTIMPL; | |
746 } | |
747 } | |
748 | |
16175 | 749 static void demux_close_lavf(demuxer_t *demuxer) |
12164 | 750 { |
751 lavf_priv_t* priv = demuxer->priv; | |
752 if (priv){ | |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
753 if(priv->avfc) |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
754 { |
24757 | 755 av_freep(&priv->avfc->key); |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
756 av_close_input_stream(priv->avfc); |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
757 } |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
758 av_freep(&priv->pb); |
12164 | 759 free(priv); demuxer->priv= NULL; |
760 } | |
761 } | |
762 | |
16175 | 763 |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25659
diff
changeset
|
764 const demuxer_desc_t demuxer_desc_lavf = { |
16175 | 765 "libavformat demuxer", |
766 "lavf", | |
767 "libavformat", | |
768 "Michael Niedermayer", | |
769 "supports many formats, requires libavformat", | |
770 DEMUXER_TYPE_LAVF, | |
771 0, // Check after other demuxer | |
772 lavf_check_file, | |
773 demux_lavf_fill_buffer, | |
774 demux_open_lavf, | |
775 demux_close_lavf, | |
776 demux_seek_lavf, | |
777 demux_lavf_control | |
778 }; | |
779 | |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25659
diff
changeset
|
780 const demuxer_desc_t demuxer_desc_lavf_preferred = { |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
781 "libavformat preferred demuxer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
782 "lavfpref", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
783 "libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
784 "Michael Niedermayer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
785 "supports many formats, requires libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
786 DEMUXER_TYPE_LAVF_PREFERRED, |
24354
ae226b882283
Mark lavfpref demuxer as safe, so it that it is actually used for e.g.
reimar
parents:
24085
diff
changeset
|
787 1, |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
788 lavf_check_preferred_file, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
789 demux_lavf_fill_buffer, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
790 demux_open_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
791 demux_close_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
792 demux_seek_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
793 demux_lavf_control |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
794 }; |