annotate libmpdemux/demux_lavf.c @ 36316:139f2b064ef9

Don't subsequently calculate original_aspect from last movie_aspect. Instead, differentiate between the original aspect ratio stored in or determined from the video file and the forced, i.e. current, aspect ratio (e.g. forced by command line override). This enables multiple independent instances of vd.c again which has been broken by introducing a static variable in r36401. Without the subsequent calculation of original_aspect it now contains nothing but the pure video file aspect ratio which makes it possible to use movie_aspect -1 to set the original aspect ratio which explains the changes in command.c and gui/dialog/menu.c. The changes in vd_mpegpes due to the impact of original_aspect will fix a bug there at the same time where the condition in order to call mpcodecs_config_vo() should only trigger once when the encoded aspect changes. So far, the forced, i.e. current, aspect has been checked. The whole is related to enabling special argument -1 to switch_ratio started in r36391.
author ib
date Wed, 07 Aug 2013 20:41:34 +0000
parents 7b135b3b8b38
children 996d93a5ed1f
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"
33871
30f5e5cd3676 Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents: 33608
diff changeset
30 #include "av_helpers.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
31
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22440
diff changeset
32 #include "stream/stream.h"
30589
df6c41f16b40 Add header for AVI print functions; avoids many forward declarations.
diego
parents: 30505
diff changeset
33 #include "aviprint.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
34 #include "demuxer.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
35 #include "stheader.h"
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
36 #include "m_option.h"
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 32353
diff changeset
37 #include "sub/sub.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
38
26069
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
39 #include "libavformat/avformat.h"
27584
7bc037bccec5 riff.h and avi.h are not needed, but avio.h is.
diego
parents: 27524
diff changeset
40 #include "libavformat/avio.h"
26069
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
41 #include "libavutil/avutil.h"
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
42 #include "libavutil/avstring.h"
33533
3552dac79b1a Add some missing libavutil #includes.
diego
parents: 33236
diff changeset
43 #include "libavutil/mathematics.h"
34550
41574d60dc98 Fix another case where opt.h was included from libavcodec instead of libavutil.
reimar
parents: 34541
diff changeset
44 #include "libavutil/opt.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
45
26328
11aac031b4b7 Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents: 26294
diff changeset
46 #include "mp_taglists.h"
11aac031b4b7 Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents: 26294
diff changeset
47
30904
c449f1667e78 Start probing with a size matching the stream buffer size so it is possible
reimar
parents: 30620
diff changeset
48 #define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE
c449f1667e78 Start probing with a size matching the stream buffer size so it is possible
reimar
parents: 30620
diff changeset
49 #define SMALL_MAX_PROBE_SIZE (32 * 1024)
30505
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
50 #define PROBE_BUF_SIZE (2*1024*1024)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
51
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
52 static unsigned int opt_probesize = 0;
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
53 static unsigned int opt_analyzeduration = 0;
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
54 static char *opt_format;
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
55 static char *opt_cryptokey;
26696
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
56 static char *opt_avopt = NULL;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
57
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 25117
diff changeset
58 const m_option_t lavfdopts_conf[] = {
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
59 {"probesize", &(opt_probesize), CONF_TYPE_INT, CONF_RANGE, 32, INT_MAX, NULL},
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
60 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL},
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
61 {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
62 {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL},
26696
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
63 {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL},
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
64 {NULL, NULL, 0, 0, 0, 0, NULL}
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
65 };
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
66
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
67 #define BIO_BUFFER_SIZE 32768
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
68
31186
439a9130acf5 Drop pointless _t suffix from 'struct lavf_priv'.
diego
parents: 31168
diff changeset
69 typedef struct lavf_priv {
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
70 AVInputFormat *avif;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
71 AVFormatContext *avfc;
33930
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
72 AVIOContext *pb;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
73 int audio_streams;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
74 int video_streams;
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
75 int sub_streams;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
76 int64_t last_pts;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
77 int astreams[MAX_A_STREAMS];
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
78 int vstreams[MAX_V_STREAMS];
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
79 int sstreams[MAX_S_STREAMS];
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
80 int cur_program;
32353
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
81 int nb_streams_last;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
82 }lavf_priv_t;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
83
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
84 static int mp_read(void *opaque, uint8_t *buf, int size) {
31161
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
85 demuxer_t *demuxer = opaque;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
86 stream_t *stream = demuxer->stream;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
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
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
89 ret=stream_read(stream, buf, size);
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
90
31260
9a748502953b Also print current stream position in mp_read debug output.
reimar
parents: 31259
diff changeset
91 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n",
9a748502953b Also print current stream position in mp_read debug output.
reimar
parents: 31259
diff changeset
92 ret, stream, buf, size, stream_tell(stream), stream->eof);
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
93 return ret;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
94 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
95
27656
3029d0e351a5 fix compilation w/ FFmpeg r15533
gpoirier
parents: 27584
diff changeset
96 static int64_t mp_seek(void *opaque, int64_t pos, int whence) {
31161
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
97 demuxer_t *demuxer = opaque;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
98 stream_t *stream = demuxer->stream;
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;
35013
4d94558867d6 Update endpos each time libavformat asks for it.
reimar
parents: 34963
diff changeset
107 else if(whence == AVSEEK_SIZE && stream->end_pos > 0) {
35266
ceb148e1fe31 Change STREAM_CTRL_GET_SIZE argument type from off_t to
reimar
parents: 35024
diff changeset
108 uint64_t size;
35013
4d94558867d6 Update endpos each time libavformat asks for it.
reimar
parents: 34963
diff changeset
109 stream_control(stream, STREAM_CTRL_GET_SIZE, &size);
4d94558867d6 Update endpos each time libavformat asks for it.
reimar
parents: 34963
diff changeset
110 if (size > stream->end_pos)
4d94558867d6 Update endpos each time libavformat asks for it.
reimar
parents: 34963
diff changeset
111 stream->end_pos = size;
24084
2b572bde6b3d Add support for AVSEEK_SIZE in demux_lavf
reimar
parents: 24082
diff changeset
112 return stream->end_pos - stream->start_pos;
35013
4d94558867d6 Update endpos each time libavformat asks for it.
reimar
parents: 34963
diff changeset
113 } else
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
114 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
115
24082
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
116 if(pos<0)
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
117 return -1;
27427
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
118 current_pos = stream_tell(stream);
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
119 if(stream_seek(stream, pos)==0) {
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
120 stream_reset(stream);
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
121 stream_seek(stream, current_pos);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
122 return -1;
27427
a54c51af6595 demux_lavf: fix mp_seek behavior in case of seeking error
aurel
parents: 27219
diff changeset
123 }
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
124
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
125 return pos - stream->start_pos;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
126 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
127
31161
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
128 static int64_t mp_read_seek(void *opaque, int stream_idx, int64_t ts, int flags) {
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
129 demuxer_t *demuxer = opaque;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
130 stream_t *stream = demuxer->stream;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
131 lavf_priv_t *priv = demuxer->priv;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
132 AVStream *st = priv->avfc->streams[stream_idx];
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
133 int ret;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
134 double pts;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
135
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
136 pts = (double)ts * st->time_base.num / st->time_base.den;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
137 ret = stream_control(stream, STREAM_CTRL_SEEK_TO_TIME, &pts);
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
138 if (ret < 0)
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
139 ret = AVERROR(ENOSYS);
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
140 return ret;
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
141 }
0255b5679645 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
hyc
parents: 31133
diff changeset
142
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
143 static void list_formats(void) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
144 AVInputFormat *fmt;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
145 mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n");
33916
7941d02c012b Fix infinite loop in '-demuxer lavf -lavfdopts format=help'
cehoyos
parents: 33915
diff changeset
146 for (fmt = av_iformat_next(NULL); fmt; fmt = av_iformat_next(fmt))
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
147 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
148 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
149
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
150 static int lavf_check_file(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
151 AVProbeData avpd;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
152 lavf_priv_t *priv;
30505
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
153 int probe_data_size = 0;
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
154 int read_size = INITIAL_PROBE_SIZE;
31068
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
155 int score;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
156
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
157 if(!demuxer->priv)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
158 demuxer->priv=calloc(sizeof(lavf_priv_t),1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
159 priv= demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
160
33871
30f5e5cd3676 Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents: 33608
diff changeset
161 init_avformat();
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
162
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
163 if (opt_format) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
164 if (strcmp(opt_format, "help") == 0) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
165 list_formats();
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
166 return 0;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
167 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
168 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
169 if (!priv->avif) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
170 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
171 return 0;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
172 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
173 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
174 return DEMUXER_TYPE_LAVF;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
175 }
29295
25283dc2a86b 100l, do not read probe buffer if it will not be used because a format was forced.
reimar
parents: 29288
diff changeset
176
30505
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
177 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
178 FF_INPUT_BUFFER_PADDING_SIZE);
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
179 do {
30905
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
180 read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size);
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
181 if(read_size < 0) {
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
182 av_free(avpd.buf);
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
183 return 0;
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
184 }
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
185 probe_data_size += read_size;
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
186 avpd.filename= demuxer->stream->url;
31521
7ae298e3ba15 Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents: 31260
diff changeset
187 if (!avpd.filename) {
7ae298e3ba15 Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents: 31260
diff changeset
188 mp_msg(MSGT_DEMUX, MSGL_WARN, "Stream url is not set!\n");
7ae298e3ba15 Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents: 31260
diff changeset
189 avpd.filename = "";
7ae298e3ba15 Avoid a crash if stream->url is not set, but print a warning since this
reimar
parents: 31260
diff changeset
190 }
30905
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
191 if (!strncmp(avpd.filename, "ffmpeg://", 9))
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
192 avpd.filename += 9;
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
193 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
194
31068
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
195 score = 0;
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
196 priv->avif= av_probe_input_format2(&avpd, probe_data_size > 0, &score);
30905
6ca66cec8a15 Reindent
reimar
parents: 30904
diff changeset
197 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
198 } 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
199 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
200 score <= AVPROBE_SCORE_MAX / 4 &&
31068
ae2e8f0d4625 Use av_probe_input_format2 and avoid accepting detection
reimar
parents: 30905
diff changeset
201 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
202 av_free(avpd.buf);
580319e640b3 Dynamically increase probe size for lavf demuxer up to 2 MB.
reimar
parents: 30458
diff changeset
203
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
204 if(!priv->avif){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
205 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
206 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
207 }else
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
208 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
209
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
210 return DEMUXER_TYPE_LAVF;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
211 }
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
212
34658
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
213 /* Before adding anything to this list please stop and consider why.
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
214 * There are two good reasons
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
215 * 1) to reduce startup time when streaming these file types
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
216 * 2) workarounds around bugs in our native demuxers that are not reasonable to
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
217 * fix
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
218 * For the case 2) that means the issue should be understood well
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
219 * enough to be able to decide that a fix is not reasonable.
4b4f769fe687 demux_lavf: Explain under which conditions to add demuxers to preferred_list.
reimar
parents: 34657
diff changeset
220 */
29296
8fa7fb4ae9ef Add const where appropriate, also gets rid of a compiler warning.
reimar
parents: 29295
diff changeset
221 static const char * const preferred_list[] = {
34657
812c3528724b Use -demuxer lavf for cdxl files.
cehoyos
parents: 34550
diff changeset
222 "cdxl",
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
223 "dxa",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
224 "flv",
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
225 "gxf",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
226 "nut",
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
227 "nuv",
31812
88eef0d997e4 Update for libavformat matroska demuxer name change.
reimar
parents: 31643
diff changeset
228 "matroska,webm",
25846
f3ae700cc317 Prefer lavf mov demuxer over our own, it should work better most of the time now.
reimar
parents: 25843
diff changeset
229 "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
230 "mpc",
38b8096cae32 Prefer libavformat musepack demuxer over internal one (which does not even support v8).
reimar
parents: 26328
diff changeset
231 "mpc8",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
232 "mxf",
31168
a0e901aedb04 Switch ogg demuxing to lavf by default.
reimar
parents: 31161
diff changeset
233 "ogg",
34109
65c9b97eae61 Add PVA to lavf preferred formats list, its demuxer seems to work well
reimar
parents: 33932
diff changeset
234 "pva",
34253
c363052bde0b Fix .qcp (raw QCELP) playback.
cehoyos
parents: 34155
diff changeset
235 "qcp",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
236 "swf",
29613
7386b883fba6 Add support for lavf vqf demuxer and lavc TwinVQ decoder.
vitor
parents: 29551
diff changeset
237 "vqf",
29626
2a2bc7ee5b81 Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
reimar
parents: 29625
diff changeset
238 "w64",
29625
aaf67d00ae75 Sort preferred_list alphabetically since the order does not matter otherwise.
reimar
parents: 29622
diff changeset
239 "wv",
32611
3f043f0a4ac9 Prefer yuv4mpeg via libavformat, since that one supports multiple
reimar
parents: 32572
diff changeset
240 "yuv4mpegpipe",
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
241 NULL
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
242 };
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
243
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
244 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
245 if (lavf_check_file(demuxer)) {
29296
8fa7fb4ae9ef Add const where appropriate, also gets rid of a compiler warning.
reimar
parents: 29295
diff changeset
246 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
247 lavf_priv_t *priv = demuxer->priv;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
248 while (*p) {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
249 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
250 return DEMUXER_TYPE_LAVF_PREFERRED;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
251 p++;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
252 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
253 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
254 return 0;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
255 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
256
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
257 static uint8_t char2int(char c) {
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
258 if (c >= '0' && c <= '9') return c - '0';
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
259 if (c >= 'a' && c <= 'f') return c - 'a' + 10;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
260 if (c >= 'A' && c <= 'F') return c - 'A' + 10;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
261 return 0;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
262 }
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
263
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
264 static void parse_cryptokey(AVFormatContext *avfc, const char *str) {
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
265 int len = strlen(str) / 2;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
266 uint8_t *key = av_mallocz(len);
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
267 int i;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
268 avfc->keylen = len;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
269 avfc->key = key;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
270 for (i = 0; i < len; i++, str += 2)
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
271 *key++ = (char2int(str[0]) << 4) | char2int(str[1]);
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
272 }
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
273
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
274 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
275 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
276 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
277 AVCodecContext *codec= st->codec;
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
278 char *stream_type = NULL;
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
279 int stream_id;
33930
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
280 AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
281 AVDictionaryEntry *title= av_dict_get(st->metadata, "title", NULL, 0);
35328
5e22bb28e6b7 Print rotation information as identify msg
upsuper
parents: 35266
diff changeset
282 AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate", NULL, 0);
34155
505b49b171f4 Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents: 34109
diff changeset
283 int g;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
284
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 switch(codec->codec_type){
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
286 case AVMEDIA_TYPE_AUDIO:{
29343
28486169f9e0 Move allocation to avoid a possible memleak if new_sh_audio fails.
reimar
parents: 29342
diff changeset
287 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
288 sh_audio_t* sh_audio;
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31602
diff changeset
289 sh_audio = new_sh_audio_aid(demuxer, i, priv->audio_streams, lang ? lang->value : NULL);
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
290 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
291 break;
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
292 stream_type = "audio";
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
293 priv->astreams[priv->audio_streams] = i;
32111
7c8d240d37a6 Replace sizeof(type)
reimar
parents: 31950
diff changeset
294 wf= calloc(sizeof(*wf) + codec->extradata_size, 1);
34155
505b49b171f4 Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents: 34109
diff changeset
295 codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 1);
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
296 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
297 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
298 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
299 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
300 wf->nBlockAlign= codec->block_align ? codec->block_align : 1;
27516
3364aef9a988 Fix compilation after libavcodec major version 52 changes
uau
parents: 27493
diff changeset
301 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
302 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
303 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
304 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
305 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
306 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
307 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
308 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
309 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
310 }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
311 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
312 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
313 }
28303
44d67f7f8eb3 Fix compilation: s/ff_gcd/av_gcd.
cehoyos
parents: 28051
diff changeset
314 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
315 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
316 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
317 // 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
318 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
319 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
320 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
321 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
322 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
323 switch (codec->codec_id) {
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
324 case AV_CODEC_ID_PCM_S8:
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
325 case AV_CODEC_ID_PCM_U8:
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
326 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
327 break;
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
328 case AV_CODEC_ID_PCM_S16LE:
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
329 case AV_CODEC_ID_PCM_S16BE:
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
330 case AV_CODEC_ID_PCM_U16LE:
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
331 case AV_CODEC_ID_PCM_U16BE:
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
332 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
333 break;
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
334 case AV_CODEC_ID_PCM_ALAW:
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
335 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
336 break;
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
337 case AV_CODEC_ID_PCM_MULAW:
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
338 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
339 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
340 }
31073
c35d122852da add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents: 31072
diff changeset
341 if (title && title->value)
c35d122852da add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents: 31072
diff changeset
342 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_NAME=%s\n", priv->audio_streams, title->value);
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
343 if (st->disposition & AV_DISPOSITION_DEFAULT)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
344 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
345 if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V);
32491
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
346 // select the first audio stream if auto-selection is requested
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
347 if (demuxer->audio->id == -1) {
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
348 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
349 demuxer->audio->sh= demuxer->a_streams[i];
32491
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
350 }
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
351 if (demuxer->audio->id != i)
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
352 st->discard= AVDISCARD_ALL;
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
353 stream_id = priv->audio_streams++;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
354 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
355 }
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
356 case AVMEDIA_TYPE_VIDEO:{
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
357 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
358 BITMAPINFOHEADER *bih;
31074
84a83cc32f99 10l: correctly use video_stream instead of audio_stream in the video section
aurel
parents: 31073
diff changeset
359 sh_video=new_sh_video_vid(demuxer, i, priv->video_streams);
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
360 if(!sh_video) break;
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
361 stream_type = "video";
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
362 priv->vstreams[priv->video_streams] = i;
32111
7c8d240d37a6 Replace sizeof(type)
reimar
parents: 31950
diff changeset
363 bih=calloc(sizeof(*bih) + codec->extradata_size,1);
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
364
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
365 if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) {
26294
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
366 switch (codec->pix_fmt) {
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
367 case PIX_FMT_RGB24:
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
368 codec->codec_tag= MKTAG(24, 'B', 'G', 'R');
35533
a51fc69ae1b3 Add missing break.
upsuper
parents: 35447
diff changeset
369 break;
32572
e645d2d9e0db Add support for uncompressed BGR24 pixfmt.
reimar
parents: 32493
diff changeset
370 case PIX_FMT_BGR24:
e645d2d9e0db Add support for uncompressed BGR24 pixfmt.
reimar
parents: 32493
diff changeset
371 codec->codec_tag= MKTAG(24, 'R', 'G', 'B');
35533
a51fc69ae1b3 Add missing break.
upsuper
parents: 35447
diff changeset
372 break;
26294
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
373 }
42bb503a2522 Set correct codec tag for raw rgb in mov, fixes
reimar
parents: 26269
diff changeset
374 }
34155
505b49b171f4 Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents: 34109
diff changeset
375 codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 0);
32111
7c8d240d37a6 Replace sizeof(type)
reimar
parents: 31950
diff changeset
376 bih->biSize= sizeof(*bih) + codec->extradata_size;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
377 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
378 bih->biHeight= codec->height;
35421
301d578b9142 Always set BITMAPINFOHEADER field biPlanes to 1, the only allowed value.
cehoyos
parents: 35328
diff changeset
379 bih->biPlanes= 1;
27516
3364aef9a988 Fix compilation after libavcodec major version 52 changes
uau
parents: 27493
diff changeset
380 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
381 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
382 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
383 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
384 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
385 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
386 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
387 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
388 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
389 } 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
390 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
391 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
392 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
393 sh_video->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
394 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
395 sh_video->format=bih->biCompression;
27447
d35a61df7122 use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents: 27427
diff changeset
396 if(st->sample_aspect_ratio.num)
36316
139f2b064ef9 Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents: 36310
diff changeset
397 sh_video->original_aspect = codec->width * st->sample_aspect_ratio.num
27447
d35a61df7122 use new lavf API to grab sample_aspect_ratio from the demuxers
aurel
parents: 27427
diff changeset
398 / (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
399 else
36316
139f2b064ef9 Don't subsequently calculate original_aspect from last movie_aspect.
ib
parents: 36310
diff changeset
400 sh_video->original_aspect = codec->width * codec->sample_aspect_ratio.num
27448
5137a84907a1 cosmetics: indentation
aurel
parents: 27447
diff changeset
401 / (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
402 sh_video->i_bps=codec->bit_rate/8;
31073
c35d122852da add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents: 31072
diff changeset
403 if (title && title->value)
c35d122852da add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents: 31072
diff changeset
404 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VID_%d_NAME=%s\n", priv->video_streams, title->value);
35328
5e22bb28e6b7 Print rotation information as identify msg
upsuper
parents: 35266
diff changeset
405 if (rot && rot->value)
5e22bb28e6b7 Print rotation information as identify msg
upsuper
parents: 35266
diff changeset
406 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VID_%d_ROTATE=%s\n", priv->video_streams, rot->value);
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
407 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
408 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
409 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
410
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 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
412 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
413 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
414 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
415 /*
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
416 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
417 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
418 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
419 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
420 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
421 */
32491
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
422 // select the first video stream if auto-selection is requested
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
423 if(demuxer->video->id == -1) {
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
424 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
425 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
426 }
32491
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
427 if(demuxer->video->id != i)
90206ba16fec Set st->discard in the same way for audio and video, fixes -aid no
reimar
parents: 32467
diff changeset
428 st->discard= AVDISCARD_ALL;
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
429 stream_id = priv->video_streams++;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
430 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
431 }
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
432 case AVMEDIA_TYPE_SUBTITLE:{
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
433 sh_sub_t* sh_sub;
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
434 char type;
35720
7c91c2a669f4 demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one
diego
parents: 35715
diff changeset
435 if (codec->codec_id == AV_CODEC_ID_TEXT
7c91c2a669f4 demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one
diego
parents: 35715
diff changeset
436 #if LIBAVUTIL_VERSION_MICRO >= 100
7c91c2a669f4 demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one
diego
parents: 35715
diff changeset
437 || codec->codec_id == AV_CODEC_ID_SUBRIP
7c91c2a669f4 demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one
diego
parents: 35715
diff changeset
438 #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
7c91c2a669f4 demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one
diego
parents: 35715
diff changeset
439 )
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
440 type = 't';
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
441 else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT)
25879
7b82d835bed1 Support CODEC_ID_MOV_TEXT
reimar
parents: 25846
diff changeset
442 type = 'm';
36078
c297c1a78ae6 Add support for AV_CODEC_ID_ASS.
cboesch
parents: 35829
diff changeset
443 else if (codec->codec_id == AV_CODEC_ID_SSA
c297c1a78ae6 Add support for AV_CODEC_ID_ASS.
cboesch
parents: 35829
diff changeset
444 #if LIBAVUTIL_VERSION_MICRO >= 100
c297c1a78ae6 Add support for AV_CODEC_ID_ASS.
cboesch
parents: 35829
diff changeset
445 || codec->codec_id == AV_CODEC_ID_ASS
c297c1a78ae6 Add support for AV_CODEC_ID_ASS.
cboesch
parents: 35829
diff changeset
446 #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
c297c1a78ae6 Add support for AV_CODEC_ID_ASS.
cboesch
parents: 35829
diff changeset
447 )
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
448 type = 'a';
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
449 else if (codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE)
25839
327e98d7d2be Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents: 25789
diff changeset
450 type = 'v';
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
451 else if (codec->codec_id == AV_CODEC_ID_XSUB)
31628
f15df2e3081b Add support for DVB and XSUB subtitles, not yet working properly.
reimar
parents: 31609
diff changeset
452 type = 'x';
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
453 else if (codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
31628
f15df2e3081b Add support for DVB and XSUB subtitles, not yet working properly.
reimar
parents: 31609
diff changeset
454 type = 'b';
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
455 else if (codec->codec_id == AV_CODEC_ID_DVB_TELETEXT)
29807
fe38b68ae9f4 Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
cehoyos
parents: 29805
diff changeset
456 type = 'd';
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
457 else if (codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE)
31599
cafeb7863de8 Add support for PGS subtitle decoding via libavcodec.
reimar
parents: 31588
diff changeset
458 type = 'p';
35720
7c91c2a669f4 demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one
diego
parents: 35715
diff changeset
459 #if LIBAVUTIL_VERSION_MICRO >= 100
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
460 else if (codec->codec_id == AV_CODEC_ID_EIA_608)
34761
02a03e00341e Support EIA-608 captions in MOV.
reimar
parents: 34760
diff changeset
461 type = 'c';
35720
7c91c2a669f4 demux_lavf: Fix CODEC_ID availability ifdefs and add a missing one
diego
parents: 35715
diff changeset
462 #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
34761
02a03e00341e Support EIA-608 captions in MOV.
reimar
parents: 34760
diff changeset
463 else if(codec->codec_tag == MKTAG('c', '6', '0', '8'))
02a03e00341e Support EIA-608 captions in MOV.
reimar
parents: 34760
diff changeset
464 type = 'c';
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
465 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
466 break;
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31602
diff changeset
467 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams, lang ? lang->value : NULL);
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
468 if(!sh_sub) break;
31080
5127b49cb2bf cosmetic: typo, this wasn't supposed to be plural
aurel
parents: 31075
diff changeset
469 stream_type = "subtitle";
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
470 priv->sstreams[priv->sub_streams] = i;
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
471 sh_sub->type = type;
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
472 if (codec->extradata_size) {
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
473 sh_sub->extradata = malloc(codec->extradata_size);
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
474 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size);
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
475 sh_sub->extradata_len = codec->extradata_size;
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
476 }
31073
c35d122852da add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents: 31072
diff changeset
477 if (title && title->value)
c35d122852da add ID_..._NAME to -identify for each lavf stream which has a title
aurel
parents: 31072
diff changeset
478 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_NAME=%s\n", priv->sub_streams, title->value);
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
479 if (st->disposition & AV_DISPOSITION_DEFAULT)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
480 sh_sub->default_track = 1;
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
481 stream_id = priv->sub_streams++;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
482 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
483 }
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
484 case AVMEDIA_TYPE_ATTACHMENT:{
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35604
diff changeset
485 if (st->codec->codec_id == AV_CODEC_ID_TTF) {
33930
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
486 AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0);
33190
0220b3e9d5c5 Use metadata tag API to get attachment filename.
reimar
parents: 32768
diff changeset
487 demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL,
25900
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
488 "application/x-truetype-font",
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
489 codec->extradata, codec->extradata_size);
33190
0220b3e9d5c5 Use metadata tag API to get attachment filename.
reimar
parents: 32768
diff changeset
490 }
25900
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
491 break;
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
492 }
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
493 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
494 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
495 }
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
496 if (stream_type) {
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
497 AVCodec *avc = avcodec_find_decoder(codec->codec_id);
31925
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31812
diff changeset
498 const char *codec_name = avc ? avc->name : "unknown";
33576
c97ec47d1bbb Fix printing of subtitle type, the wrong index was used to lookup the type.
reimar
parents: 33533
diff changeset
499 if (!avc && *stream_type == 's' && demuxer->s_streams[i])
c97ec47d1bbb Fix printing of subtitle type, the wrong index was used to lookup the type.
reimar
parents: 33533
diff changeset
500 codec_name = sh_sub_type2str(((sh_sub_t *)demuxer->s_streams[i])->type);
31925
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31812
diff changeset
501 mp_msg(MSGT_DEMUX, MSGL_INFO, "[lavf] stream %d: %s (%s), -%cid %d", i, stream_type, codec_name, *stream_type, stream_id);
31075
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
502 if (lang && lang->value && *stream_type != 'v')
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
503 mp_msg(MSGT_DEMUX, MSGL_INFO, ", -%clang %s", *stream_type, lang->value);
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
504 if (title && title->value)
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
505 mp_msg(MSGT_DEMUX, MSGL_INFO, ", %s", title->value);
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
506 mp_msg(MSGT_DEMUX, MSGL_INFO, "\n");
a259f3d8694d print a more detailed and more useful description of each stream with lavf
aurel
parents: 31074
diff changeset
507 }
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
508 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
509
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
510 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
511 AVFormatContext *avfc;
33930
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
512 AVDictionaryEntry *t = NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
513 lavf_priv_t *priv= demuxer->priv;
24868
751455d3abbe Remove unused variable:
diego
parents: 24848
diff changeset
514 int i;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
515 char mp_filename[256]="mp:";
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
516
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
517 stream_seek(demuxer->stream, 0);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
518
29917
fef2308ae98e av_alloc_format_context -> avformat_alloc_context
reimar
parents: 29911
diff changeset
519 avfc = avformat_alloc_context();
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
520
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
521 if (opt_cryptokey)
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
522 parse_cryptokey(avfc, opt_cryptokey);
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25900
diff changeset
523 if (user_correct_pts != 0)
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
524 avfc->flags |= AVFMT_FLAG_GENPTS;
21568
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
525 if (index_mode == 0)
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
526 avfc->flags |= AVFMT_FLAG_IGNIDX;
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
527
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
528 if(opt_probesize) {
34526
506577fd3e07 Replace deprecated av_set_int.
reimar
parents: 34525
diff changeset
529 if (av_opt_set_int(avfc, "probesize", opt_probesize, 0) < 0)
506577fd3e07 Replace deprecated av_set_int.
reimar
parents: 34525
diff changeset
530 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
531 }
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
532 if(opt_analyzeduration) {
34526
506577fd3e07 Replace deprecated av_set_int.
reimar
parents: 34525
diff changeset
533 if (av_opt_set_int(avfc, "analyzeduration", opt_analyzeduration * AV_TIME_BASE, 0) < 0)
506577fd3e07 Replace deprecated av_set_int.
reimar
parents: 34525
diff changeset
534 mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option analyzeduration to %u\n", opt_analyzeduration);
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
535 }
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
536
26696
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
537 if(opt_avopt){
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
538 if(parse_avopts(avfc, opt_avopt) < 0){
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
539 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
540 return NULL;
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
541 }
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
542 }
53b6cf6b971d AVOption support for lavf demuxing
michael
parents: 26423
diff changeset
543
30456
0eee9d2e7a1d Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
reimar
parents: 30092
diff changeset
544 if(demuxer->stream->url) {
35829
66bbe17c4abc demux_lavf: fix up all ffmpeg:// URLs.
reimar
parents: 35720
diff changeset
545 if (!strncmp(demuxer->stream->url, "ffmpeg://", 9))
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
546 av_strlcpy(mp_filename, demuxer->stream->url + 9, sizeof(mp_filename));
36303
b50212f27ffa Add support for rtsp:// falling back to support via FFmpeg.
reimar
parents: 36301
diff changeset
547 else if (!strncmp(demuxer->stream->url, "rtsp://", 7))
b50212f27ffa Add support for rtsp:// falling back to support via FFmpeg.
reimar
parents: 36301
diff changeset
548 av_strlcpy(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
549 else
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
550 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
551 } else
30458
f6721168aee8 Replace incorrect usage of strncpy.
reimar
parents: 30457
diff changeset
552 av_strlcat(mp_filename, "foobar.dummy", sizeof(mp_filename));
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
553
33607
a761fc66ddc7 Do not set priv->pb for AVFMT_NOFILE formats, this now causes FFmpeg to error out.
reimar
parents: 33576
diff changeset
554 if (!(priv->avif->flags & AVFMT_NOFILE)) {
36306
97638800c6f3 Fix and simplify alloc/free of AVIO buffer.
reimar
parents: 36303
diff changeset
555 uint8_t *buffer = av_mallocz(BIO_BUFFER_SIZE);
97638800c6f3 Fix and simplify alloc/free of AVIO buffer.
reimar
parents: 36303
diff changeset
556 priv->pb = avio_alloc_context(buffer, BIO_BUFFER_SIZE, 0,
33930
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
557 demuxer, mp_read, NULL, mp_seek);
33608
3348a9e99214 Indentation fixes.
reimar
parents: 33607
diff changeset
558 priv->pb->read_seek = mp_read_seek;
34541
bdda068ba0a0 Only set "seekable", not "is_streamed" for compatibility with
reimar
parents: 34527
diff changeset
559 if (!demuxer->stream->end_pos || (demuxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK)
bdda068ba0a0 Only set "seekable", not "is_streamed" for compatibility with
reimar
parents: 34527
diff changeset
560 priv->pb->seekable = 0;
33932
11bdb6b598c0 Simplify by using avformat_open_input instead of av_open_input_stream.
reimar
parents: 33931
diff changeset
561 avfc->pb = priv->pb;
33607
a761fc66ddc7 Do not set priv->pb for AVFMT_NOFILE formats, this now causes FFmpeg to error out.
reimar
parents: 33576
diff changeset
562 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
563
33932
11bdb6b598c0 Simplify by using avformat_open_input instead of av_open_input_stream.
reimar
parents: 33931
diff changeset
564 if(avformat_open_input(&avfc, mp_filename, priv->avif, NULL)<0){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
565 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
566 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
567 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
568
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
569 priv->avfc= avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
570
33931
7aea0eb3ecbe 100l, fix compilation.
reimar
parents: 33930
diff changeset
571 if(avformat_find_stream_info(avfc, NULL) < 0){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
572 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
573 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
574 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
575
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
576 /* Add metadata. */
34525
7e1d9cf6a0db Replace deprecated/removed AV_METADATA_IGNORE_SUFFIX.
reimar
parents: 34253
diff changeset
577 while((t = av_dict_get(avfc->metadata, "", t, AV_DICT_IGNORE_SUFFIX)))
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
578 demux_info_add(demuxer, t->key, t->value);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
579
27058
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
580 for(i=0; i < avfc->nb_chapters; i++) {
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
581 AVChapter *c = avfc->chapters[i];
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
582 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
583 uint64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1,1000});
33930
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
584 t = av_dict_get(c->metadata, "title", NULL, 0);
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
585 demuxer_add_chapter(demuxer, t ? t->value : NULL, start, end);
27058
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
586 }
2f4343465df1 Chapter support for lavf demuxer.
reimar
parents: 26742
diff changeset
587
29615
70404a7bebaf Always register all streams from libavformat, not just those belonging to a program.
reimar
parents: 29613
diff changeset
588 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
589 handle_stream(demuxer, avfc, i);
32353
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
590 priv->nb_streams_last = avfc->nb_streams;
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
591
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
592 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
593 int p;
b9350576d4fc Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
reimar
parents: 29803
diff changeset
594 for (p = 0; p < avfc->nb_programs; p++) {
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
595 AVProgram *program = avfc->programs[p];
33930
db545d85bb11 Replace easy to change deprecated functionality.
reimar
parents: 33916
diff changeset
596 t = av_dict_get(program->metadata, "title", NULL, 0);
29455
7e16dc5c741b Use new libavformat metadata API.
greg
parents: 29344
diff changeset
597 mp_msg(MSGT_HEADER,MSGL_INFO,"LAVF: Program %d %s\n", program->id, t ? t->value : "");
32492
5fc287bf541a Print PROGRAM_ID -identify output similar to demux_ts
reimar
parents: 32491
diff changeset
598 mp_msg(MSGT_IDENTIFY, MSGL_V, "PROGRAM_ID=%d\n", program->id);
29805
b9350576d4fc Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
reimar
parents: 29803
diff changeset
599 }
29615
70404a7bebaf Always register all streams from libavformat, not just those belonging to a program.
reimar
parents: 29613
diff changeset
600 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
601
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
602 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
603 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
604 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
605 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
606 if(!priv->video_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
607 if(!priv->audio_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
608 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n");
35447
825d6e1cad3e demux_lavf: support subtitle-only formats.
reimar
parents: 35421
diff changeset
609 if (!priv->sub_streams)
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
610 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
611 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
612 demuxer->video->id=-2; // audio-only
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
613 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
614
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
615 return demuxer;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
616 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
617
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
618 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
619 lavf_priv_t *priv= demux->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
620 AVPacket pkt;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
621 demux_packet_t *dp;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
622 demux_stream_t *ds;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
623 int id;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
624 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
625
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
626 demux->filepos=stream_tell(demux->stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
627
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
628 if(av_read_frame(priv->avfc, &pkt) < 0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
629 return 0;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
630
32353
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
631 // handle any new streams that might have been added
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
632 for (id = priv->nb_streams_last; id < priv->avfc->nb_streams; id++)
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
633 handle_stream(demux, priv->avfc, id);
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
634 priv->nb_streams_last = priv->avfc->nb_streams;
a5ed4bcb1149 Handle libavformat adding additional streams during playback.
reimar
parents: 32111
diff changeset
635
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
636 id= pkt.stream_index;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
637
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
638 if(id==demux->audio->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
639 // audio
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
640 ds=demux->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
641 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
642 ds->sh=demux->a_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
643 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
644 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
645 } else if(id==demux->video->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
646 // video
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
647 ds=demux->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
648 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
649 ds->sh=demux->v_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
650 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
651 }
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
652 } else if(id==demux->sub->id){
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
653 // subtitle
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
654 ds=demux->sub;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
655 sub_utf8=1;
14611
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
656 } else {
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
657 av_free_packet(&pkt);
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
658 return 1;
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
659 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
660
31588
e8bb6ecadfbc 1 memcpy less in lavf demuxing.
michael
parents: 31576
diff changeset
661 if(pkt.destruct == av_destruct_packet && !CONFIG_MEMALIGN_HACK){
31643
33be6a8f9197 Avoid incorrectly duplicating initialization code in new_demux_packet,
reimar
parents: 31628
diff changeset
662 dp=new_demux_packet(0);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
663 dp->len=pkt.size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
664 dp->buffer=pkt.data;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
665 pkt.destruct= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
666 }else{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
667 dp=new_demux_packet(pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
668 memcpy(dp->buffer, pkt.data, pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
669 av_free_packet(&pkt);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
670 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
671
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
672 if(pkt.pts != AV_NOPTS_VALUE){
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
673 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
674 priv->last_pts= dp->pts * AV_TIME_BASE;
34963
0ba5ba56f6d0 demux_lavf: Set endpts from AVPacket.duration
al
parents: 34761
diff changeset
675 if(pkt.duration > 0)
0ba5ba56f6d0 demux_lavf: Set endpts from AVPacket.duration
al
parents: 34761
diff changeset
676 dp->endpts = dp->pts + pkt.duration * av_q2d(priv->avfc->streams[id]->time_base);
0ba5ba56f6d0 demux_lavf: Set endpts from AVPacket.duration
al
parents: 34761
diff changeset
677 /* subtitle durations are sometimes stored in convergence_duration */
0ba5ba56f6d0 demux_lavf: Set endpts from AVPacket.duration
al
parents: 34761
diff changeset
678 if(ds == demux->sub && pkt.convergence_duration > 0)
27493
a126c38cb1c7 lavf: the subtitles display duration is stored in pkt.convergence_duration
aurel
parents: 27452
diff changeset
679 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
680 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
681 dp->pos=demux->filepos;
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
682 dp->flags= !!(pkt.flags&AV_PKT_FLAG_KEY);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
683 // append packet to DS stream:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
684 ds_add_packet(ds,dp);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
685 return 1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
686 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
687
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
688 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
689 lavf_priv_t *priv = demuxer->priv;
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
690 int avsflags = 0;
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
691 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
692
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25879
diff changeset
693 if (flags & SEEK_ABSOLUTE) {
33236
889bde9a7c11 Improve seeking for files where start_time is not (properly) set.
reimar
parents: 33190
diff changeset
694 priv->last_pts = priv->avfc->start_time != AV_NOPTS_VALUE ?
889bde9a7c11 Improve seeking for files where start_time is not (properly) set.
reimar
parents: 33190
diff changeset
695 priv->avfc->start_time : 0;
25842
f8fe66772c3a Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents: 25841
diff changeset
696 }
35604
5be881b963ec Add comment why seeking backward flag is used when
reimar
parents: 35603
diff changeset
697 // This is important also for SEEK_ABSOLUTE because seeking
5be881b963ec Add comment why seeking backward flag is used when
reimar
parents: 35603
diff changeset
698 // is done by dts, while start_time is relative to pts and thus
5be881b963ec Add comment why seeking backward flag is used when
reimar
parents: 35603
diff changeset
699 // usually too large.
35603
ff4d8445f93e Set AVSEEK_FLAG_BACKWARD also when seeking to the start of a file.
reimar
parents: 35533
diff changeset
700 if (rel_seek_secs <= 0) avsflags = AVSEEK_FLAG_BACKWARD;
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25879
diff changeset
701 if (flags & SEEK_FACTOR) {
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
702 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
703 return;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
704 priv->last_pts += rel_seek_secs * priv->avfc->duration;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
705 } else {
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
706 priv->last_pts += rel_seek_secs * AV_TIME_BASE;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
707 }
29699
3819fcdeaaf8 lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents: 29626
diff changeset
708 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
709 avsflags ^= AVSEEK_FLAG_BACKWARD;
3819fcdeaaf8 lavf: if seeking in the desired direction failed, also try in the opposite one,
reimar
parents: 29626
diff changeset
710 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
711 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
712 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
713
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
714 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
715 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
716 lavf_priv_t *priv = demuxer->priv;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
717
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
718 switch (cmd) {
30091
1368993fb7a9 Revert r30100: It breaks some mov and asf samples.
cehoyos
parents: 30058
diff changeset
719 case DEMUXER_CTRL_CORRECT_PTS:
1368993fb7a9 Revert r30100: It breaks some mov and asf samples.
cehoyos
parents: 30058
diff changeset
720 return DEMUXER_CTRL_OK;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
721 case DEMUXER_CTRL_GET_TIME_LENGTH:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
722 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
723 return DEMUXER_CTRL_DONTKNOW;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
724
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16175
diff changeset
725 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
726 return DEMUXER_CTRL_OK;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
727
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
728 case DEMUXER_CTRL_GET_PERCENT_POS:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
729 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
730 return DEMUXER_CTRL_DONTKNOW;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
731
19160
ccb42ce33c23 Take start time into consideration when calculation percentage position
reimar
parents: 19073
diff changeset
732 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration);
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
733 return DEMUXER_CTRL_OK;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
734 case DEMUXER_CTRL_SWITCH_AUDIO:
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
735 case DEMUXER_CTRL_SWITCH_VIDEO:
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
736 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
737 int id = *((int*)arg);
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
738 int newid = -2;
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
739 int i, curridx = -1;
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
740 int nstreams, *pstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
741 demux_stream_t *ds;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
742
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
743 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO)
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
744 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
745 ds = demuxer->video;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
746 nstreams = priv->video_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
747 pstreams = priv->vstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
748 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
749 else
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
750 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
751 ds = demuxer->audio;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
752 nstreams = priv->audio_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
753 pstreams = priv->astreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
754 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
755 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
756 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
757 if(pstreams[i] == ds->id) //current stream id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
758 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
759 curridx = i;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
760 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
761 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
762 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
763
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
764 if(id == -2) { // no sound
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
765 i = -1;
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
766 } else if(id == -1) { // next track
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
767 i = (curridx + 2) % (nstreams + 1) - 1;
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
768 if (i >= 0)
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
769 newid = pstreams[i];
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
770 }
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
771 else // select track by id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
772 {
31072
b8cccda750cf uniformize handling of aid and vid with lavf so that it matches handling of sid
aurel
parents: 31069
diff changeset
773 if (id >= 0 && id < nstreams) {
b8cccda750cf uniformize handling of aid and vid with lavf so that it matches handling of sid
aurel
parents: 31069
diff changeset
774 i = id;
b8cccda750cf uniformize handling of aid and vid with lavf so that it matches handling of sid
aurel
parents: 31069
diff changeset
775 newid = pstreams[i];
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
776 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
777 }
24843
2bd6d730782f permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents: 24842
diff changeset
778 if(i == curridx)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
779 return DEMUXER_CTRL_NOTIMPL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
780 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
781 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
782 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
783 if(ds->id >= 0)
24848
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
784 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
785 *((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
786 if(newid >= 0)
24848
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
787 priv->avfc->streams[newid]->discard = AVDISCARD_NONE;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
788 return DEMUXER_CTRL_OK;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
789 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
790 }
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
791 case DEMUXER_CTRL_IDENTIFY_PROGRAM:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
792 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
793 demux_program_t *prog = arg;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
794 AVProgram *program;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
795 int p, i;
29618
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
796 int start;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
797
29803
3b42ce7b09cf Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
reimar
parents: 29699
diff changeset
798 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
799 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
800 return DEMUXER_CTRL_DONTKNOW;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
801
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
802 if(prog->progid == -1)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
803 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
804 p = 0;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
805 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
806 p++;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
807 p = (p + 1) % priv->avfc->nb_programs;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
808 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
809 else
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
810 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
811 for(i=0; i<priv->avfc->nb_programs; i++)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
812 if(priv->avfc->programs[i]->id == prog->progid)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
813 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
814 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
815 return DEMUXER_CTRL_DONTKNOW;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
816 p = i;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
817 }
29618
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
818 start = p;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
819 redo:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
820 program = priv->avfc->programs[p];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
821 for(i=0; i<program->nb_stream_indexes; i++)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
822 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
823 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
824 {
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
825 case AVMEDIA_TYPE_VIDEO:
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
826 if(prog->vid == -2)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
827 prog->vid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
828 break;
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
829 case AVMEDIA_TYPE_AUDIO:
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
830 if(prog->aid == -2)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
831 prog->aid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
832 break;
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32766
diff changeset
833 case AVMEDIA_TYPE_SUBTITLE:
35023
6077de703cf4 When switching programs select subtitle stream regardless of
reimar
parents: 35013
diff changeset
834 if(prog->sid == -2)
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
835 prog->sid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
836 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
837 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
838 }
32493
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
839 if (prog->aid >= 0 && prog->aid < MAX_A_STREAMS &&
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
840 demuxer->a_streams[prog->aid]) {
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
841 sh_audio_t *sh = demuxer->a_streams[prog->aid];
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
842 prog->aid = sh->aid;
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
843 } else
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
844 prog->aid = -2;
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
845 if (prog->vid >= 0 && prog->vid < MAX_V_STREAMS &&
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
846 demuxer->v_streams[prog->vid]) {
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
847 sh_video_t *sh = demuxer->v_streams[prog->vid];
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
848 prog->vid = sh->vid;
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
849 } else
59b6fef90241 Fix program switching with -demuxer lavf.
reimar
parents: 32492
diff changeset
850 prog->vid = -2;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
851 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
852 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
853 p = (p + 1) % priv->avfc->nb_programs;
29618
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
854 if (p == start)
1a4d159c0436 Fix an endless loop if all programs are empty.
reimar
parents: 29615
diff changeset
855 return DEMUXER_CTRL_DONTKNOW;
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
856 goto redo;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
857 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
858 priv->cur_program = prog->progid = program->id;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
859 return DEMUXER_CTRL_OK;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
860 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
861 default:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
862 return DEMUXER_CTRL_NOTIMPL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
863 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
864 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
865
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
866 static void demux_close_lavf(demuxer_t *demuxer)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
867 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
868 lavf_priv_t* priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
869 if (priv){
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
870 if(priv->avfc)
33608
3348a9e99214 Indentation fixes.
reimar
parents: 33607
diff changeset
871 {
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
872 av_freep(&priv->avfc->key);
34527
11c8d827b55e Replace deprecated/removed av_close_input_stream.
reimar
parents: 34526
diff changeset
873 avformat_close_input(&priv->avfc);
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
874 }
36310
7b135b3b8b38 Avoid dereferencing NULL pointer on close if we
reimar
parents: 36306
diff changeset
875 if (priv->pb) av_freep(&priv->pb->buffer);
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
876 av_freep(&priv->pb);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
877 free(priv); demuxer->priv= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
878 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
879 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
880
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
881
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25659
diff changeset
882 const demuxer_desc_t demuxer_desc_lavf = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
883 "libavformat demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
884 "lavf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
885 "libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
886 "Michael Niedermayer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
887 "supports many formats, requires libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
888 DEMUXER_TYPE_LAVF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
889 0, // Check after other demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
890 lavf_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
891 demux_lavf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
892 demux_open_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
893 demux_close_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
894 demux_seek_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
895 demux_lavf_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
896 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
897
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25659
diff changeset
898 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
899 "libavformat preferred demuxer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
900 "lavfpref",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
901 "libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
902 "Michael Niedermayer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
903 "supports many formats, requires libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
904 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
905 1,
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
906 lavf_check_preferred_file,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
907 demux_lavf_fill_buffer,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
908 demux_open_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
909 demux_close_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
910 demux_seek_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
911 demux_lavf_control
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
912 };