Mercurial > mplayer.hg
annotate libmpdemux/demux_lavf.c @ 29699:3819fcdeaaf8
lavf: if seeking in the desired direction failed, also try in the opposite one,
otherwise we might end up at some random position (where lavf last ended
up while trying to build the index).
author | reimar |
---|---|
date | Wed, 30 Sep 2009 08:19:49 +0000 |
parents | 2a2bc7ee5b81 |
children | 3b42ce7b09cf |
rev | line source |
---|---|
12164 | 1 /* |
26742
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
2 * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at> |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
3 * |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
4 * This file is part of MPlayer. |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
5 * |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
6 * MPlayer is free software; you can redistribute it and/or modify |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
9 * (at your option) any later version. |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
10 * |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
11 * MPlayer is distributed in the hope that it will be useful, |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
14 * GNU General Public License for more details. |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
15 * |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
16 * You should have received a copy of the GNU General Public License along |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
17 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
0c1db5fd3f79
Use standard license headers with standard formatting.
diego
parents:
26696
diff
changeset
|
19 */ |
12164 | 20 |
21 // #include <stdio.h> | |
22 #include <stdlib.h> | |
23 // #include <unistd.h> | |
19611 | 24 #include <limits.h> |
12164 | 25 |
26 #include "config.h" | |
27 #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
|
28 #include "help_mp.h" |
26696 | 29 #include "av_opts.h" |
12164 | 30 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22440
diff
changeset
|
31 #include "stream/stream.h" |
12164 | 32 #include "demuxer.h" |
33 #include "stheader.h" | |
19598 | 34 #include "m_option.h" |
23758 | 35 #include "libvo/sub.h" |
12164 | 36 |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
37 #include "libavformat/avformat.h" |
27584 | 38 #include "libavformat/avio.h" |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
39 #include "libavutil/avutil.h" |
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
40 #include "libavcodec/opt.h" |
12164 | 41 |
26328
11aac031b4b7
Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents:
26294
diff
changeset
|
42 #include "mp_taglists.h" |
11aac031b4b7
Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents:
26294
diff
changeset
|
43 |
29082
27edb64156ff
Increase probe buffer size to 32kB, this makes ac3 auto-detection far more reliable.
reimar
parents:
28303
diff
changeset
|
44 #define PROBE_BUF_SIZE (32*1024) |
12164 | 45 |
18775 | 46 extern char *audio_lang; |
26000 | 47 extern char *dvdsub_lang; |
48 extern int dvdsub_id; | |
19598 | 49 static unsigned int opt_probesize = 0; |
24635 | 50 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
|
51 static char *opt_format; |
24757 | 52 static char *opt_cryptokey; |
24844 | 53 extern int ts_prog; |
26696 | 54 static char *opt_avopt = NULL; |
19598 | 55 |
25241
bb7c65f2a289
Make m_option_t arrays referenced by cfg-common.h const
reimar
parents:
25117
diff
changeset
|
56 const m_option_t lavfdopts_conf[] = { |
19598 | 57 {"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
|
58 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, |
24635 | 59 {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, |
24757 | 60 {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL}, |
26696 | 61 {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
19598 | 62 {NULL, NULL, 0, 0, 0, 0, NULL} |
63 }; | |
64 | |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
65 #define BIO_BUFFER_SIZE 32768 |
18775 | 66 |
12164 | 67 typedef struct lavf_priv_t{ |
68 AVInputFormat *avif; | |
69 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
|
70 ByteIOContext *pb; |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
71 uint8_t buffer[BIO_BUFFER_SIZE]; |
12164 | 72 int audio_streams; |
73 int video_streams; | |
23758 | 74 int sub_streams; |
12168 | 75 int64_t last_pts; |
18762 | 76 int astreams[MAX_A_STREAMS]; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
77 int vstreams[MAX_V_STREAMS]; |
23758 | 78 int sstreams[MAX_S_STREAMS]; |
24844 | 79 int cur_program; |
12164 | 80 }lavf_priv_t; |
81 | |
28051 | 82 void print_wave_header(WAVEFORMATEX *h, int verbose_level); |
83 void print_video_header(BITMAPINFOHEADER *h, int verbose_level); | |
12164 | 84 |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
85 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
|
86 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
|
87 int ret; |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
88 |
12164 | 89 if(stream_eof(stream)) //needed? |
90 return -1; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
91 ret=stream_read(stream, buf, size); |
12166 | 92 |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
93 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
|
94 return ret; |
12164 | 95 } |
96 | |
27656 | 97 static int64_t mp_seek(void *opaque, int64_t pos, int whence) { |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
98 stream_t *stream = opaque; |
27656 | 99 int64_t current_pos; |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
100 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", stream, (int)pos, whence); |
12164 | 101 if(whence == SEEK_CUR) |
102 pos +=stream_tell(stream); | |
24085
71d17c28f545
We can support SEEK_END seeks only when stream->end_pos is known
reimar
parents:
24084
diff
changeset
|
103 else if(whence == SEEK_END && stream->end_pos > 0) |
12164 | 104 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
|
105 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
|
106 pos += stream->start_pos; |
24084 | 107 else if(whence == AVSEEK_SIZE && stream->end_pos > 0) |
108 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
|
109 else |
12164 | 110 return -1; |
111 | |
24082 | 112 if(pos<0) |
113 return -1; | |
12167 | 114 if(pos<stream->end_pos && stream->eof) |
12166 | 115 stream_reset(stream); |
27427
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
116 current_pos = stream_tell(stream); |
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
117 if(stream_seek(stream, pos)==0) { |
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
118 stream_reset(stream); |
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
119 stream_seek(stream, current_pos); |
12164 | 120 return -1; |
27427
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
121 } |
12166 | 122 |
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
|
123 return pos - stream->start_pos; |
12164 | 124 } |
125 | |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
126 static void list_formats(void) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
127 AVInputFormat *fmt; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
128 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
|
129 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
|
130 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
|
131 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
132 |
16175 | 133 static int lavf_check_file(demuxer_t *demuxer){ |
12164 | 134 AVProbeData avpd; |
135 uint8_t buf[PROBE_BUF_SIZE]; | |
136 lavf_priv_t *priv; | |
25841 | 137 |
138 if(!demuxer->priv) | |
12164 | 139 demuxer->priv=calloc(sizeof(lavf_priv_t),1); |
140 priv= demuxer->priv; | |
141 | |
142 av_register_all(); | |
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 } |
29295
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
157 |
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
158 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) |
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
159 return 0; |
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
160 avpd.filename= demuxer->stream->url; |
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
161 avpd.buf= buf; |
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
162 avpd.buf_size= PROBE_BUF_SIZE; |
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
163 |
12164 | 164 priv->avif= av_probe_input_format(&avpd, 1); |
165 if(!priv->avif){ | |
166 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n"); | |
167 return 0; | |
168 }else | |
169 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name); | |
170 | |
16175 | 171 return DEMUXER_TYPE_LAVF; |
12164 | 172 } |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
173 |
29296
8fa7fb4ae9ef
Add const where appropriate, also gets rid of a compiler warning.
reimar
parents:
29295
diff
changeset
|
174 static const char * const preferred_list[] = { |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
175 "dxa", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
176 "flv", |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
177 "gxf", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
178 "nut", |
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
179 "nuv", |
25846
f3ae700cc317
Prefer lavf mov demuxer over our own, it should work better most of the time now.
reimar
parents:
25843
diff
changeset
|
180 "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
|
181 "mpc", |
38b8096cae32
Prefer libavformat musepack demuxer over internal one (which does not even support v8).
reimar
parents:
26328
diff
changeset
|
182 "mpc8", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
183 "mxf", |
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
184 "swf", |
29613
7386b883fba6
Add support for lavf vqf demuxer and lavc TwinVQ decoder.
vitor
parents:
29551
diff
changeset
|
185 "vqf", |
29626
2a2bc7ee5b81
Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
reimar
parents:
29625
diff
changeset
|
186 "w64", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
187 "wv", |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
188 NULL |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
189 }; |
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 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
|
192 if (lavf_check_file(demuxer)) { |
29296
8fa7fb4ae9ef
Add const where appropriate, also gets rid of a compiler warning.
reimar
parents:
29295
diff
changeset
|
193 const char * const *p = preferred_list; |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
194 lavf_priv_t *priv = demuxer->priv; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
195 while (*p) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
196 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
|
197 return DEMUXER_TYPE_LAVF_PREFERRED; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
198 p++; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
199 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
200 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
201 return 0; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
202 } |
25841 | 203 |
24757 | 204 static uint8_t char2int(char c) { |
205 if (c >= '0' && c <= '9') return c - '0'; | |
206 if (c >= 'a' && c <= 'f') return c - 'a' + 10; | |
207 if (c >= 'A' && c <= 'F') return c - 'A' + 10; | |
208 return 0; | |
209 } | |
210 | |
211 static void parse_cryptokey(AVFormatContext *avfc, const char *str) { | |
212 int len = strlen(str) / 2; | |
213 uint8_t *key = av_mallocz(len); | |
214 int i; | |
215 avfc->keylen = len; | |
216 avfc->key = key; | |
217 for (i = 0; i < len; i++, str += 2) | |
218 *key++ = (char2int(str[0]) << 4) | char2int(str[1]); | |
219 } | |
220 | |
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 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
|
222 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
|
223 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
|
224 AVCodecContext *codec= st->codec; |
29344
fb8ad1c8b5d6
AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents:
29343
diff
changeset
|
225 AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0); |
29551
19fa7aedb519
Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
cehoyos
parents:
29548
diff
changeset
|
226 int g, override_tag = av_codec_get_tag(mp_codecid_override_taglists, |
19fa7aedb519
Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
cehoyos
parents:
29548
diff
changeset
|
227 codec->codec_id); |
29548
02a57b19fb92
Use mp_wav_override_taglists for both audio and video.
cehoyos
parents:
29455
diff
changeset
|
228 // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag |
02a57b19fb92
Use mp_wav_override_taglists for both audio and video.
cehoyos
parents:
29455
diff
changeset
|
229 if (override_tag) |
02a57b19fb92
Use mp_wav_override_taglists for both audio and video.
cehoyos
parents:
29455
diff
changeset
|
230 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
|
231 |
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 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
|
233 case CODEC_TYPE_AUDIO:{ |
29343
28486169f9e0
Move allocation to avoid a possible memleak if new_sh_audio fails.
reimar
parents:
29342
diff
changeset
|
234 WAVEFORMATEX *wf; |
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 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
|
236 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
|
237 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
|
238 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
|
239 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
|
240 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
|
241 priv->audio_streams++; |
29343
28486169f9e0
Move allocation to avoid a possible memleak if new_sh_audio fails.
reimar
parents:
29342
diff
changeset
|
242 wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 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
|
243 // 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
|
244 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
|
245 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
|
246 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
|
247 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
|
248 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
|
249 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
|
250 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
|
251 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
|
252 wf->nBlockAlign= codec->block_align ? codec->block_align : 1; |
27516
3364aef9a988
Fix compilation after libavcodec major version 52 changes
uau
parents:
27493
diff
changeset
|
253 wf->wBitsPerSample= codec->bits_per_coded_sample; |
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
|
254 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
|
255 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
|
256 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
|
257 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
|
258 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
|
259 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
|
260 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
|
261 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
|
262 }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
|
263 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
|
264 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
|
265 } |
28303 | 266 g= av_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate); |
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
|
267 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
|
268 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
|
269 // 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
|
270 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
|
271 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
|
272 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
|
273 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
|
274 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
|
275 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
|
276 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
|
277 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
|
278 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
|
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_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
|
281 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
|
282 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
|
283 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
|
284 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
|
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 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
|
287 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
|
288 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
|
289 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
|
290 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
|
291 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
|
292 } |
29344
fb8ad1c8b5d6
AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents:
29343
diff
changeset
|
293 if (lang && lang->value) { |
fb8ad1c8b5d6
AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents:
29343
diff
changeset
|
294 sh_audio->lang = strdup(lang->value); |
29341
67b3e40a81c2
Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents:
29296
diff
changeset
|
295 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", i, sh_audio->lang); |
67b3e40a81c2
Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents:
29296
diff
changeset
|
296 } |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
297 if (st->disposition & AV_DISPOSITION_DEFAULT) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
298 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
|
299 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
|
300 // select the first audio stream |
8732f2107b56
Don't select audio stream in lavf and mkv demuxers.
eugeni
parents:
26088
diff
changeset
|
301 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
|
302 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
|
303 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
|
304 } 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
|
305 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
|
306 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
|
307 } |
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 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 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
|
314 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
|
315 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
|
316 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
|
317 |
26294 | 318 if(codec->codec_id == CODEC_ID_RAWVIDEO) { |
319 switch (codec->pix_fmt) { | |
320 case PIX_FMT_RGB24: | |
321 codec->codec_tag= MKTAG(24, 'B', 'G', 'R'); | |
322 } | |
323 } | |
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
|
324 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
|
325 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
|
326 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
|
327 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
|
328 bih->biHeight= codec->height; |
27516
3364aef9a988
Fix compilation after libavcodec major version 52 changes
uau
parents:
27493
diff
changeset
|
329 bih->biBitCount= codec->bits_per_coded_sample; |
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
|
330 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
|
331 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
|
332 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
|
333 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
|
334 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
|
335 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
|
336 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
|
337 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
|
338 } 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
|
339 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
|
340 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
|
341 } |
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 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
|
343 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
|
344 sh_video->format=bih->biCompression; |
27447
d35a61df7122
use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents:
27427
diff
changeset
|
345 if(st->sample_aspect_ratio.num) |
d35a61df7122
use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents:
27427
diff
changeset
|
346 sh_video->aspect = codec->width * st->sample_aspect_ratio.num |
d35a61df7122
use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents:
27427
diff
changeset
|
347 / (float)(codec->height * st->sample_aspect_ratio.den); |
d35a61df7122
use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents:
27427
diff
changeset
|
348 else |
27448 | 349 sh_video->aspect=codec->width * codec->sample_aspect_ratio.num |
350 / (float)(codec->height * codec->sample_aspect_ratio.den); | |
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
|
351 sh_video->i_bps=codec->bit_rate/8; |
25841 | 352 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
|
353 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
|
354 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
|
355 |
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 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
|
357 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
|
358 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
|
359 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
|
360 /* |
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 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
|
362 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
|
363 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
|
364 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
|
365 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
|
366 */ |
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 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
|
368 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
|
369 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
|
370 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
|
371 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
|
372 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
373 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
|
374 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
375 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
|
376 sh_sub_t* sh_sub; |
25659 | 377 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
|
378 /* only support text subtitles for now */ |
25659 | 379 if(codec->codec_id == CODEC_ID_TEXT) |
380 type = 't'; | |
25879 | 381 else if(codec->codec_id == CODEC_ID_MOV_TEXT) |
382 type = 'm'; | |
25659 | 383 else if(codec->codec_id == CODEC_ID_SSA) |
384 type = 'a'; | |
25839
327e98d7d2be
Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents:
25789
diff
changeset
|
385 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
|
386 type = 'v'; |
25659 | 387 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
|
388 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
|
389 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
|
390 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
|
391 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
|
392 priv->sstreams[priv->sub_streams] = i; |
25659 | 393 sh_sub->type = type; |
394 if (codec->extradata_size) { | |
395 sh_sub->extradata = malloc(codec->extradata_size); | |
396 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); | |
397 sh_sub->extradata_len = codec->extradata_size; | |
398 } | |
29344
fb8ad1c8b5d6
AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents:
29343
diff
changeset
|
399 if (lang && lang->value) { |
fb8ad1c8b5d6
AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents:
29343
diff
changeset
|
400 sh_sub->lang = strdup(lang->value); |
29341
67b3e40a81c2
Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents:
29296
diff
changeset
|
401 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", priv->sub_streams, sh_sub->lang); |
67b3e40a81c2
Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents:
29296
diff
changeset
|
402 } |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
403 if (st->disposition & AV_DISPOSITION_DEFAULT) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
404 sh_sub->default_track = 1; |
26000 | 405 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
|
406 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
|
407 } |
25900 | 408 case CODEC_TYPE_ATTACHMENT:{ |
409 if (st->codec->codec_id == CODEC_ID_TTF) | |
410 demuxer_add_attachment(demuxer, st->filename, | |
411 "application/x-truetype-font", | |
412 codec->extradata, codec->extradata_size); | |
413 break; | |
414 } | |
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
|
415 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
|
416 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
|
417 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
418 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
419 |
16175 | 420 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ |
12164 | 421 AVFormatContext *avfc; |
422 AVFormatParameters ap; | |
24633 | 423 const AVOption *opt; |
29455 | 424 AVMetadataTag *t = NULL; |
12164 | 425 lavf_priv_t *priv= demuxer->priv; |
24868 | 426 int i; |
12164 | 427 char mp_filename[256]="mp:"; |
428 | |
429 memset(&ap, 0, sizeof(AVFormatParameters)); | |
430 | |
431 stream_seek(demuxer->stream, 0); | |
432 | |
19598 | 433 avfc = av_alloc_format_context(); |
21548 | 434 |
24757 | 435 if (opt_cryptokey) |
436 parse_cryptokey(avfc, opt_cryptokey); | |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25900
diff
changeset
|
437 if (user_correct_pts != 0) |
21548 | 438 avfc->flags |= AVFMT_FLAG_GENPTS; |
21568 | 439 if (index_mode == 0) |
440 avfc->flags |= AVFMT_FLAG_IGNIDX; | |
21548 | 441 |
19598 | 442 ap.prealloced_context = 1; |
443 if(opt_probesize) { | |
24634 | 444 opt = av_set_int(avfc, "probesize", opt_probesize); |
445 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %u\n", opt_probesize); | |
19598 | 446 } |
24635 | 447 if(opt_analyzeduration) { |
448 opt = av_set_int(avfc, "analyzeduration", opt_analyzeduration * AV_TIME_BASE); | |
449 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option analyzeduration to %u\n", opt_analyzeduration); | |
450 } | |
19598 | 451 |
26696 | 452 if(opt_avopt){ |
453 if(parse_avopts(avfc, opt_avopt) < 0){ | |
454 mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", opt_avopt); | |
455 return NULL; | |
456 } | |
457 } | |
458 | |
12463 | 459 if(demuxer->stream->url) |
460 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3); | |
461 else | |
462 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3); | |
25841 | 463 |
25478 | 464 priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0, |
465 demuxer->stream, mp_read, NULL, mp_seek); | |
27219 | 466 priv->pb->is_streamed = !demuxer->stream->end_pos || (demuxer->stream->flags & STREAM_SEEK) != STREAM_SEEK; |
25841 | 467 |
25117
c6702b710b2c
Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
iive
parents:
25092
diff
changeset
|
468 if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){ |
12164 | 469 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); |
16175 | 470 return NULL; |
12164 | 471 } |
472 | |
473 priv->avfc= avfc; | |
474 | |
475 if(av_find_stream_info(avfc) < 0){ | |
476 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n"); | |
16175 | 477 return NULL; |
12164 | 478 } |
479 | |
29455 | 480 /* Add metadata. */ |
481 av_metadata_conv(avfc, NULL, avfc->iformat->metadata_conv); | |
482 while((t = av_metadata_get(avfc->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) | |
483 demux_info_add(demuxer, t->key, t->value); | |
12164 | 484 |
27058 | 485 for(i=0; i < avfc->nb_chapters; i++) { |
486 AVChapter *c = avfc->chapters[i]; | |
487 uint64_t start = av_rescale_q(c->start, c->time_base, (AVRational){1,1000}); | |
488 uint64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1,1000}); | |
29455 | 489 t = av_metadata_get(c->metadata, "title", NULL, 0); |
490 demuxer_add_chapter(demuxer, t ? t->value : NULL, start, end); | |
27058 | 491 } |
492 | |
29615
70404a7bebaf
Always register all streams from libavformat, not just those belonging to a program.
reimar
parents:
29613
diff
changeset
|
493 for(i=0; i<avfc->nb_streams; i++) |
70404a7bebaf
Always register all streams from libavformat, not just those belonging to a program.
reimar
parents:
29613
diff
changeset
|
494 handle_stream(demuxer, avfc, i); |
24844 | 495 if(avfc->nb_programs) { |
496 int p, start=0, found=0; | |
497 | |
498 if(ts_prog) { | |
499 for(p=0; p<avfc->nb_programs; p++) { | |
500 if(avfc->programs[p]->id == ts_prog) { | |
501 start = p; | |
502 found = 1; | |
503 break; | |
504 } | |
505 } | |
506 if(!found) { | |
507 mp_msg(MSGT_HEADER,MSGL_ERR,"DEMUX_LAVF: program %d doesn't seem to be present\n", ts_prog); | |
508 return NULL; | |
509 } | |
510 } | |
511 p = start; | |
512 do { | |
513 AVProgram *program = avfc->programs[p]; | |
29455 | 514 t = av_metadata_get(program->metadata, "title", NULL, 0); |
515 mp_msg(MSGT_HEADER,MSGL_INFO,"LAVF: Program %d %s\n", program->id, t ? t->value : ""); | |
24844 | 516 if(!priv->cur_program && (demuxer->video->sh || demuxer->audio->sh)) |
517 priv->cur_program = program->id; | |
518 p = (p + 1) % avfc->nb_programs; | |
519 } while(p!=start); | |
29615
70404a7bebaf
Always register all streams from libavformat, not just those belonging to a program.
reimar
parents:
29613
diff
changeset
|
520 } |
25841 | 521 |
12164 | 522 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: %d audio and %d video streams found\n",priv->audio_streams,priv->video_streams); |
13749 | 523 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD); |
12164 | 524 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound |
525 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio; | |
526 if(!priv->video_streams){ | |
527 if(!priv->audio_streams){ | |
528 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n"); | |
25841 | 529 return NULL; |
12164 | 530 } |
531 demuxer->video->id=-2; // audio-only | |
532 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video; | |
533 | |
16175 | 534 return demuxer; |
12164 | 535 } |
536 | |
16175 | 537 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ |
12164 | 538 lavf_priv_t *priv= demux->priv; |
539 AVPacket pkt; | |
540 demux_packet_t *dp; | |
541 demux_stream_t *ds; | |
542 int id; | |
543 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n"); | |
544 | |
545 demux->filepos=stream_tell(demux->stream); | |
546 | |
547 if(av_read_frame(priv->avfc, &pkt) < 0) | |
548 return 0; | |
25841 | 549 |
12164 | 550 id= pkt.stream_index; |
551 | |
552 if(id==demux->audio->id){ | |
553 // audio | |
554 ds=demux->audio; | |
555 if(!ds->sh){ | |
556 ds->sh=demux->a_streams[id]; | |
557 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id); | |
558 } | |
559 } else if(id==demux->video->id){ | |
560 // video | |
561 ds=demux->video; | |
562 if(!ds->sh){ | |
563 ds->sh=demux->v_streams[id]; | |
564 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id); | |
565 } | |
23758 | 566 } else if(id==demux->sub->id){ |
567 // subtitle | |
568 ds=demux->sub; | |
569 sub_utf8=1; | |
14611 | 570 } else { |
571 av_free_packet(&pkt); | |
572 return 1; | |
573 } | |
25841 | 574 |
12164 | 575 if(0/*pkt.destruct == av_destruct_packet*/){ |
576 //ok kids, dont try this at home :) | |
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18985
diff
changeset
|
577 dp=malloc(sizeof(demux_packet_t)); |
12164 | 578 dp->len=pkt.size; |
579 dp->next=NULL; | |
580 dp->refcount=1; | |
581 dp->master=NULL; | |
582 dp->buffer=pkt.data; | |
583 pkt.destruct= NULL; | |
584 }else{ | |
585 dp=new_demux_packet(pkt.size); | |
586 memcpy(dp->buffer, pkt.data, pkt.size); | |
587 av_free_packet(&pkt); | |
588 } | |
589 | |
13747 | 590 if(pkt.pts != AV_NOPTS_VALUE){ |
15308 | 591 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); |
592 priv->last_pts= dp->pts * AV_TIME_BASE; | |
27493
a126c38cb1c7
lavf: the subtitles display duration is stored in pkt.convergence_duration
aurel
parents:
27452
diff
changeset
|
593 if(pkt.convergence_duration) |
a126c38cb1c7
lavf: the subtitles display duration is stored in pkt.convergence_duration
aurel
parents:
27452
diff
changeset
|
594 dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base); |
13747 | 595 } |
12164 | 596 dp->pos=demux->filepos; |
597 dp->flags= !!(pkt.flags&PKT_FLAG_KEY); | |
598 // append packet to DS stream: | |
599 ds_add_packet(ds,dp); | |
600 return 1; | |
601 } | |
602 | |
17636 | 603 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){ |
12168 | 604 lavf_priv_t *priv = demuxer->priv; |
20070 | 605 int avsflags = 0; |
17636 | 606 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
|
607 |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25879
diff
changeset
|
608 if (flags & SEEK_ABSOLUTE) { |
20070 | 609 priv->last_pts = priv->avfc->start_time; |
25843 | 610 } else { |
25842
f8fe66772c3a
Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents:
25841
diff
changeset
|
611 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
|
612 } |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25879
diff
changeset
|
613 if (flags & SEEK_FACTOR) { |
20070 | 614 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
615 return; | |
616 priv->last_pts += rel_seek_secs * priv->avfc->duration; | |
617 } else { | |
618 priv->last_pts += rel_seek_secs * AV_TIME_BASE; | |
619 } | |
29699
3819fcdeaaf8
lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents:
29626
diff
changeset
|
620 if (av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags) < 0) { |
3819fcdeaaf8
lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents:
29626
diff
changeset
|
621 avsflags ^= AVSEEK_FLAG_BACKWARD; |
3819fcdeaaf8
lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents:
29626
diff
changeset
|
622 av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags); |
3819fcdeaaf8
lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents:
29626
diff
changeset
|
623 } |
12164 | 624 } |
625 | |
16175 | 626 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg) |
12164 | 627 { |
628 lavf_priv_t *priv = demuxer->priv; | |
25841 | 629 |
12164 | 630 switch (cmd) { |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25900
diff
changeset
|
631 case DEMUXER_CTRL_CORRECT_PTS: |
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25900
diff
changeset
|
632 return DEMUXER_CTRL_OK; |
12168 | 633 case DEMUXER_CTRL_GET_TIME_LENGTH: |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
634 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 635 return DEMUXER_CTRL_DONTKNOW; |
25841 | 636 |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16175
diff
changeset
|
637 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE; |
12164 | 638 return DEMUXER_CTRL_OK; |
639 | |
640 case DEMUXER_CTRL_GET_PERCENT_POS: | |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
641 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 642 return DEMUXER_CTRL_DONTKNOW; |
25841 | 643 |
19160
ccb42ce33c23
Take start time into consideration when calculation percentage position
reimar
parents:
19073
diff
changeset
|
644 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration); |
12168 | 645 return DEMUXER_CTRL_OK; |
18762 | 646 case DEMUXER_CTRL_SWITCH_AUDIO: |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
647 case DEMUXER_CTRL_SWITCH_VIDEO: |
18762 | 648 { |
649 int id = *((int*)arg); | |
650 int newid = -2; | |
26094 | 651 int i, curridx = -1; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
652 int nstreams, *pstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
653 demux_stream_t *ds; |
18762 | 654 |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
655 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO) |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
656 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
657 ds = demuxer->video; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
658 nstreams = priv->video_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
659 pstreams = priv->vstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
660 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
661 else |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
662 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
663 ds = demuxer->audio; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
664 nstreams = priv->audio_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
665 pstreams = priv->astreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
666 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
667 for(i = 0; i < nstreams; i++) |
18762 | 668 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
669 if(pstreams[i] == ds->id) //current stream id |
18762 | 670 { |
671 curridx = i; | |
672 break; | |
673 } | |
674 } | |
675 | |
26094 | 676 if(id == -2) { // no sound |
677 i = -1; | |
678 } else if(id == -1) { // next track | |
679 i = (curridx + 2) % (nstreams + 1) - 1; | |
680 if (i >= 0) | |
681 newid = pstreams[i]; | |
18762 | 682 } |
26094 | 683 else // select track by id |
18762 | 684 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
685 for(i = 0; i < nstreams; i++) |
18762 | 686 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
687 if(pstreams[i] == id) |
18762 | 688 { |
689 newid = id; | |
690 break; | |
691 } | |
692 } | |
693 } | |
24843
2bd6d730782f
permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents:
24842
diff
changeset
|
694 if(i == curridx) |
18762 | 695 return DEMUXER_CTRL_NOTIMPL; |
696 else | |
697 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
698 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
|
699 if(ds->id >= 0) |
24848 | 700 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
|
701 *((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
|
702 if(newid >= 0) |
24848 | 703 priv->avfc->streams[newid]->discard = AVDISCARD_NONE; |
18762 | 704 return DEMUXER_CTRL_OK; |
705 } | |
706 } | |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
707 case DEMUXER_CTRL_IDENTIFY_PROGRAM: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
708 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
709 demux_program_t *prog = arg; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
710 AVProgram *program; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
711 int p, i; |
29618 | 712 int start; |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
713 |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
714 if(priv->avfc->nb_programs < 2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
715 return DEMUXER_CTRL_NOTIMPL; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
716 |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
717 if(prog->progid == -1) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
718 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
719 p = 0; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
720 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
|
721 p++; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
722 p = (p + 1) % priv->avfc->nb_programs; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
723 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
724 else |
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 for(i=0; i<priv->avfc->nb_programs; i++) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
727 if(priv->avfc->programs[i]->id == prog->progid) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
728 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
729 if(i==priv->avfc->nb_programs) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
730 return DEMUXER_CTRL_NOTIMPL; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
731 p = i; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
732 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
733 prog->vid = prog->aid = prog->sid = -2; //no audio and no video by default |
29618 | 734 start = p; |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
735 redo: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
736 program = priv->avfc->programs[p]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
737 for(i=0; i<program->nb_stream_indexes; i++) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
738 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
739 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
|
740 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
741 case CODEC_TYPE_VIDEO: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
742 if(prog->vid == -2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
743 prog->vid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
744 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
745 case CODEC_TYPE_AUDIO: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
746 if(prog->aid == -2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
747 prog->aid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
748 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
749 case CODEC_TYPE_SUBTITLE: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
750 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
|
751 prog->sid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
752 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
753 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
754 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
755 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
|
756 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
757 p = (p + 1) % priv->avfc->nb_programs; |
29618 | 758 if (p == start) |
759 return DEMUXER_CTRL_DONTKNOW; | |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
760 goto redo; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
761 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
762 priv->cur_program = prog->progid = program->id; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
763 return DEMUXER_CTRL_OK; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
764 } |
12164 | 765 default: |
766 return DEMUXER_CTRL_NOTIMPL; | |
767 } | |
768 } | |
769 | |
16175 | 770 static void demux_close_lavf(demuxer_t *demuxer) |
12164 | 771 { |
772 lavf_priv_t* priv = demuxer->priv; | |
773 if (priv){ | |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
774 if(priv->avfc) |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
775 { |
24757 | 776 av_freep(&priv->avfc->key); |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
777 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
|
778 } |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
779 av_freep(&priv->pb); |
12164 | 780 free(priv); demuxer->priv= NULL; |
781 } | |
782 } | |
783 | |
16175 | 784 |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25659
diff
changeset
|
785 const demuxer_desc_t demuxer_desc_lavf = { |
16175 | 786 "libavformat demuxer", |
787 "lavf", | |
788 "libavformat", | |
789 "Michael Niedermayer", | |
790 "supports many formats, requires libavformat", | |
791 DEMUXER_TYPE_LAVF, | |
792 0, // Check after other demuxer | |
793 lavf_check_file, | |
794 demux_lavf_fill_buffer, | |
795 demux_open_lavf, | |
796 demux_close_lavf, | |
797 demux_seek_lavf, | |
798 demux_lavf_control | |
799 }; | |
800 | |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25659
diff
changeset
|
801 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
|
802 "libavformat preferred demuxer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
803 "lavfpref", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
804 "libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
805 "Michael Niedermayer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
806 "supports many formats, requires libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
807 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
|
808 1, |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
809 lavf_check_preferred_file, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
810 demux_lavf_fill_buffer, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
811 demux_open_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
812 demux_close_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
813 demux_seek_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
814 demux_lavf_control |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
815 }; |