Mercurial > mplayer.hg
annotate libmpdemux/demux_lavf.c @ 34554:8f2e2ea80a3d
add jps / pns image formats, sync'd from ffmpeg
samples: http://i2.i-2000.com/~siragusa/jpsvpns/data/
author | compn |
---|---|
date | Tue, 31 Jan 2012 12:11:46 +0000 |
parents | 41574d60dc98 |
children | 812c3528724b |
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" |
33871
30f5e5cd3676
Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents:
33608
diff
changeset
|
30 #include "av_helpers.h" |
12164 | 31 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22440
diff
changeset
|
32 #include "stream/stream.h" |
30589
df6c41f16b40
Add header for AVI print functions; avoids many forward declarations.
diego
parents:
30505
diff
changeset
|
33 #include "aviprint.h" |
12164 | 34 #include "demuxer.h" |
35 #include "stheader.h" | |
19598 | 36 #include "m_option.h" |
32467 | 37 #include "sub/sub.h" |
12164 | 38 |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
39 #include "libavformat/avformat.h" |
27584 | 40 #include "libavformat/avio.h" |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26014
diff
changeset
|
41 #include "libavutil/avutil.h" |
30458 | 42 #include "libavutil/avstring.h" |
33533 | 43 #include "libavutil/mathematics.h" |
34550
41574d60dc98
Fix another case where opt.h was included from libavcodec instead of libavutil.
reimar
parents:
34541
diff
changeset
|
44 #include "libavutil/opt.h" |
12164 | 45 |
26328
11aac031b4b7
Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents:
26294
diff
changeset
|
46 #include "mp_taglists.h" |
11aac031b4b7
Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents:
26294
diff
changeset
|
47 |
30904
c449f1667e78
Start probing with a size matching the stream buffer size so it is possible
reimar
parents:
30620
diff
changeset
|
48 #define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE |
c449f1667e78
Start probing with a size matching the stream buffer size so it is possible
reimar
parents:
30620
diff
changeset
|
49 #define SMALL_MAX_PROBE_SIZE (32 * 1024) |
30505
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
50 #define PROBE_BUF_SIZE (2*1024*1024) |
12164 | 51 |
19598 | 52 static unsigned int opt_probesize = 0; |
24635 | 53 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
|
54 static char *opt_format; |
24757 | 55 static char *opt_cryptokey; |
26696 | 56 static char *opt_avopt = NULL; |
19598 | 57 |
25241
bb7c65f2a289
Make m_option_t arrays referenced by cfg-common.h const
reimar
parents:
25117
diff
changeset
|
58 const m_option_t lavfdopts_conf[] = { |
19598 | 59 {"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
|
60 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, |
24635 | 61 {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, |
24757 | 62 {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL}, |
26696 | 63 {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
19598 | 64 {NULL, NULL, 0, 0, 0, 0, NULL} |
65 }; | |
66 | |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
67 #define BIO_BUFFER_SIZE 32768 |
18775 | 68 |
31186 | 69 typedef struct lavf_priv { |
12164 | 70 AVInputFormat *avif; |
71 AVFormatContext *avfc; | |
33930 | 72 AVIOContext *pb; |
30505
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
73 uint8_t buffer[BIO_BUFFER_SIZE]; |
12164 | 74 int audio_streams; |
75 int video_streams; | |
23758 | 76 int sub_streams; |
12168 | 77 int64_t last_pts; |
18762 | 78 int astreams[MAX_A_STREAMS]; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
79 int vstreams[MAX_V_STREAMS]; |
23758 | 80 int sstreams[MAX_S_STREAMS]; |
24844 | 81 int cur_program; |
32353
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
82 int nb_streams_last; |
12164 | 83 }lavf_priv_t; |
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) { |
31161
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
86 demuxer_t *demuxer = opaque; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
87 stream_t *stream = demuxer->stream; |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
88 int ret; |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
89 |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
90 ret=stream_read(stream, buf, size); |
12166 | 91 |
31260
9a748502953b
Also print current stream position in mp_read debug output.
reimar
parents:
31259
diff
changeset
|
92 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n", |
9a748502953b
Also print current stream position in mp_read debug output.
reimar
parents:
31259
diff
changeset
|
93 ret, stream, buf, size, stream_tell(stream), 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) { |
31161
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
98 demuxer_t *demuxer = opaque; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
99 stream_t *stream = demuxer->stream; |
27656 | 100 int64_t current_pos; |
30620 | 101 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %"PRId64", %d)\n", stream, pos, whence); |
12164 | 102 if(whence == SEEK_CUR) |
103 pos +=stream_tell(stream); | |
24085
71d17c28f545
We can support SEEK_END seeks only when stream->end_pos is known
reimar
parents:
24084
diff
changeset
|
104 else if(whence == SEEK_END && stream->end_pos > 0) |
12164 | 105 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
|
106 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
|
107 pos += stream->start_pos; |
24084 | 108 else if(whence == AVSEEK_SIZE && stream->end_pos > 0) |
109 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
|
110 else |
12164 | 111 return -1; |
112 | |
24082 | 113 if(pos<0) |
114 return -1; | |
27427
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
115 current_pos = stream_tell(stream); |
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
116 if(stream_seek(stream, pos)==0) { |
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
117 stream_reset(stream); |
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
118 stream_seek(stream, current_pos); |
12164 | 119 return -1; |
27427
a54c51af6595
demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents:
27219
diff
changeset
|
120 } |
12166 | 121 |
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
|
122 return pos - stream->start_pos; |
12164 | 123 } |
124 | |
31161
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
125 static int64_t mp_read_seek(void *opaque, int stream_idx, int64_t ts, int flags) { |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
126 demuxer_t *demuxer = opaque; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
127 stream_t *stream = demuxer->stream; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
128 lavf_priv_t *priv = demuxer->priv; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
129 AVStream *st = priv->avfc->streams[stream_idx]; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
130 int ret; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
131 double pts; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
132 |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
133 pts = (double)ts * st->time_base.num / st->time_base.den; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
134 ret = stream_control(stream, STREAM_CTRL_SEEK_TO_TIME, &pts); |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
135 if (ret < 0) |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
136 ret = AVERROR(ENOSYS); |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
137 return ret; |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
138 } |
0255b5679645
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents:
31133
diff
changeset
|
139 |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
140 static void list_formats(void) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
141 AVInputFormat *fmt; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
142 mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n"); |
33916
7941d02c012b
Fix infinite loop in '-demuxer lavf -lavfdopts format=help'
cehoyos
parents:
33915
diff
changeset
|
143 for (fmt = av_iformat_next(NULL); fmt; fmt = av_iformat_next(fmt)) |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
144 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
|
145 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
146 |
16175 | 147 static int lavf_check_file(demuxer_t *demuxer){ |
12164 | 148 AVProbeData avpd; |
149 lavf_priv_t *priv; | |
30505
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
150 int probe_data_size = 0; |
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
151 int read_size = INITIAL_PROBE_SIZE; |
31068
ae2e8f0d4625
Use av_probe_input_format2 and avoid accepting detection
reimar
parents:
30905
diff
changeset
|
152 int score; |
25841 | 153 |
154 if(!demuxer->priv) | |
12164 | 155 demuxer->priv=calloc(sizeof(lavf_priv_t),1); |
156 priv= demuxer->priv; | |
157 | |
33871
30f5e5cd3676
Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents:
33608
diff
changeset
|
158 init_avformat(); |
12164 | 159 |
22150
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
160 if (opt_format) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
161 if (strcmp(opt_format, "help") == 0) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
162 list_formats(); |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
163 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
164 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
165 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
|
166 if (!priv->avif) { |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
167 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
|
168 return 0; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
169 } |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
170 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
|
171 return DEMUXER_TYPE_LAVF; |
6d50b08a8bcd
Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents:
22058
diff
changeset
|
172 } |
29295
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
173 |
30505
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
174 avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) + |
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
175 FF_INPUT_BUFFER_PADDING_SIZE); |
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
176 do { |
30905 | 177 read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size); |
178 if(read_size < 0) { | |
179 av_free(avpd.buf); | |
180 return 0; | |
181 } | |
182 probe_data_size += read_size; | |
183 avpd.filename= demuxer->stream->url; | |
31521
7ae298e3ba15
Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents:
31260
diff
changeset
|
184 if (!avpd.filename) { |
7ae298e3ba15
Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents:
31260
diff
changeset
|
185 mp_msg(MSGT_DEMUX, MSGL_WARN, "Stream url is not set!\n"); |
7ae298e3ba15
Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents:
31260
diff
changeset
|
186 avpd.filename = ""; |
7ae298e3ba15
Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents:
31260
diff
changeset
|
187 } |
30905 | 188 if (!strncmp(avpd.filename, "ffmpeg://", 9)) |
189 avpd.filename += 9; | |
190 avpd.buf_size= probe_data_size; | |
29295
25283dc2a86b
100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents:
29288
diff
changeset
|
191 |
31068
ae2e8f0d4625
Use av_probe_input_format2 and avoid accepting detection
reimar
parents:
30905
diff
changeset
|
192 score = 0; |
ae2e8f0d4625
Use av_probe_input_format2 and avoid accepting detection
reimar
parents:
30905
diff
changeset
|
193 priv->avif= av_probe_input_format2(&avpd, probe_data_size > 0, &score); |
30905 | 194 read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size); |
30904
c449f1667e78
Start probing with a size matching the stream buffer size so it is possible
reimar
parents:
30620
diff
changeset
|
195 } while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED || |
c449f1667e78
Start probing with a size matching the stream buffer size so it is possible
reimar
parents:
30620
diff
changeset
|
196 probe_data_size < SMALL_MAX_PROBE_SIZE) && |
31069
d7c792ed942e
Continue probing even for score == AVPROBE_SCORE_MAX / 4 to match
reimar
parents:
31068
diff
changeset
|
197 score <= AVPROBE_SCORE_MAX / 4 && |
31068
ae2e8f0d4625
Use av_probe_input_format2 and avoid accepting detection
reimar
parents:
30905
diff
changeset
|
198 read_size > 0 && probe_data_size < PROBE_BUF_SIZE); |
30505
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
199 av_free(avpd.buf); |
580319e640b3
Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents:
30458
diff
changeset
|
200 |
12164 | 201 if(!priv->avif){ |
202 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n"); | |
203 return 0; | |
204 }else | |
205 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name); | |
206 | |
16175 | 207 return DEMUXER_TYPE_LAVF; |
12164 | 208 } |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
209 |
29296
8fa7fb4ae9ef
Add const where appropriate, also gets rid of a compiler warning.
reimar
parents:
29295
diff
changeset
|
210 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
|
211 "dxa", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
212 "flv", |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
213 "gxf", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
214 "nut", |
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
215 "nuv", |
31812
88eef0d997e4
Update for libavformat matroska demuxer name change.
reimar
parents:
31643
diff
changeset
|
216 "matroska,webm", |
25846
f3ae700cc317
Prefer lavf mov demuxer over our own, it should work better most of the time now.
reimar
parents:
25843
diff
changeset
|
217 "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
|
218 "mpc", |
38b8096cae32
Prefer libavformat musepack demuxer over internal one (which does not even support v8).
reimar
parents:
26328
diff
changeset
|
219 "mpc8", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
220 "mxf", |
31168 | 221 "ogg", |
34109
65c9b97eae61
Add PVA to lavf preferred formats list, its demuxer seems to work well
reimar
parents:
33932
diff
changeset
|
222 "pva", |
34253 | 223 "qcp", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
224 "swf", |
29613
7386b883fba6
Add support for lavf vqf demuxer and lavc TwinVQ decoder.
vitor
parents:
29551
diff
changeset
|
225 "vqf", |
29626
2a2bc7ee5b81
Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
reimar
parents:
29625
diff
changeset
|
226 "w64", |
29625
aaf67d00ae75
Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents:
29622
diff
changeset
|
227 "wv", |
32611
3f043f0a4ac9
Prefer yuv4mpeg via libavformat, since that one supports multiple
reimar
parents:
32572
diff
changeset
|
228 "yuv4mpegpipe", |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
229 NULL |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
230 }; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
231 |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
232 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
|
233 if (lavf_check_file(demuxer)) { |
29296
8fa7fb4ae9ef
Add const where appropriate, also gets rid of a compiler warning.
reimar
parents:
29295
diff
changeset
|
234 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
|
235 lavf_priv_t *priv = demuxer->priv; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
236 while (*p) { |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
237 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
|
238 return DEMUXER_TYPE_LAVF_PREFERRED; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
239 p++; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
240 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
241 } |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
242 return 0; |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
243 } |
25841 | 244 |
24757 | 245 static uint8_t char2int(char c) { |
246 if (c >= '0' && c <= '9') return c - '0'; | |
247 if (c >= 'a' && c <= 'f') return c - 'a' + 10; | |
248 if (c >= 'A' && c <= 'F') return c - 'A' + 10; | |
249 return 0; | |
250 } | |
251 | |
252 static void parse_cryptokey(AVFormatContext *avfc, const char *str) { | |
253 int len = strlen(str) / 2; | |
254 uint8_t *key = av_mallocz(len); | |
255 int i; | |
256 avfc->keylen = len; | |
257 avfc->key = key; | |
258 for (i = 0; i < len; i++, str += 2) | |
259 *key++ = (char2int(str[0]) << 4) | char2int(str[1]); | |
260 } | |
261 | |
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
|
262 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
|
263 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
|
264 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
|
265 AVCodecContext *codec= st->codec; |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
266 char *stream_type = NULL; |
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
267 int stream_id; |
33930 | 268 AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0); |
269 AVDictionaryEntry *title= av_dict_get(st->metadata, "title", NULL, 0); | |
34155
505b49b171f4
Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents:
34109
diff
changeset
|
270 int g; |
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
|
271 |
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 switch(codec->codec_type){ |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
273 case AVMEDIA_TYPE_AUDIO:{ |
29343
28486169f9e0
Move allocation to avoid a possible memleak if new_sh_audio fails.
reimar
parents:
29342
diff
changeset
|
274 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
|
275 sh_audio_t* sh_audio; |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31602
diff
changeset
|
276 sh_audio = new_sh_audio_aid(demuxer, i, priv->audio_streams, lang ? lang->value : NULL); |
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
|
277 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
|
278 break; |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
279 stream_type = "audio"; |
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
|
280 priv->astreams[priv->audio_streams] = i; |
32111 | 281 wf= calloc(sizeof(*wf) + codec->extradata_size, 1); |
34155
505b49b171f4
Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents:
34109
diff
changeset
|
282 codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 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
|
283 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
|
284 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
|
285 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
|
286 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
|
287 wf->nBlockAlign= codec->block_align ? codec->block_align : 1; |
27516
3364aef9a988
Fix compilation after libavcodec major version 52 changes
uau
parents:
27493
diff
changeset
|
288 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
|
289 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
|
290 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
|
291 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
|
292 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
|
293 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
|
294 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
|
295 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
|
296 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
|
297 }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
|
298 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
|
299 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
|
300 } |
28303 | 301 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
|
302 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
|
303 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
|
304 // 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
|
305 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
|
306 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
|
307 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
|
308 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 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
|
314 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
|
315 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
|
316 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
|
317 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
|
318 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
|
319 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
|
320 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
|
321 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
|
322 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
|
323 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
|
324 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
|
325 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
|
326 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
|
327 } |
31073
c35d122852da
add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents:
31072
diff
changeset
|
328 if (title && title->value) |
c35d122852da
add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents:
31072
diff
changeset
|
329 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_NAME=%s\n", priv->audio_streams, title->value); |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
330 if (st->disposition & AV_DISPOSITION_DEFAULT) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
331 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
|
332 if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V); |
32491
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
333 // select the first audio stream if auto-selection is requested |
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
334 if (demuxer->audio->id == -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
|
335 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
|
336 demuxer->audio->sh= demuxer->a_streams[i]; |
32491
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
337 } |
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
338 if (demuxer->audio->id != i) |
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
|
339 st->discard= AVDISCARD_ALL; |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
340 stream_id = priv->audio_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
|
341 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
|
342 } |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
343 case AVMEDIA_TYPE_VIDEO:{ |
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
|
344 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
|
345 BITMAPINFOHEADER *bih; |
31074
84a83cc32f99
10l: correctly use video_stream instead of audio_stream in the video section
aurel
parents:
31073
diff
changeset
|
346 sh_video=new_sh_video_vid(demuxer, i, priv->video_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
|
347 if(!sh_video) break; |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
348 stream_type = "video"; |
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
|
349 priv->vstreams[priv->video_streams] = i; |
32111 | 350 bih=calloc(sizeof(*bih) + 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
|
351 |
26294 | 352 if(codec->codec_id == CODEC_ID_RAWVIDEO) { |
353 switch (codec->pix_fmt) { | |
354 case PIX_FMT_RGB24: | |
355 codec->codec_tag= MKTAG(24, 'B', 'G', 'R'); | |
32572 | 356 case PIX_FMT_BGR24: |
357 codec->codec_tag= MKTAG(24, 'R', 'G', 'B'); | |
26294 | 358 } |
359 } | |
34155
505b49b171f4
Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents:
34109
diff
changeset
|
360 codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 0); |
32111 | 361 bih->biSize= sizeof(*bih) + codec->extradata_size; |
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
|
362 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
|
363 bih->biHeight= codec->height; |
27516
3364aef9a988
Fix compilation after libavcodec major version 52 changes
uau
parents:
27493
diff
changeset
|
364 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
|
365 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
|
366 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
|
367 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
|
368 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
|
369 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
|
370 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
|
371 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
|
372 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
|
373 } 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
|
374 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
|
375 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
|
376 } |
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 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
|
378 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
|
379 sh_video->format=bih->biCompression; |
27447
d35a61df7122
use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents:
27427
diff
changeset
|
380 if(st->sample_aspect_ratio.num) |
d35a61df7122
use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents:
27427
diff
changeset
|
381 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
|
382 / (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
|
383 else |
27448 | 384 sh_video->aspect=codec->width * codec->sample_aspect_ratio.num |
385 / (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
|
386 sh_video->i_bps=codec->bit_rate/8; |
31073
c35d122852da
add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents:
31072
diff
changeset
|
387 if (title && title->value) |
c35d122852da
add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents:
31072
diff
changeset
|
388 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VID_%d_NAME=%s\n", priv->video_streams, title->value); |
25841 | 389 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
|
390 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
|
391 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
|
392 |
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 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
|
394 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
|
395 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
|
396 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
|
397 /* |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
398 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
|
399 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
|
400 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
|
401 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
|
402 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
|
403 */ |
32491
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
404 // select the first video stream if auto-selection is requested |
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
405 if(demuxer->video->id == -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
|
406 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
|
407 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
|
408 } |
32491
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
409 if(demuxer->video->id != i) |
90206ba16fec
Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents:
32467
diff
changeset
|
410 st->discard= AVDISCARD_ALL; |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
411 stream_id = priv->video_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
|
412 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
|
413 } |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
414 case AVMEDIA_TYPE_SUBTITLE:{ |
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 sh_sub_t* sh_sub; |
25659 | 416 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
|
417 /* only support text subtitles for now */ |
25659 | 418 if(codec->codec_id == CODEC_ID_TEXT) |
419 type = 't'; | |
25879 | 420 else if(codec->codec_id == CODEC_ID_MOV_TEXT) |
421 type = 'm'; | |
25659 | 422 else if(codec->codec_id == CODEC_ID_SSA) |
423 type = 'a'; | |
25839
327e98d7d2be
Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents:
25789
diff
changeset
|
424 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
|
425 type = 'v'; |
31628
f15df2e3081b
Add support for DVB and XSUB subtitles, not yet working properly.
reimar
parents:
31609
diff
changeset
|
426 else if(codec->codec_id == CODEC_ID_XSUB) |
f15df2e3081b
Add support for DVB and XSUB subtitles, not yet working properly.
reimar
parents:
31609
diff
changeset
|
427 type = 'x'; |
f15df2e3081b
Add support for DVB and XSUB subtitles, not yet working properly.
reimar
parents:
31609
diff
changeset
|
428 else if(codec->codec_id == CODEC_ID_DVB_SUBTITLE) |
f15df2e3081b
Add support for DVB and XSUB subtitles, not yet working properly.
reimar
parents:
31609
diff
changeset
|
429 type = 'b'; |
29807
fe38b68ae9f4
Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
cehoyos
parents:
29805
diff
changeset
|
430 else if(codec->codec_id == CODEC_ID_DVB_TELETEXT) |
fe38b68ae9f4
Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
cehoyos
parents:
29805
diff
changeset
|
431 type = 'd'; |
31599
cafeb7863de8
Add support for PGS subtitle decoding via libavcodec.
reimar
parents:
31588
diff
changeset
|
432 else if(codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE) |
cafeb7863de8
Add support for PGS subtitle decoding via libavcodec.
reimar
parents:
31588
diff
changeset
|
433 type = 'p'; |
25659 | 434 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
|
435 break; |
31609
cd81fce1f010
Make the stream language an argument to the stream creation function
reimar
parents:
31602
diff
changeset
|
436 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams, lang ? lang->value : NULL); |
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
|
437 if(!sh_sub) break; |
31080 | 438 stream_type = "subtitle"; |
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
|
439 priv->sstreams[priv->sub_streams] = i; |
25659 | 440 sh_sub->type = type; |
441 if (codec->extradata_size) { | |
442 sh_sub->extradata = malloc(codec->extradata_size); | |
443 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); | |
444 sh_sub->extradata_len = codec->extradata_size; | |
445 } | |
31073
c35d122852da
add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents:
31072
diff
changeset
|
446 if (title && title->value) |
c35d122852da
add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents:
31072
diff
changeset
|
447 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_NAME=%s\n", priv->sub_streams, title->value); |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
448 if (st->disposition & AV_DISPOSITION_DEFAULT) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26094
diff
changeset
|
449 sh_sub->default_track = 1; |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
450 stream_id = 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
|
451 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
|
452 } |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
453 case AVMEDIA_TYPE_ATTACHMENT:{ |
33190 | 454 if (st->codec->codec_id == CODEC_ID_TTF) { |
33930 | 455 AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0); |
33190 | 456 demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL, |
25900 | 457 "application/x-truetype-font", |
458 codec->extradata, codec->extradata_size); | |
33190 | 459 } |
25900 | 460 break; |
461 } | |
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
|
462 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
|
463 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
|
464 } |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
465 if (stream_type) { |
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
466 AVCodec *avc = avcodec_find_decoder(codec->codec_id); |
31925
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31812
diff
changeset
|
467 const char *codec_name = avc ? avc->name : "unknown"; |
33576
c97ec47d1bbb
Fix printing of subtitle type, the wrong index was used to lookup the type.
reimar
parents:
33533
diff
changeset
|
468 if (!avc && *stream_type == 's' && demuxer->s_streams[i]) |
c97ec47d1bbb
Fix printing of subtitle type, the wrong index was used to lookup the type.
reimar
parents:
33533
diff
changeset
|
469 codec_name = sh_sub_type2str(((sh_sub_t *)demuxer->s_streams[i])->type); |
31925
616375aefdda
Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents:
31812
diff
changeset
|
470 mp_msg(MSGT_DEMUX, MSGL_INFO, "[lavf] stream %d: %s (%s), -%cid %d", i, stream_type, codec_name, *stream_type, stream_id); |
31075
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
471 if (lang && lang->value && *stream_type != 'v') |
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
472 mp_msg(MSGT_DEMUX, MSGL_INFO, ", -%clang %s", *stream_type, lang->value); |
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
473 if (title && title->value) |
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
474 mp_msg(MSGT_DEMUX, MSGL_INFO, ", %s", title->value); |
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
475 mp_msg(MSGT_DEMUX, MSGL_INFO, "\n"); |
a259f3d8694d
print a more detailed and more useful description of each stream with lavf
aurel
parents:
31074
diff
changeset
|
476 } |
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
|
477 } |
d5f716b49cb4
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents:
24764
diff
changeset
|
478 |
16175 | 479 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ |
12164 | 480 AVFormatContext *avfc; |
33930 | 481 AVDictionaryEntry *t = NULL; |
12164 | 482 lavf_priv_t *priv= demuxer->priv; |
24868 | 483 int i; |
12164 | 484 char mp_filename[256]="mp:"; |
485 | |
486 stream_seek(demuxer->stream, 0); | |
487 | |
29917 | 488 avfc = avformat_alloc_context(); |
21548 | 489 |
24757 | 490 if (opt_cryptokey) |
491 parse_cryptokey(avfc, opt_cryptokey); | |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25900
diff
changeset
|
492 if (user_correct_pts != 0) |
21548 | 493 avfc->flags |= AVFMT_FLAG_GENPTS; |
21568 | 494 if (index_mode == 0) |
495 avfc->flags |= AVFMT_FLAG_IGNIDX; | |
21548 | 496 |
19598 | 497 if(opt_probesize) { |
34526 | 498 if (av_opt_set_int(avfc, "probesize", opt_probesize, 0) < 0) |
499 mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %u\n", opt_probesize); | |
19598 | 500 } |
24635 | 501 if(opt_analyzeduration) { |
34526 | 502 if (av_opt_set_int(avfc, "analyzeduration", opt_analyzeduration * AV_TIME_BASE, 0) < 0) |
503 mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option analyzeduration to %u\n", opt_analyzeduration); | |
24635 | 504 } |
19598 | 505 |
26696 | 506 if(opt_avopt){ |
507 if(parse_avopts(avfc, opt_avopt) < 0){ | |
508 mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", opt_avopt); | |
509 return NULL; | |
510 } | |
511 } | |
512 | |
30456
0eee9d2e7a1d
Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
reimar
parents:
30092
diff
changeset
|
513 if(demuxer->stream->url) { |
0eee9d2e7a1d
Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
reimar
parents:
30092
diff
changeset
|
514 if (!strncmp(demuxer->stream->url, "ffmpeg://rtsp:", 14)) |
30458 | 515 av_strlcpy(mp_filename, demuxer->stream->url + 9, sizeof(mp_filename)); |
30456
0eee9d2e7a1d
Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
reimar
parents:
30092
diff
changeset
|
516 else |
30458 | 517 av_strlcat(mp_filename, demuxer->stream->url, sizeof(mp_filename)); |
30456
0eee9d2e7a1d
Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
reimar
parents:
30092
diff
changeset
|
518 } else |
30458 | 519 av_strlcat(mp_filename, "foobar.dummy", sizeof(mp_filename)); |
25841 | 520 |
33607
a761fc66ddc7
Do not set priv->pb for AVFMT_NOFILE formats, this now causes FFmpeg to error out.
reimar
parents:
33576
diff
changeset
|
521 if (!(priv->avif->flags & AVFMT_NOFILE)) { |
33930 | 522 priv->pb = avio_alloc_context(priv->buffer, BIO_BUFFER_SIZE, 0, |
523 demuxer, mp_read, NULL, mp_seek); | |
33608 | 524 priv->pb->read_seek = mp_read_seek; |
34541
bdda068ba0a0
Only set "seekable", not "is_streamed" for compatibility with
reimar
parents:
34527
diff
changeset
|
525 if (!demuxer->stream->end_pos || (demuxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK) |
bdda068ba0a0
Only set "seekable", not "is_streamed" for compatibility with
reimar
parents:
34527
diff
changeset
|
526 priv->pb->seekable = 0; |
33932
11bdb6b598c0
Simplify by using avformat_open_input instead of av_open_input_stream.
reimar
parents:
33931
diff
changeset
|
527 avfc->pb = priv->pb; |
33607
a761fc66ddc7
Do not set priv->pb for AVFMT_NOFILE formats, this now causes FFmpeg to error out.
reimar
parents:
33576
diff
changeset
|
528 } |
25841 | 529 |
33932
11bdb6b598c0
Simplify by using avformat_open_input instead of av_open_input_stream.
reimar
parents:
33931
diff
changeset
|
530 if(avformat_open_input(&avfc, mp_filename, priv->avif, NULL)<0){ |
12164 | 531 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); |
16175 | 532 return NULL; |
12164 | 533 } |
534 | |
535 priv->avfc= avfc; | |
536 | |
33931 | 537 if(avformat_find_stream_info(avfc, NULL) < 0){ |
12164 | 538 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n"); |
16175 | 539 return NULL; |
12164 | 540 } |
541 | |
29455 | 542 /* Add metadata. */ |
34525
7e1d9cf6a0db
Replace deprecated/removed AV_METADATA_IGNORE_SUFFIX.
reimar
parents:
34253
diff
changeset
|
543 while((t = av_dict_get(avfc->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) |
29455 | 544 demux_info_add(demuxer, t->key, t->value); |
12164 | 545 |
27058 | 546 for(i=0; i < avfc->nb_chapters; i++) { |
547 AVChapter *c = avfc->chapters[i]; | |
548 uint64_t start = av_rescale_q(c->start, c->time_base, (AVRational){1,1000}); | |
549 uint64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1,1000}); | |
33930 | 550 t = av_dict_get(c->metadata, "title", NULL, 0); |
29455 | 551 demuxer_add_chapter(demuxer, t ? t->value : NULL, start, end); |
27058 | 552 } |
553 | |
29615
70404a7bebaf
Always register all streams from libavformat, not just those belonging to a program.
reimar
parents:
29613
diff
changeset
|
554 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
|
555 handle_stream(demuxer, avfc, i); |
32353
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
556 priv->nb_streams_last = avfc->nb_streams; |
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
557 |
24844 | 558 if(avfc->nb_programs) { |
29805
b9350576d4fc
Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
reimar
parents:
29803
diff
changeset
|
559 int p; |
b9350576d4fc
Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
reimar
parents:
29803
diff
changeset
|
560 for (p = 0; p < avfc->nb_programs; p++) { |
24844 | 561 AVProgram *program = avfc->programs[p]; |
33930 | 562 t = av_dict_get(program->metadata, "title", NULL, 0); |
29455 | 563 mp_msg(MSGT_HEADER,MSGL_INFO,"LAVF: Program %d %s\n", program->id, t ? t->value : ""); |
32492
5fc287bf541a
Print PROGRAM_ID -identify output similar to demux_ts
reimar
parents:
32491
diff
changeset
|
564 mp_msg(MSGT_IDENTIFY, MSGL_V, "PROGRAM_ID=%d\n", program->id); |
29805
b9350576d4fc
Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
reimar
parents:
29803
diff
changeset
|
565 } |
29615
70404a7bebaf
Always register all streams from libavformat, not just those belonging to a program.
reimar
parents:
29613
diff
changeset
|
566 } |
25841 | 567 |
12164 | 568 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: %d audio and %d video streams found\n",priv->audio_streams,priv->video_streams); |
13749 | 569 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD); |
12164 | 570 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound |
571 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio; | |
572 if(!priv->video_streams){ | |
573 if(!priv->audio_streams){ | |
574 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n"); | |
25841 | 575 return NULL; |
12164 | 576 } |
577 demuxer->video->id=-2; // audio-only | |
578 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video; | |
579 | |
16175 | 580 return demuxer; |
12164 | 581 } |
582 | |
16175 | 583 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ |
12164 | 584 lavf_priv_t *priv= demux->priv; |
585 AVPacket pkt; | |
586 demux_packet_t *dp; | |
587 demux_stream_t *ds; | |
588 int id; | |
589 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n"); | |
590 | |
591 demux->filepos=stream_tell(demux->stream); | |
592 | |
593 if(av_read_frame(priv->avfc, &pkt) < 0) | |
594 return 0; | |
25841 | 595 |
32353
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
596 // handle any new streams that might have been added |
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
597 for (id = priv->nb_streams_last; id < priv->avfc->nb_streams; id++) |
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
598 handle_stream(demux, priv->avfc, id); |
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
599 priv->nb_streams_last = priv->avfc->nb_streams; |
a5ed4bcb1149
Handle libavformat adding additional streams during playback.
reimar
parents:
32111
diff
changeset
|
600 |
12164 | 601 id= pkt.stream_index; |
602 | |
603 if(id==demux->audio->id){ | |
604 // audio | |
605 ds=demux->audio; | |
606 if(!ds->sh){ | |
607 ds->sh=demux->a_streams[id]; | |
608 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id); | |
609 } | |
610 } else if(id==demux->video->id){ | |
611 // video | |
612 ds=demux->video; | |
613 if(!ds->sh){ | |
614 ds->sh=demux->v_streams[id]; | |
615 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id); | |
616 } | |
23758 | 617 } else if(id==demux->sub->id){ |
618 // subtitle | |
619 ds=demux->sub; | |
620 sub_utf8=1; | |
14611 | 621 } else { |
622 av_free_packet(&pkt); | |
623 return 1; | |
624 } | |
25841 | 625 |
31588 | 626 if(pkt.destruct == av_destruct_packet && !CONFIG_MEMALIGN_HACK){ |
31643
33be6a8f9197
Avoid incorrectly duplicating initialization code in new_demux_packet,
reimar
parents:
31628
diff
changeset
|
627 dp=new_demux_packet(0); |
12164 | 628 dp->len=pkt.size; |
629 dp->buffer=pkt.data; | |
630 pkt.destruct= NULL; | |
631 }else{ | |
632 dp=new_demux_packet(pkt.size); | |
633 memcpy(dp->buffer, pkt.data, pkt.size); | |
634 av_free_packet(&pkt); | |
635 } | |
636 | |
13747 | 637 if(pkt.pts != AV_NOPTS_VALUE){ |
15308 | 638 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); |
639 priv->last_pts= dp->pts * AV_TIME_BASE; | |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
640 // always set endpts for subtitles, even if AV_PKT_FLAG_KEY is not set, |
31950
77b4e83fe42d
Always use convergence_duration for subtitles otherwise
reimar
parents:
31925
diff
changeset
|
641 // otherwise they will stay on screen to long if e.g. ASS is demuxed from mkv |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
642 if((ds == demux->sub || (pkt.flags & AV_PKT_FLAG_KEY)) && |
31950
77b4e83fe42d
Always use convergence_duration for subtitles otherwise
reimar
parents:
31925
diff
changeset
|
643 pkt.convergence_duration > 0) |
27493
a126c38cb1c7
lavf: the subtitles display duration is stored in pkt.convergence_duration
aurel
parents:
27452
diff
changeset
|
644 dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base); |
13747 | 645 } |
12164 | 646 dp->pos=demux->filepos; |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
647 dp->flags= !!(pkt.flags&AV_PKT_FLAG_KEY); |
12164 | 648 // append packet to DS stream: |
649 ds_add_packet(ds,dp); | |
650 return 1; | |
651 } | |
652 | |
17636 | 653 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){ |
12168 | 654 lavf_priv_t *priv = demuxer->priv; |
20070 | 655 int avsflags = 0; |
17636 | 656 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
|
657 |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25879
diff
changeset
|
658 if (flags & SEEK_ABSOLUTE) { |
33236
889bde9a7c11
Improve seeking for files where start_time is not (properly) set.
reimar
parents:
33190
diff
changeset
|
659 priv->last_pts = priv->avfc->start_time != AV_NOPTS_VALUE ? |
889bde9a7c11
Improve seeking for files where start_time is not (properly) set.
reimar
parents:
33190
diff
changeset
|
660 priv->avfc->start_time : 0; |
25843 | 661 } else { |
25842
f8fe66772c3a
Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents:
25841
diff
changeset
|
662 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
|
663 } |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25879
diff
changeset
|
664 if (flags & SEEK_FACTOR) { |
20070 | 665 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
666 return; | |
667 priv->last_pts += rel_seek_secs * priv->avfc->duration; | |
668 } else { | |
669 priv->last_pts += rel_seek_secs * AV_TIME_BASE; | |
670 } | |
29699
3819fcdeaaf8
lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents:
29626
diff
changeset
|
671 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
|
672 avsflags ^= AVSEEK_FLAG_BACKWARD; |
3819fcdeaaf8
lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents:
29626
diff
changeset
|
673 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
|
674 } |
12164 | 675 } |
676 | |
16175 | 677 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg) |
12164 | 678 { |
679 lavf_priv_t *priv = demuxer->priv; | |
25841 | 680 |
12164 | 681 switch (cmd) { |
30091
1368993fb7a9
Revert r30100: It breaks some mov and asf samples.
cehoyos
parents:
30058
diff
changeset
|
682 case DEMUXER_CTRL_CORRECT_PTS: |
1368993fb7a9
Revert r30100: It breaks some mov and asf samples.
cehoyos
parents:
30058
diff
changeset
|
683 return DEMUXER_CTRL_OK; |
12168 | 684 case DEMUXER_CTRL_GET_TIME_LENGTH: |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
685 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 686 return DEMUXER_CTRL_DONTKNOW; |
25841 | 687 |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16175
diff
changeset
|
688 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE; |
12164 | 689 return DEMUXER_CTRL_OK; |
690 | |
691 case DEMUXER_CTRL_GET_PERCENT_POS: | |
19207
c636a4e9565a
Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents:
19160
diff
changeset
|
692 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE) |
12164 | 693 return DEMUXER_CTRL_DONTKNOW; |
25841 | 694 |
19160
ccb42ce33c23
Take start time into consideration when calculation percentage position
reimar
parents:
19073
diff
changeset
|
695 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration); |
12168 | 696 return DEMUXER_CTRL_OK; |
18762 | 697 case DEMUXER_CTRL_SWITCH_AUDIO: |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
698 case DEMUXER_CTRL_SWITCH_VIDEO: |
18762 | 699 { |
700 int id = *((int*)arg); | |
701 int newid = -2; | |
26094 | 702 int i, curridx = -1; |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
703 int nstreams, *pstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
704 demux_stream_t *ds; |
18762 | 705 |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
706 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO) |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
707 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
708 ds = demuxer->video; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
709 nstreams = priv->video_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
710 pstreams = priv->vstreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
711 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
712 else |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
713 { |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
714 ds = demuxer->audio; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
715 nstreams = priv->audio_streams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
716 pstreams = priv->astreams; |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
717 } |
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
718 for(i = 0; i < nstreams; i++) |
18762 | 719 { |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
720 if(pstreams[i] == ds->id) //current stream id |
18762 | 721 { |
722 curridx = i; | |
723 break; | |
724 } | |
725 } | |
726 | |
26094 | 727 if(id == -2) { // no sound |
728 i = -1; | |
729 } else if(id == -1) { // next track | |
730 i = (curridx + 2) % (nstreams + 1) - 1; | |
731 if (i >= 0) | |
732 newid = pstreams[i]; | |
18762 | 733 } |
26094 | 734 else // select track by id |
18762 | 735 { |
31072
b8cccda750cf
uniformize handling of aid and vid with lavf so that it matches handling of sid
aurel
parents:
31069
diff
changeset
|
736 if (id >= 0 && id < nstreams) { |
b8cccda750cf
uniformize handling of aid and vid with lavf so that it matches handling of sid
aurel
parents:
31069
diff
changeset
|
737 i = id; |
b8cccda750cf
uniformize handling of aid and vid with lavf so that it matches handling of sid
aurel
parents:
31069
diff
changeset
|
738 newid = pstreams[i]; |
18762 | 739 } |
740 } | |
24843
2bd6d730782f
permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents:
24842
diff
changeset
|
741 if(i == curridx) |
18762 | 742 return DEMUXER_CTRL_NOTIMPL; |
743 else | |
744 { | |
21100
6bc989360c8b
check we aren't short of sh_videos before allocating another one
nicodvb
parents:
20990
diff
changeset
|
745 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
|
746 if(ds->id >= 0) |
24848 | 747 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
|
748 *((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
|
749 if(newid >= 0) |
24848 | 750 priv->avfc->streams[newid]->discard = AVDISCARD_NONE; |
18762 | 751 return DEMUXER_CTRL_OK; |
752 } | |
753 } | |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
754 case DEMUXER_CTRL_IDENTIFY_PROGRAM: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
755 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
756 demux_program_t *prog = arg; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
757 AVProgram *program; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
758 int p, i; |
29618 | 759 int start; |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
760 |
29803
3b42ce7b09cf
Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
reimar
parents:
29699
diff
changeset
|
761 prog->vid = prog->aid = prog->sid = -2; //no audio and no video by default |
3b42ce7b09cf
Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
reimar
parents:
29699
diff
changeset
|
762 if(priv->avfc->nb_programs < 1) |
3b42ce7b09cf
Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
reimar
parents:
29699
diff
changeset
|
763 return DEMUXER_CTRL_DONTKNOW; |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
764 |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
765 if(prog->progid == -1) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
766 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
767 p = 0; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
768 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
|
769 p++; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
770 p = (p + 1) % priv->avfc->nb_programs; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
771 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
772 else |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
773 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
774 for(i=0; i<priv->avfc->nb_programs; i++) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
775 if(priv->avfc->programs[i]->id == prog->progid) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
776 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
777 if(i==priv->avfc->nb_programs) |
29803
3b42ce7b09cf
Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
reimar
parents:
29699
diff
changeset
|
778 return DEMUXER_CTRL_DONTKNOW; |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
779 p = i; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
780 } |
29618 | 781 start = p; |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
782 redo: |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
783 program = priv->avfc->programs[p]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
784 for(i=0; i<program->nb_stream_indexes; i++) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
785 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
786 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
|
787 { |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
788 case AVMEDIA_TYPE_VIDEO: |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
789 if(prog->vid == -2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
790 prog->vid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
791 break; |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
792 case AVMEDIA_TYPE_AUDIO: |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
793 if(prog->aid == -2) |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
794 prog->aid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
795 break; |
32768
3544ba7244bf
Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents:
32766
diff
changeset
|
796 case AVMEDIA_TYPE_SUBTITLE: |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
797 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
|
798 prog->sid = program->stream_index[i]; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
799 break; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
800 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
801 } |
32493 | 802 if (prog->aid >= 0 && prog->aid < MAX_A_STREAMS && |
803 demuxer->a_streams[prog->aid]) { | |
804 sh_audio_t *sh = demuxer->a_streams[prog->aid]; | |
805 prog->aid = sh->aid; | |
806 } else | |
807 prog->aid = -2; | |
808 if (prog->vid >= 0 && prog->vid < MAX_V_STREAMS && | |
809 demuxer->v_streams[prog->vid]) { | |
810 sh_video_t *sh = demuxer->v_streams[prog->vid]; | |
811 prog->vid = sh->vid; | |
812 } else | |
813 prog->vid = -2; | |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
814 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
|
815 { |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
816 p = (p + 1) % priv->avfc->nb_programs; |
29618 | 817 if (p == start) |
818 return DEMUXER_CTRL_DONTKNOW; | |
24845
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
819 goto redo; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
820 } |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
821 priv->cur_program = prog->progid = program->id; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
822 return DEMUXER_CTRL_OK; |
3dacff6ae67c
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents:
24844
diff
changeset
|
823 } |
12164 | 824 default: |
825 return DEMUXER_CTRL_NOTIMPL; | |
826 } | |
827 } | |
828 | |
16175 | 829 static void demux_close_lavf(demuxer_t *demuxer) |
12164 | 830 { |
831 lavf_priv_t* priv = demuxer->priv; | |
832 if (priv){ | |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
833 if(priv->avfc) |
33608 | 834 { |
24757 | 835 av_freep(&priv->avfc->key); |
34527 | 836 avformat_close_input(&priv->avfc); |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
837 } |
25471
5075d5ff1da8
Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents:
25241
diff
changeset
|
838 av_freep(&priv->pb); |
12164 | 839 free(priv); demuxer->priv= NULL; |
840 } | |
841 } | |
842 | |
16175 | 843 |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25659
diff
changeset
|
844 const demuxer_desc_t demuxer_desc_lavf = { |
16175 | 845 "libavformat demuxer", |
846 "lavf", | |
847 "libavformat", | |
848 "Michael Niedermayer", | |
849 "supports many formats, requires libavformat", | |
850 DEMUXER_TYPE_LAVF, | |
851 0, // Check after other demuxer | |
852 lavf_check_file, | |
853 demux_lavf_fill_buffer, | |
854 demux_open_lavf, | |
855 demux_close_lavf, | |
856 demux_seek_lavf, | |
857 demux_lavf_control | |
858 }; | |
859 | |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25659
diff
changeset
|
860 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
|
861 "libavformat preferred demuxer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
862 "lavfpref", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
863 "libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
864 "Michael Niedermayer", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
865 "supports many formats, requires libavformat", |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
866 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
|
867 1, |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
868 lavf_check_preferred_file, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
869 demux_lavf_fill_buffer, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
870 demux_open_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
871 demux_close_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
872 demux_seek_lavf, |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
873 demux_lavf_control |
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22918
diff
changeset
|
874 }; |