annotate libmpdemux/demux_lavf.c @ 31069:d7c792ed942e

Continue probing even for score == AVPROBE_SCORE_MAX / 4 to match FFmpeg's behaviour.
author reimar
date Sat, 01 May 2010 15:38:37 +0000
parents ae2e8f0d4625
children b8cccda750cf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
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
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
20
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
21 // #include <stdio.h>
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
22 #include <stdlib.h>
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
23 // #include <unistd.h>
19611
27c747718955 include forgotten limits.h
nicodvb
parents: 19598
diff changeset
24 #include <limits.h>
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
25
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
26 #include "config.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
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
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
29 #include "av_opts.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
30
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22440
diff changeset
31 #include "stream/stream.h"
30589
df6c41f16b40 Add header for AVI print functions; avoids many forward declarations.
diego
parents: 30505
diff changeset
32 #include "aviprint.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
33 #include "demuxer.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
34 #include "stheader.h"
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
35 #include "m_option.h"
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
36 #include "libvo/sub.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
37
26069
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
38 #include "libavformat/avformat.h"
27584
7bc037bccec5 riff.h and avi.h are not needed, but avio.h is.
diego
parents: 27524
diff changeset
39 #include "libavformat/avio.h"
26069
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
40 #include "libavutil/avutil.h"
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
41 #include "libavutil/avstring.h"
26069
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
42 #include "libavcodec/opt.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
43
26328
11aac031b4b7 Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents: 26294
diff changeset
44 #include "mp_taglists.h"
11aac031b4b7 Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents: 26294
diff changeset
45
30904
c449f1667e78 Start probing with a size matching the stream buffer size so it is possible
reimar
parents: 30620
diff changeset
46 #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
47 #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
48 #define PROBE_BUF_SIZE (2*1024*1024)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
49
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
50 extern char *audio_lang;
26000
4437c030ec00 Support -slang in lavf demuxer.
eugeni
parents: 25926
diff changeset
51 extern char *dvdsub_lang;
4437c030ec00 Support -slang in lavf demuxer.
eugeni
parents: 25926
diff changeset
52 extern int dvdsub_id;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
53 static unsigned int opt_probesize = 0;
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
54 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
55 static char *opt_format;
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
56 static char *opt_cryptokey;
26696
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
57 static char *opt_avopt = NULL;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
58
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 25117
diff changeset
59 const m_option_t lavfdopts_conf[] = {
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
60 {"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
61 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL},
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
62 {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
63 {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL},
26696
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
64 {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL},
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
65 {NULL, NULL, 0, 0, 0, 0, NULL}
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
66 };
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
67
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
68 #define BIO_BUFFER_SIZE 32768
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
69
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
70 typedef struct lavf_priv_t{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
71 AVInputFormat *avif;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
72 AVFormatContext *avfc;
25117
c6702b710b2c Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
iive
parents: 25092
diff changeset
73 ByteIOContext *pb;
30505
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
74 uint8_t buffer[BIO_BUFFER_SIZE];
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
75 int audio_streams;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
76 int video_streams;
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
77 int sub_streams;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
78 int64_t last_pts;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
79 int astreams[MAX_A_STREAMS];
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
80 int vstreams[MAX_V_STREAMS];
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
81 int sstreams[MAX_S_STREAMS];
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
82 int cur_program;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
83 }lavf_priv_t;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
84
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
85 static int mp_read(void *opaque, uint8_t *buf, int size) {
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
86 stream_t *stream = opaque;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
87 int ret;
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
88
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
89 if(stream_eof(stream)) //needed?
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
90 return -1;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
91 ret=stream_read(stream, buf, size);
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
92
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
93 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, stream, buf, size, stream->eof);
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
94 return ret;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
95 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
96
27656
3029d0e351a5 fix compilation w/ FFmpeg r15533
gpoirier
parents: 27584
diff changeset
97 static int64_t mp_seek(void *opaque, int64_t pos, int whence) {
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
98 stream_t *stream = opaque;
27656
3029d0e351a5 fix compilation w/ FFmpeg r15533
gpoirier
parents: 27584
diff changeset
99 int64_t current_pos;
30620
d6f2e0515ad3 Print all 64 bits of seek position.
reimar
parents: 30589
diff changeset
100 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %"PRId64", %d)\n", stream, pos, whence);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
101 if(whence == SEEK_CUR)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
102 pos +=stream_tell(stream);
24085
71d17c28f545 We can support SEEK_END seeks only when stream->end_pos is known
reimar
parents: 24084
diff changeset
103 else if(whence == SEEK_END && stream->end_pos > 0)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
104 pos += stream->end_pos;
22440
ee6b8e74d727 when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents: 22266
diff changeset
105 else if(whence == SEEK_SET)
ee6b8e74d727 when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents: 22266
diff changeset
106 pos += stream->start_pos;
24084
2b572bde6b3d Add support for AVSEEK_SIZE in demux_lavf
reimar
parents: 24082
diff changeset
107 else if(whence == AVSEEK_SIZE && stream->end_pos > 0)
2b572bde6b3d Add support for AVSEEK_SIZE in demux_lavf
reimar
parents: 24082
diff changeset
108 return stream->end_pos - stream->start_pos;
22440
ee6b8e74d727 when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents: 22266
diff changeset
109 else
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
110 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
111
24082
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
112 if(pos<0)
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
113 return -1;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
114 if(pos<stream->end_pos && stream->eof)
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
115 stream_reset(stream);
27427
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
116 current_pos = stream_tell(stream);
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
117 if(stream_seek(stream, pos)==0) {
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
118 stream_reset(stream);
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
119 stream_seek(stream, current_pos);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
120 return -1;
27427
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
121 }
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
122
22440
ee6b8e74d727 when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents: 22266
diff changeset
123 return pos - stream->start_pos;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
124 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
125
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
126 static void list_formats(void) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
127 AVInputFormat *fmt;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
128 mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n");
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
129 for (fmt = first_iformat; fmt; fmt = fmt->next)
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
130 mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
131 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
132
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
133 static int lavf_check_file(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
134 AVProbeData avpd;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
135 lavf_priv_t *priv;
30505
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
136 int probe_data_size = 0;
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
137 int read_size = INITIAL_PROBE_SIZE;
31068
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
138 int score;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
139
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
140 if(!demuxer->priv)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
141 demuxer->priv=calloc(sizeof(lavf_priv_t),1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
142 priv= demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
143
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
144 av_register_all();
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
145
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
146 if (opt_format) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
147 if (strcmp(opt_format, "help") == 0) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
148 list_formats();
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
149 return 0;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
150 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
151 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
152 if (!priv->avif) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
153 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
154 return 0;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
155 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
156 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
157 return DEMUXER_TYPE_LAVF;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
158 }
29295
25283dc2a86b 100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents: 29288
diff changeset
159
30505
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
160 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
161 FF_INPUT_BUFFER_PADDING_SIZE);
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
162 do {
30905
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
163 read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size);
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
164 if(read_size < 0) {
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
165 av_free(avpd.buf);
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
166 return 0;
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
167 }
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
168 probe_data_size += read_size;
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
169 avpd.filename= demuxer->stream->url;
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
170 if (!strncmp(avpd.filename, "ffmpeg://", 9))
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
171 avpd.filename += 9;
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
172 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
173
31068
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
174 score = 0;
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
175 priv->avif= av_probe_input_format2(&avpd, probe_data_size > 0, &score);
30905
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
176 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
177 } 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
178 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
179 score <= AVPROBE_SCORE_MAX / 4 &&
31068
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
180 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
181 av_free(avpd.buf);
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
182
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
183 if(!priv->avif){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
184 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
185 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
186 }else
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
187 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
188
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
189 return DEMUXER_TYPE_LAVF;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
190 }
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
191
29296
8fa7fb4ae9ef Add const where appropriate, also gets rid of a compiler warning.
reimar
parents: 29295
diff changeset
192 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
193 "dxa",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
194 "flv",
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
195 "gxf",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
196 "nut",
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
197 "nuv",
25846
f3ae700cc317 Prefer lavf mov demuxer over our own, it should work better most of the time now.
reimar
parents: 25843
diff changeset
198 "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
199 "mpc",
38b8096cae32 Prefer libavformat musepack demuxer over internal one (which does not even support v8).
reimar
parents: 26328
diff changeset
200 "mpc8",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
201 "mxf",
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
202 "swf",
29613
7386b883fba6 Add support for lavf vqf demuxer and lavc TwinVQ decoder.
vitor
parents: 29551
diff changeset
203 "vqf",
29626
2a2bc7ee5b81 Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
reimar
parents: 29625
diff changeset
204 "w64",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
205 "wv",
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
206 NULL
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
207 };
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
208
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
209 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
210 if (lavf_check_file(demuxer)) {
29296
8fa7fb4ae9ef Add const where appropriate, also gets rid of a compiler warning.
reimar
parents: 29295
diff changeset
211 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
212 lavf_priv_t *priv = demuxer->priv;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
213 while (*p) {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
214 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
215 return DEMUXER_TYPE_LAVF_PREFERRED;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
216 p++;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
217 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
218 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
219 return 0;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
220 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
221
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
222 static uint8_t char2int(char c) {
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
223 if (c >= '0' && c <= '9') return c - '0';
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
224 if (c >= 'a' && c <= 'f') return c - 'a' + 10;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
225 if (c >= 'A' && c <= 'F') return c - 'A' + 10;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
226 return 0;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
227 }
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
228
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
229 static void parse_cryptokey(AVFormatContext *avfc, const char *str) {
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
230 int len = strlen(str) / 2;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
231 uint8_t *key = av_mallocz(len);
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
232 int i;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
233 avfc->keylen = len;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
234 avfc->key = key;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
235 for (i = 0; i < len; i++, str += 2)
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
236 *key++ = (char2int(str[0]) << 4) | char2int(str[1]);
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
237 }
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
238
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
239 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
240 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
241 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
242 AVCodecContext *codec= st->codec;
29344
fb8ad1c8b5d6 AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents: 29343
diff changeset
243 AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0);
29551
19fa7aedb519 Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
cehoyos
parents: 29548
diff changeset
244 int g, override_tag = av_codec_get_tag(mp_codecid_override_taglists,
19fa7aedb519 Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
cehoyos
parents: 29548
diff changeset
245 codec->codec_id);
29548
02a57b19fb92 Use mp_wav_override_taglists for both audio and video.
cehoyos
parents: 29455
diff changeset
246 // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag
02a57b19fb92 Use mp_wav_override_taglists for both audio and video.
cehoyos
parents: 29455
diff changeset
247 if (override_tag)
02a57b19fb92 Use mp_wav_override_taglists for both audio and video.
cehoyos
parents: 29455
diff changeset
248 codec->codec_tag = override_tag;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
249
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
250 switch(codec->codec_type){
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
251 case CODEC_TYPE_AUDIO:{
29343
28486169f9e0 Move allocation to avoid a possible memleak if new_sh_audio fails.
reimar
parents: 29342
diff changeset
252 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
253 sh_audio_t* sh_audio;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
254 sh_audio=new_sh_audio(demuxer, i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
255 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
256 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
257 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
258 priv->astreams[priv->audio_streams] = i;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
259 priv->audio_streams++;
29343
28486169f9e0 Move allocation to avoid a possible memleak if new_sh_audio fails.
reimar
parents: 29342
diff changeset
260 wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1);
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
261 // mp4a tag is used for all mp4 files no matter what they actually contain
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
262 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
263 codec->codec_tag= 0;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
264 if(!codec->codec_tag)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
265 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
266 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
267 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
268 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
269 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
270 wf->nBlockAlign= codec->block_align ? codec->block_align : 1;
27516
3364aef9a988 Fix compilation after libavcodec major version 52 changes
uau
parents: 27493
diff changeset
271 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
272 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
273 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
274 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
275 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
276 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
277 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
278 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
279 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
280 }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
281 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
282 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
283 }
28303
44d67f7f8eb3 Fix compilation: s/ff_gcd/av_gcd.
cehoyos
parents: 28051
diff changeset
284 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
285 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
286 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
287 // 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
288 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
289 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
290 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
291 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
292 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
293 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
294 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
295 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
296 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
297 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
298 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
299 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
300 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
301 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
302 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
303 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
304 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
305 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
306 break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
307 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
308 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
309 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
310 }
29344
fb8ad1c8b5d6 AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents: 29343
diff changeset
311 if (lang && lang->value) {
fb8ad1c8b5d6 AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents: 29343
diff changeset
312 sh_audio->lang = strdup(lang->value);
29341
67b3e40a81c2 Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents: 29296
diff changeset
313 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", i, sh_audio->lang);
67b3e40a81c2 Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents: 29296
diff changeset
314 }
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
315 if (st->disposition & AV_DISPOSITION_DEFAULT)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
316 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
317 if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V);
26091
8732f2107b56 Don't select audio stream in lavf and mkv demuxers.
eugeni
parents: 26088
diff changeset
318 // select the first audio stream
8732f2107b56 Don't select audio stream in lavf and mkv demuxers.
eugeni
parents: 26088
diff changeset
319 if (!demuxer->audio->sh) {
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
320 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
321 demuxer->audio->sh= demuxer->a_streams[i];
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
322 } 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
323 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
324 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
325 }
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 case CODEC_TYPE_VIDEO:{
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
327 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
328 BITMAPINFOHEADER *bih;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
329 sh_video=new_sh_video(demuxer, i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
330 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "lavf", i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
331 if(!sh_video) break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
332 priv->vstreams[priv->video_streams] = i;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
333 priv->video_streams++;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
334 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
335
26294
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
336 if(codec->codec_id == CODEC_ID_RAWVIDEO) {
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
337 switch (codec->pix_fmt) {
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
338 case PIX_FMT_RGB24:
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
339 codec->codec_tag= MKTAG(24, 'B', 'G', 'R');
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
340 }
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
341 }
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
342 if(!codec->codec_tag)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
343 codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
344 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
345 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
346 bih->biHeight= codec->height;
27516
3364aef9a988 Fix compilation after libavcodec major version 52 changes
uau
parents: 27493
diff changeset
347 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
348 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
349 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
350 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
351 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
352 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
353 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
354 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
355 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
356 } else {
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
357 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
358 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
359 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
360 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
361 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
362 sh_video->format=bih->biCompression;
27447
d35a61df7122 use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents: 27427
diff changeset
363 if(st->sample_aspect_ratio.num)
d35a61df7122 use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents: 27427
diff changeset
364 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
365 / (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
366 else
27448
5137a84907a1 cosmetics: indentation
aurel
parents: 27447
diff changeset
367 sh_video->aspect=codec->width * codec->sample_aspect_ratio.num
5137a84907a1 cosmetics: indentation
aurel
parents: 27447
diff changeset
368 / (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
369 sh_video->i_bps=codec->bit_rate/8;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
370 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
371 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
372 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
373
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->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
375 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
376 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
377 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
378 /*
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 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
380 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
381 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
382 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
383 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
384 */
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
385 if(demuxer->video->id != i && demuxer->video->id != -1)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
386 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
387 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
388 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
389 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
390 }
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 break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
392 }
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 case CODEC_TYPE_SUBTITLE:{
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
394 sh_sub_t* sh_sub;
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
395 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
396 /* only support text subtitles for now */
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
397 if(codec->codec_id == CODEC_ID_TEXT)
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
398 type = 't';
25879
7b82d835bed1 Support CODEC_ID_MOV_TEXT
reimar
parents: 25846
diff changeset
399 else if(codec->codec_id == CODEC_ID_MOV_TEXT)
7b82d835bed1 Support CODEC_ID_MOV_TEXT
reimar
parents: 25846
diff changeset
400 type = 'm';
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
401 else if(codec->codec_id == CODEC_ID_SSA)
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
402 type = 'a';
25839
327e98d7d2be Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents: 25789
diff changeset
403 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
404 type = 'v';
29807
fe38b68ae9f4 Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
cehoyos
parents: 29805
diff changeset
405 else if(codec->codec_id == CODEC_ID_DVB_TELETEXT)
fe38b68ae9f4 Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
cehoyos
parents: 29805
diff changeset
406 type = 'd';
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
407 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
408 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
409 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
410 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_SubtitleID, "lavf", priv->sub_streams);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
411 if(!sh_sub) break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
412 priv->sstreams[priv->sub_streams] = i;
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
413 sh_sub->type = type;
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
414 if (codec->extradata_size) {
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
415 sh_sub->extradata = malloc(codec->extradata_size);
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
416 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size);
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
417 sh_sub->extradata_len = codec->extradata_size;
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
418 }
29344
fb8ad1c8b5d6 AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents: 29343
diff changeset
419 if (lang && lang->value) {
fb8ad1c8b5d6 AVStream.language is deprecated, switch to av_get_metadata instead.
reimar
parents: 29343
diff changeset
420 sh_sub->lang = strdup(lang->value);
29341
67b3e40a81c2 Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents: 29296
diff changeset
421 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", priv->sub_streams, sh_sub->lang);
67b3e40a81c2 Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
reimar
parents: 29296
diff changeset
422 }
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
423 if (st->disposition & AV_DISPOSITION_DEFAULT)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
424 sh_sub->default_track = 1;
26000
4437c030ec00 Support -slang in lavf demuxer.
eugeni
parents: 25926
diff changeset
425 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
426 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
427 }
25900
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
428 case CODEC_TYPE_ATTACHMENT:{
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
429 if (st->codec->codec_id == CODEC_ID_TTF)
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
430 demuxer_add_attachment(demuxer, st->filename,
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
431 "application/x-truetype-font",
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
432 codec->extradata, codec->extradata_size);
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
433 break;
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
434 }
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 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
436 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
437 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
438 }
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
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
440 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
441 AVFormatContext *avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
442 AVFormatParameters ap;
24633
2bc6fcc627f4 fix warnings
henry
parents: 24520
diff changeset
443 const AVOption *opt;
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
444 AVMetadataTag *t = NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
445 lavf_priv_t *priv= demuxer->priv;
24868
751455d3abbe Remove unused variable:
diego
parents: 24848
diff changeset
446 int i;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
447 char mp_filename[256]="mp:";
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
448
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
449 memset(&ap, 0, sizeof(AVFormatParameters));
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
450
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
451 stream_seek(demuxer->stream, 0);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
452
29917
fef2308ae98e av_alloc_format_context -> avformat_alloc_context
reimar
parents: 29911
diff changeset
453 avfc = avformat_alloc_context();
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
454
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
455 if (opt_cryptokey)
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
456 parse_cryptokey(avfc, opt_cryptokey);
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25900
diff changeset
457 if (user_correct_pts != 0)
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
458 avfc->flags |= AVFMT_FLAG_GENPTS;
21568
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
459 if (index_mode == 0)
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
460 avfc->flags |= AVFMT_FLAG_IGNIDX;
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
461
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
462 ap.prealloced_context = 1;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
463 if(opt_probesize) {
24634
221ad386f6e4 remove useless int->double conversion
henry
parents: 24633
diff changeset
464 opt = av_set_int(avfc, "probesize", opt_probesize);
221ad386f6e4 remove useless int->double conversion
henry
parents: 24633
diff changeset
465 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %u\n", opt_probesize);
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
466 }
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
467 if(opt_analyzeduration) {
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
468 opt = av_set_int(avfc, "analyzeduration", opt_analyzeduration * AV_TIME_BASE);
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
469 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option analyzeduration to %u\n", opt_analyzeduration);
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
470 }
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
471
26696
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
472 if(opt_avopt){
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
473 if(parse_avopts(avfc, opt_avopt) < 0){
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
474 mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", opt_avopt);
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
475 return NULL;
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
476 }
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
477 }
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
478
30456
0eee9d2e7a1d Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
reimar
parents: 30092
diff changeset
479 if(demuxer->stream->url) {
0eee9d2e7a1d Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
reimar
parents: 30092
diff changeset
480 if (!strncmp(demuxer->stream->url, "ffmpeg://rtsp:", 14))
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
481 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
482 else
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
483 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
484 } else
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
485 av_strlcat(mp_filename, "foobar.dummy", sizeof(mp_filename));
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
486
25478
2ec53ef6bda0 100l, fix compilation.
reimar
parents: 25472
diff changeset
487 priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0,
2ec53ef6bda0 100l, fix compilation.
reimar
parents: 25472
diff changeset
488 demuxer->stream, mp_read, NULL, mp_seek);
29920
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29917
diff changeset
489 priv->pb->is_streamed = !demuxer->stream->end_pos || (demuxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
490
25117
c6702b710b2c Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
iive
parents: 25092
diff changeset
491 if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
492 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
493 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
494 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
495
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
496 priv->avfc= avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
497
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
498 if(av_find_stream_info(avfc) < 0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
499 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
500 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
501 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
502
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
503 /* Add metadata. */
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
504 av_metadata_conv(avfc, NULL, avfc->iformat->metadata_conv);
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
505 while((t = av_metadata_get(avfc->metadata, "", t, AV_METADATA_IGNORE_SUFFIX)))
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
506 demux_info_add(demuxer, t->key, t->value);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
507
27058
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
508 for(i=0; i < avfc->nb_chapters; i++) {
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
509 AVChapter *c = avfc->chapters[i];
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
510 uint64_t start = av_rescale_q(c->start, c->time_base, (AVRational){1,1000});
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
511 uint64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1,1000});
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
512 t = av_metadata_get(c->metadata, "title", NULL, 0);
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
513 demuxer_add_chapter(demuxer, t ? t->value : NULL, start, end);
27058
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
514 }
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
515
29615
70404a7bebaf Always register all streams from libavformat, not just those belonging to a program.
reimar
parents: 29613
diff changeset
516 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
517 handle_stream(demuxer, avfc, i);
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
518 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
519 int p;
b9350576d4fc Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
reimar
parents: 29803
diff changeset
520 for (p = 0; p < avfc->nb_programs; p++) {
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
521 AVProgram *program = avfc->programs[p];
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
522 t = av_metadata_get(program->metadata, "title", NULL, 0);
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
523 mp_msg(MSGT_HEADER,MSGL_INFO,"LAVF: Program %d %s\n", program->id, t ? t->value : "");
29805
b9350576d4fc Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
reimar
parents: 29803
diff changeset
524 }
29615
70404a7bebaf Always register all streams from libavformat, not just those belonging to a program.
reimar
parents: 29613
diff changeset
525 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
526
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
527 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: %d audio and %d video streams found\n",priv->audio_streams,priv->video_streams);
13749
dd7199cfb8e4 print build num
michael
parents: 13747
diff changeset
528 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
529 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
530 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
531 if(!priv->video_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
532 if(!priv->audio_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
533 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n");
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
534 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
535 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
536 demuxer->video->id=-2; // audio-only
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
537 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
538
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
539 return demuxer;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
540 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
541
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
542 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
543 lavf_priv_t *priv= demux->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
544 AVPacket pkt;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
545 demux_packet_t *dp;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
546 demux_stream_t *ds;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
547 int id;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
548 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
549
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
550 demux->filepos=stream_tell(demux->stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
551
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
552 if(av_read_frame(priv->avfc, &pkt) < 0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
553 return 0;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
554
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
555 id= pkt.stream_index;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
556
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
557 if(id==demux->audio->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
558 // audio
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
559 ds=demux->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
560 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
561 ds->sh=demux->a_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
562 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
563 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
564 } else if(id==demux->video->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
565 // video
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
566 ds=demux->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
567 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
568 ds->sh=demux->v_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
569 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
570 }
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
571 } else if(id==demux->sub->id){
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
572 // subtitle
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
573 ds=demux->sub;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
574 sub_utf8=1;
14611
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
575 } else {
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
576 av_free_packet(&pkt);
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
577 return 1;
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
578 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
579
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
580 if(0/*pkt.destruct == av_destruct_packet*/){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
581 //ok kids, dont try this at home :)
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18985
diff changeset
582 dp=malloc(sizeof(demux_packet_t));
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
583 dp->len=pkt.size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
584 dp->next=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
585 dp->refcount=1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
586 dp->master=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
587 dp->buffer=pkt.data;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
588 pkt.destruct= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
589 }else{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
590 dp=new_demux_packet(pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
591 memcpy(dp->buffer, pkt.data, pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
592 av_free_packet(&pkt);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
593 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
594
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
595 if(pkt.pts != AV_NOPTS_VALUE){
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
596 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
597 priv->last_pts= dp->pts * AV_TIME_BASE;
27493
a126c38cb1c7 lavf: the subtitles display duration is stored in pkt.convergence_duration
aurel
parents: 27452
diff changeset
598 if(pkt.convergence_duration)
a126c38cb1c7 lavf: the subtitles display duration is stored in pkt.convergence_duration
aurel
parents: 27452
diff changeset
599 dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base);
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
600 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
601 dp->pos=demux->filepos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
602 dp->flags= !!(pkt.flags&PKT_FLAG_KEY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
603 // append packet to DS stream:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
604 ds_add_packet(ds,dp);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
605 return 1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
606 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
607
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
608 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags){
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
609 lavf_priv_t *priv = demuxer->priv;
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
610 int avsflags = 0;
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
611 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
612
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25879
diff changeset
613 if (flags & SEEK_ABSOLUTE) {
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
614 priv->last_pts = priv->avfc->start_time;
25843
245e2ffbb2d5 100l, inverted condition for AVSEEK_FLAG_BACKWARD
reimar
parents: 25842
diff changeset
615 } else {
25842
f8fe66772c3a Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents: 25841
diff changeset
616 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
617 }
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25879
diff changeset
618 if (flags & SEEK_FACTOR) {
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
619 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
620 return;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
621 priv->last_pts += rel_seek_secs * priv->avfc->duration;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
622 } else {
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
623 priv->last_pts += rel_seek_secs * AV_TIME_BASE;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
624 }
29699
3819fcdeaaf8 lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents: 29626
diff changeset
625 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
626 avsflags ^= AVSEEK_FLAG_BACKWARD;
3819fcdeaaf8 lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents: 29626
diff changeset
627 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
628 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
629 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
630
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
631 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
632 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
633 lavf_priv_t *priv = demuxer->priv;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
634
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
635 switch (cmd) {
30091
1368993fb7a9 Revert r30100: It breaks some mov and asf samples.
cehoyos
parents: 30058
diff changeset
636 case DEMUXER_CTRL_CORRECT_PTS:
30092
b636fc3f4960 Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.
cehoyos
parents: 30091
diff changeset
637 if (!strcmp("matroska", priv->avif->name) ||
b636fc3f4960 Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.
cehoyos
parents: 30091
diff changeset
638 !strcmp("mpegts", priv->avif->name))
b636fc3f4960 Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.
cehoyos
parents: 30091
diff changeset
639 return DEMUXER_CTRL_NOTIMPL;
30091
1368993fb7a9 Revert r30100: It breaks some mov and asf samples.
cehoyos
parents: 30058
diff changeset
640 return DEMUXER_CTRL_OK;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
641 case DEMUXER_CTRL_GET_TIME_LENGTH:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
642 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
643 return DEMUXER_CTRL_DONTKNOW;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
644
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16175
diff changeset
645 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
646 return DEMUXER_CTRL_OK;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
647
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
648 case DEMUXER_CTRL_GET_PERCENT_POS:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
649 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
650 return DEMUXER_CTRL_DONTKNOW;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
651
19160
ccb42ce33c23 Take start time into consideration when calculation percentage position
reimar
parents: 19073
diff changeset
652 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration);
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
653 return DEMUXER_CTRL_OK;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
654 case DEMUXER_CTRL_SWITCH_AUDIO:
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
655 case DEMUXER_CTRL_SWITCH_VIDEO:
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
656 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
657 int id = *((int*)arg);
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
658 int newid = -2;
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
659 int i, curridx = -1;
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
660 int nstreams, *pstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
661 demux_stream_t *ds;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
662
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
663 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO)
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
664 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
665 ds = demuxer->video;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
666 nstreams = priv->video_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
667 pstreams = priv->vstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
668 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
669 else
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
670 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
671 ds = demuxer->audio;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
672 nstreams = priv->audio_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
673 pstreams = priv->astreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
674 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
675 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
676 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
677 if(pstreams[i] == ds->id) //current stream id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
678 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
679 curridx = i;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
680 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
681 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
682 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
683
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
684 if(id == -2) { // no sound
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
685 i = -1;
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
686 } else if(id == -1) { // next track
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
687 i = (curridx + 2) % (nstreams + 1) - 1;
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
688 if (i >= 0)
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
689 newid = pstreams[i];
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
690 }
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
691 else // select track by id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
692 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
693 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
694 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
695 if(pstreams[i] == id)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
696 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
697 newid = id;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
698 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
699 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
700 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
701 }
24843
2bd6d730782f permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents: 24842
diff changeset
702 if(i == curridx)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
703 return DEMUXER_CTRL_NOTIMPL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
704 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
705 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
706 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
707 if(ds->id >= 0)
24848
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
708 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
709 *((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
710 if(newid >= 0)
24848
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
711 priv->avfc->streams[newid]->discard = AVDISCARD_NONE;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
712 return DEMUXER_CTRL_OK;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
713 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
714 }
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
715 case DEMUXER_CTRL_IDENTIFY_PROGRAM:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
716 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
717 demux_program_t *prog = arg;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
718 AVProgram *program;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
719 int p, i;
29618
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
720 int start;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
721
29803
3b42ce7b09cf Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
reimar
parents: 29699
diff changeset
722 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
723 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
724 return DEMUXER_CTRL_DONTKNOW;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
725
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
726 if(prog->progid == -1)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
727 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
728 p = 0;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
729 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
730 p++;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
731 p = (p + 1) % priv->avfc->nb_programs;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
732 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
733 else
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
734 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
735 for(i=0; i<priv->avfc->nb_programs; i++)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
736 if(priv->avfc->programs[i]->id == prog->progid)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
737 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
738 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
739 return DEMUXER_CTRL_DONTKNOW;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
740 p = i;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
741 }
29618
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
742 start = p;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
743 redo:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
744 program = priv->avfc->programs[p];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
745 for(i=0; i<program->nb_stream_indexes; i++)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
746 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
747 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
748 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
749 case CODEC_TYPE_VIDEO:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
750 if(prog->vid == -2)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
751 prog->vid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
752 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
753 case CODEC_TYPE_AUDIO:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
754 if(prog->aid == -2)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
755 prog->aid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
756 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
757 case CODEC_TYPE_SUBTITLE:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
758 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
759 prog->sid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
760 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
761 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
762 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
763 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
764 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
765 p = (p + 1) % priv->avfc->nb_programs;
29618
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
766 if (p == start)
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
767 return DEMUXER_CTRL_DONTKNOW;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
768 goto redo;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
769 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
770 priv->cur_program = prog->progid = program->id;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
771 return DEMUXER_CTRL_OK;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
772 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
773 default:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
774 return DEMUXER_CTRL_NOTIMPL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
775 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
776 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
777
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
778 static void demux_close_lavf(demuxer_t *demuxer)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
779 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
780 lavf_priv_t* priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
781 if (priv){
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
782 if(priv->avfc)
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
783 {
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
784 av_freep(&priv->avfc->key);
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
785 av_close_input_stream(priv->avfc);
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
786 }
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
787 av_freep(&priv->pb);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
788 free(priv); demuxer->priv= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
789 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
790 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
791
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
792
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25659
diff changeset
793 const demuxer_desc_t demuxer_desc_lavf = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
794 "libavformat demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
795 "lavf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
796 "libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
797 "Michael Niedermayer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
798 "supports many formats, requires libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
799 DEMUXER_TYPE_LAVF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
800 0, // Check after other demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
801 lavf_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
802 demux_lavf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
803 demux_open_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
804 demux_close_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
805 demux_seek_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
806 demux_lavf_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
807 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
808
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25659
diff changeset
809 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
810 "libavformat preferred demuxer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
811 "lavfpref",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
812 "libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
813 "Michael Niedermayer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
814 "supports many formats, requires libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
815 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
816 1,
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
817 lavf_check_preferred_file,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
818 demux_lavf_fill_buffer,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
819 demux_open_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
820 demux_close_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
821 demux_seek_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
822 demux_lavf_control
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
823 };