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