annotate libmpdemux/demux_lavf.c @ 26269:65ad20416dd7

Support 'default' attribute for audio and subtitle tracks. The first default track is chosen for playback if language-based selection failes. Additionally, for audio tracks, the first one is chosen if there are no default tracks at all.
author eugeni
date Sun, 30 Mar 2008 16:55:46 +0000
parents 2b4e40be7cb0
children 42bb503a2522
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
1 /*
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
2 Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
3
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
4 This program is free software; you can redistribute it and/or modify
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
5 it under the terms of the GNU General Public License as published by
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
6 the Free Software Foundation; either version 2 of the License, or
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
7 (at your option) any later version.
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
8
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
9 This program is distributed in the hope that it will be useful,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
12 GNU General Public License for more details.
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
13
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
14 You should have received a copy of the GNU General Public License
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
15 along with this program; if not, write to the Free Software
17367
401b440a6d76 Update licensing information: The FSF changed postal address.
diego
parents: 17354
diff changeset
16 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
17 */
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
18
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
19 // #include <stdio.h>
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
20 #include <stdlib.h>
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
21 // #include <unistd.h>
19611
27c747718955 include forgotten limits.h
nicodvb
parents: 19598
diff changeset
22 #include <limits.h>
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
23
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
24 #include "config.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
25 #include "mp_msg.h"
23010
74efb0fa8a0b with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents: 22990
diff changeset
26 #include "help_mp.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
27
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22440
diff changeset
28 #include "stream/stream.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
29 #include "demuxer.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
30 #include "stheader.h"
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
31 #include "m_option.h"
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
32 #include "libvo/sub.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
33
26069
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
34 #include "libavformat/avformat.h"
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
35 #include "libavutil/avutil.h"
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
36 #include "libavformat/avi.h"
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
37 #include "libavcodec/opt.h"
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 26014
diff changeset
38 #include "libavformat/riff.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
39
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
40 #define PROBE_BUF_SIZE 2048
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
41
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
42 extern char *audio_lang;
26000
4437c030ec00 Support -slang in lavf demuxer.
eugeni
parents: 25926
diff changeset
43 extern char *dvdsub_lang;
4437c030ec00 Support -slang in lavf demuxer.
eugeni
parents: 25926
diff changeset
44 extern int dvdsub_id;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
45 static unsigned int opt_probesize = 0;
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
46 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
47 static char *opt_format;
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
48 static char *opt_cryptokey;
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
49 extern int ts_prog;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
50
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 25117
diff changeset
51 const m_option_t lavfdopts_conf[] = {
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
52 {"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
53 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL},
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
54 {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
55 {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL},
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
56 {NULL, NULL, 0, 0, 0, 0, NULL}
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
57 };
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
58
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
59 #define BIO_BUFFER_SIZE 32768
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
60
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
61 typedef struct lavf_priv_t{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
62 AVInputFormat *avif;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
63 AVFormatContext *avfc;
25117
c6702b710b2c Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
iive
parents: 25092
diff changeset
64 ByteIOContext *pb;
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
65 uint8_t buffer[BIO_BUFFER_SIZE];
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
66 int audio_streams;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
67 int video_streams;
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
68 int sub_streams;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
69 int64_t last_pts;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
70 int astreams[MAX_A_STREAMS];
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
71 int vstreams[MAX_V_STREAMS];
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
72 int sstreams[MAX_S_STREAMS];
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
73 int cur_program;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
74 }lavf_priv_t;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
75
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
76 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
77 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
78
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
79 static const AVCodecTag mp_wav_tags[] = {
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
80 { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
81 { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
82 { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')},
22916
48b3b0aab275 support for THP ADPCM audio
diego
parents: 22876
diff changeset
83 { CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')},
21779
michael
parents: 21771
diff changeset
84 { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)},
24518
8b525df8357a Add support for cook audio (though most .rm files don't work with lavf
reimar
parents: 24355
diff changeset
85 { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')},
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
86 { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
87 { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')},
21763
43c8f1aa82bb add support for musepack native decoder from ffmpeg (require -demuxer lavf)
aurel
parents: 21568
diff changeset
88 { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')},
25092
d0915fdc7c6d Musepack SV8 lavc decoder support
kostya
parents: 24868
diff changeset
89 { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')},
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
90 { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')},
25840
1fb0ef174cb1 Add QDM2 codec identifier
reimar
parents: 25839
diff changeset
91 { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2')},
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
92 { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
93 { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')},
25926
1b30560b5b25 Add speex tag
reimar
parents: 25919
diff changeset
94 { CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')},
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
95 { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
96 { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')},
21362
76f120c4e0f1 support for Westwood SND1 audio
diego
parents: 21100
diff changeset
97 { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')},
20990
459138abb222 support for XAN DPCM audio
diego
parents: 20980
diff changeset
98 { CODEC_ID_XAN_DPCM, MKTAG('A', 'x', 'a', 'n')},
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
99 { 0, 0 },
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
100 };
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
101
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
102 const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0};
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
103
25789
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
104 static const AVCodecTag mp_wav_override_tags[] = {
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
105 { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')},
25886
feb0f4e3c81f Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents: 25883
diff changeset
106 { CODEC_ID_PCM_U8, 1},
25789
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
107 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')},
25886
feb0f4e3c81f Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents: 25883
diff changeset
108 { CODEC_ID_PCM_S16LE, 1},
25789
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
109 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')},
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
110 { 0, 0 },
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
111 };
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
112
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
113 const struct AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0};
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
114
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
115 static const AVCodecTag mp_bmp_tags[] = {
24653
46dbc2e8c800 AMV demuxer and audio/video decoder
voroshil
parents: 24635
diff changeset
116 { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')},
23088
6a40ec31cfa7 Add support for Bethesda Software VID video.
diego
parents: 23010
diff changeset
117 { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')},
22918
b2be172c1366 support for C93 video
diego
parents: 22916
diff changeset
118 { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')},
20940
7b56f3f4fa80 support for Delphine CIN audio and video
diego
parents: 20936
diff changeset
119 { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')},
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
120 { CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')},
20963
1cbcd97346dd support flic video through lavf
diego
parents: 20944
diff changeset
121 { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')},
20980
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
122 { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')},
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
123 { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')},
20942
2093d87ed14b support for RoQ video and audio through libavformat
diego
parents: 20941
diff changeset
124 { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')},
22876
e577ef2bd29e Add support for the THP game format.
diego
parents: 22690
diff changeset
125 { CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')},
20933
ac704f65fe31 Add support for Tiertex SEQ video.
diego
parents: 20931
diff changeset
126 { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')},
23274
f3e72ce8a9fd add txd codec, works with http://samples.mplayerhq.hu/game-formats/txd/fronten2.txd .
compn
parents: 23088
diff changeset
127 { CODEC_ID_TXD, MKTAG('T', 'X', 'D', 'V')},
20935
4a8c67e44c7f cosmetics: alphabetical order and prettyprinting for the CodecTag table
diego
parents: 20934
diff changeset
128 { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')},
20980
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
129 { CODEC_ID_WS_VQA, MKTAG('V', 'Q', 'A', 'V')},
20935
4a8c67e44c7f cosmetics: alphabetical order and prettyprinting for the CodecTag table
diego
parents: 20934
diff changeset
130 { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')},
24355
d30d020b8fe7 Add nuv codec tag mapping
reimar
parents: 24354
diff changeset
131 { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')},
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
132 { 0, 0 },
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
133 };
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
134
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
135 const struct AVCodecTag *mp_bmp_taglists[] = {codec_bmp_tags, mp_bmp_tags, 0};
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
136
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
137 static int mp_read(void *opaque, uint8_t *buf, int size) {
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
138 stream_t *stream = opaque;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
139 int ret;
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
140
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
141 if(stream_eof(stream)) //needed?
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
142 return -1;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
143 ret=stream_read(stream, buf, size);
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
144
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
145 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, stream, buf, size, stream->eof);
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
146 return ret;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
147 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
148
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
149 static offset_t mp_seek(void *opaque, offset_t pos, int whence) {
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
150 stream_t *stream = opaque;
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
151 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", stream, (int)pos, whence);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
152 if(whence == SEEK_CUR)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
153 pos +=stream_tell(stream);
24085
71d17c28f545 We can support SEEK_END seeks only when stream->end_pos is known
reimar
parents: 24084
diff changeset
154 else if(whence == SEEK_END && stream->end_pos > 0)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
155 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
156 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
157 pos += stream->start_pos;
24084
2b572bde6b3d Add support for AVSEEK_SIZE in demux_lavf
reimar
parents: 24082
diff changeset
158 else if(whence == AVSEEK_SIZE && stream->end_pos > 0)
2b572bde6b3d Add support for AVSEEK_SIZE in demux_lavf
reimar
parents: 24082
diff changeset
159 return stream->end_pos - stream->start_pos;
22440
ee6b8e74d727 when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
nicodvb
parents: 22266
diff changeset
160 else
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
161 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
162
24082
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
163 if(pos<0)
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
164 return -1;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
165 if(pos<stream->end_pos && stream->eof)
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
166 stream_reset(stream);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
167 if(stream_seek(stream, pos)==0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
168 return -1;
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
169
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
170 return pos - stream->start_pos;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
171 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
172
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
173 static void list_formats(void) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
174 AVInputFormat *fmt;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
175 mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n");
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
176 for (fmt = first_iformat; fmt; fmt = fmt->next)
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
177 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
178 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
179
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
180 static int lavf_check_file(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
181 AVProbeData avpd;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
182 uint8_t buf[PROBE_BUF_SIZE];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
183 lavf_priv_t *priv;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
184
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
185 if(!demuxer->priv)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
186 demuxer->priv=calloc(sizeof(lavf_priv_t),1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
187 priv= demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
188
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
189 av_register_all();
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
190
15819
faust3
parents: 15308
diff changeset
191 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE)
faust3
parents: 15308
diff changeset
192 return 0;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
193 avpd.filename= demuxer->stream->url;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
194 avpd.buf= buf;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
195 avpd.buf_size= PROBE_BUF_SIZE;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
196
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
197 if (opt_format) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
198 if (strcmp(opt_format, "help") == 0) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
199 list_formats();
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
200 return 0;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
201 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
202 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
203 if (!priv->avif) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
204 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
205 return 0;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
206 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
207 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
208 return DEMUXER_TYPE_LAVF;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
209 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
210 priv->avif= av_probe_input_format(&avpd, 1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
211 if(!priv->avif){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
212 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
213 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
214 }else
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
215 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
216
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
217 return DEMUXER_TYPE_LAVF;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
218 }
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
219
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
220 static const char *preferred_list[] = {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
221 "dxa",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
222 "wv",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
223 "nuv",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
224 "nut",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
225 "gxf",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
226 "mxf",
22972
46593cc4aeba Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents: 22971
diff changeset
227 "flv",
46593cc4aeba Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents: 22971
diff changeset
228 "swf",
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",
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
230 NULL
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
231 };
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
232
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
233 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
234 if (lavf_check_file(demuxer)) {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
235 char **p = preferred_list;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
236 lavf_priv_t *priv = demuxer->priv;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
237 while (*p) {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
238 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
239 return DEMUXER_TYPE_LAVF_PREFERRED;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
240 p++;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
241 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
242 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
243 return 0;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
244 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
245
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
246 static uint8_t char2int(char c) {
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
247 if (c >= '0' && c <= '9') return c - '0';
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
248 if (c >= 'a' && c <= 'f') return c - 'a' + 10;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
249 if (c >= 'A' && c <= 'F') return c - 'A' + 10;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
250 return 0;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
251 }
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
252
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
253 static void parse_cryptokey(AVFormatContext *avfc, const char *str) {
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
254 int len = strlen(str) / 2;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
255 uint8_t *key = av_mallocz(len);
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
256 int i;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
257 avfc->keylen = len;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
258 avfc->key = key;
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
259 for (i = 0; i < len; i++, str += 2)
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
260 *key++ = (char2int(str[0]) << 4) | char2int(str[1]);
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
261 }
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
262
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
263 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
264 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
265 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
266 AVCodecContext *codec= st->codec;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
267 int g;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
268
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
269 switch(codec->codec_type){
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
270 case CODEC_TYPE_AUDIO:{
25886
feb0f4e3c81f Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents: 25883
diff changeset
271 int override_tag;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
272 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
273 sh_audio_t* sh_audio;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
274 if(priv->audio_streams >= MAX_A_STREAMS)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
275 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
276 sh_audio=new_sh_audio(demuxer, i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
277 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
278 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
279 break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
280 priv->astreams[priv->audio_streams] = i;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
281 priv->audio_streams++;
25789
5cdba0d1c4cf Allow overriding the codec_tag for audio codecs, and always override
rtogni
parents: 25707
diff changeset
282 // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag
25886
feb0f4e3c81f Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents: 25883
diff changeset
283 override_tag= av_codec_get_tag(mp_wav_override_taglists, codec->codec_id);
feb0f4e3c81f Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents: 25883
diff changeset
284 if (override_tag)
feb0f4e3c81f Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files.
reimar
parents: 25883
diff changeset
285 codec->codec_tag= override_tag;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
286 // mp4a tag is used for all mp4 files no matter what they actually contain
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
287 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
288 codec->codec_tag= 0;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
289 if(codec->codec_id == CODEC_ID_ADPCM_IMA_AMV)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
290 codec->codec_tag= MKTAG('A','M','V','A');
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
291 if(!codec->codec_tag)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
292 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
293 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
294 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
295 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
296 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
297 wf->nBlockAlign= codec->block_align ? codec->block_align : 1;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
298 wf->wBitsPerSample= codec->bits_per_sample;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
299 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
300 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
301 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
302 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
303 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
304 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
305 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
306 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
307 }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
308 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
309 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
310 }
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 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
312 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
313 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
314 // 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
315 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
316 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
317 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
318 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
319 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
320 switch (codec->codec_id) {
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
321 case CODEC_ID_PCM_S8:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
322 case CODEC_ID_PCM_U8:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
323 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
324 break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
325 case CODEC_ID_PCM_S16LE:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
326 case CODEC_ID_PCM_S16BE:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
327 case CODEC_ID_PCM_U16LE:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
328 case CODEC_ID_PCM_U16BE:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
329 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
330 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
331 case CODEC_ID_PCM_ALAW:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
332 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
333 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
334 case CODEC_ID_PCM_MULAW:
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
335 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
336 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
337 }
26083
19fa7a56ed04 Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
eugeni
parents: 26069
diff changeset
338 if (st->language)
19fa7a56ed04 Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
eugeni
parents: 26069
diff changeset
339 sh_audio->lang = strdup(st->language);
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
340 if (st->disposition & AV_DISPOSITION_DEFAULT)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
341 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
342 if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V);
26091
8732f2107b56 Don't select audio stream in lavf and mkv demuxers.
eugeni
parents: 26088
diff changeset
343 // select the first audio stream
8732f2107b56 Don't select audio stream in lavf and mkv demuxers.
eugeni
parents: 26088
diff changeset
344 if (!demuxer->audio->sh) {
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
345 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
346 demuxer->audio->sh= demuxer->a_streams[i];
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
347 } 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
348 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
349 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
350 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
351 case CODEC_TYPE_VIDEO:{
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
352 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
353 BITMAPINFOHEADER *bih;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
354 if(priv->video_streams >= MAX_V_STREAMS)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
355 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
356 sh_video=new_sh_video(demuxer, i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
357 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "lavf", i);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
358 if(!sh_video) break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
359 priv->vstreams[priv->video_streams] = i;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
360 priv->video_streams++;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
361 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
362
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
363 if(!codec->codec_tag)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
364 codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
365 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
366 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
367 bih->biHeight= codec->height;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
368 bih->biBitCount= codec->bits_per_sample;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
369 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
370 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
371 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
372 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
373 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
374 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
375 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
376 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
377 } 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
378 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
379 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
380 }
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 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
382 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
383 sh_video->format=bih->biCompression;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
384 sh_video->aspect=codec->width * codec->sample_aspect_ratio.num
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
385 / (float)(codec->height * codec->sample_aspect_ratio.den);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
386 sh_video->i_bps=codec->bit_rate/8;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
387 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
388 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
389 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
390
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
391 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
392 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
393 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
394 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
395 /*
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
396 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
397 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
398 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
399 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
400 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
401 */
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 if(demuxer->video->id != i && demuxer->video->id != -1)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
403 st->discard= AVDISCARD_ALL;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
404 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
405 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
406 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
407 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
408 break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
409 }
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 case CODEC_TYPE_SUBTITLE:{
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
411 sh_sub_t* sh_sub;
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
412 char type;
24842
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
413 if(priv->sub_streams >= MAX_S_STREAMS)
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
414 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
415 /* only support text subtitles for now */
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
416 if(codec->codec_id == CODEC_ID_TEXT)
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
417 type = 't';
25879
7b82d835bed1 Support CODEC_ID_MOV_TEXT
reimar
parents: 25846
diff changeset
418 else if(codec->codec_id == CODEC_ID_MOV_TEXT)
7b82d835bed1 Support CODEC_ID_MOV_TEXT
reimar
parents: 25846
diff changeset
419 type = 'm';
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
420 else if(codec->codec_id == CODEC_ID_SSA)
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
421 type = 'a';
25839
327e98d7d2be Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents: 25789
diff changeset
422 else if(codec->codec_id == CODEC_ID_DVD_SUBTITLE)
327e98d7d2be Partially support vobsub subtitles from lavf demuxers (palette support missing)
reimar
parents: 25789
diff changeset
423 type = 'v';
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
424 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
425 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
426 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
427 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_SubtitleID, "lavf", priv->sub_streams);
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
428 if(!sh_sub) break;
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
429 priv->sstreams[priv->sub_streams] = i;
25659
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
430 sh_sub->type = type;
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
431 if (codec->extradata_size) {
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
432 sh_sub->extradata = malloc(codec->extradata_size);
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
433 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size);
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
434 sh_sub->extradata_len = codec->extradata_size;
706d6ecf3c7c Add libass support to demux_lavf.
eugeni
parents: 25478
diff changeset
435 }
26084
ec5749eb6f5f Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents: 26083
diff changeset
436 if (st->language)
ec5749eb6f5f Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents: 26083
diff changeset
437 sh_sub->lang = strdup(st->language);
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
438 if (st->disposition & AV_DISPOSITION_DEFAULT)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26094
diff changeset
439 sh_sub->default_track = 1;
26000
4437c030ec00 Support -slang in lavf demuxer.
eugeni
parents: 25926
diff changeset
440 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
441 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
442 }
25900
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
443 case CODEC_TYPE_ATTACHMENT:{
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
444 if (st->codec->codec_id == CODEC_ID_TTF)
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
445 demuxer_add_attachment(demuxer, st->filename,
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
446 "application/x-truetype-font",
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
447 codec->extradata, codec->extradata_size);
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
448 break;
0190494dfdb2 Add support for attachments in lavf demuxer.
eugeni
parents: 25886
diff changeset
449 }
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
450 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
451 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
452 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
453 }
d5f716b49cb4 moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
nicodvb
parents: 24764
diff changeset
454
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
455 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
456 AVFormatContext *avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
457 AVFormatParameters ap;
24633
2bc6fcc627f4 fix warnings
henry
parents: 24520
diff changeset
458 const AVOption *opt;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
459 lavf_priv_t *priv= demuxer->priv;
24868
751455d3abbe Remove unused variable:
diego
parents: 24848
diff changeset
460 int i;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
461 char mp_filename[256]="mp:";
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
462
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
463 memset(&ap, 0, sizeof(AVFormatParameters));
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
464
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
465 stream_seek(demuxer->stream, 0);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
466
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
467 avfc = av_alloc_format_context();
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
468
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
469 if (opt_cryptokey)
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
470 parse_cryptokey(avfc, opt_cryptokey);
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25900
diff changeset
471 if (user_correct_pts != 0)
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
472 avfc->flags |= AVFMT_FLAG_GENPTS;
21568
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
473 if (index_mode == 0)
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
474 avfc->flags |= AVFMT_FLAG_IGNIDX;
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
475
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
476 ap.prealloced_context = 1;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
477 if(opt_probesize) {
24634
221ad386f6e4 remove useless int->double conversion
henry
parents: 24633
diff changeset
478 opt = av_set_int(avfc, "probesize", opt_probesize);
221ad386f6e4 remove useless int->double conversion
henry
parents: 24633
diff changeset
479 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %u\n", opt_probesize);
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
480 }
24635
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
481 if(opt_analyzeduration) {
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
482 opt = av_set_int(avfc, "analyzeduration", opt_analyzeduration * AV_TIME_BASE);
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
483 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option analyzeduration to %u\n", opt_analyzeduration);
0ad5adc5f363 analyzeduration option for lavf demuxer
henry
parents: 24634
diff changeset
484 }
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
485
12463
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
486 if(demuxer->stream->url)
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
487 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3);
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
488 else
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
489 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3);
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
490
25478
2ec53ef6bda0 100l, fix compilation.
reimar
parents: 25472
diff changeset
491 priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0,
2ec53ef6bda0 100l, fix compilation.
reimar
parents: 25472
diff changeset
492 demuxer->stream, mp_read, NULL, mp_seek);
25472
ace1b77375bd Set is_streamed correctly, should make network playback work more reliably.
reimar
parents: 25471
diff changeset
493 priv->pb->is_streamed = !demuxer->stream->end_pos;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
494
25117
c6702b710b2c Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
iive
parents: 25092
diff changeset
495 if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
496 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
497 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
498 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
499
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
500 priv->avfc= avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
501
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
502 if(av_find_stream_info(avfc) < 0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
503 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
504 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
505 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
506
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
507 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
508 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
509 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright);
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
510 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
511 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
512 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
513 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
514 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre );
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
515
24844
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
516 if(avfc->nb_programs) {
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
517 int p, start=0, found=0;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
518
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
519 if(ts_prog) {
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
520 for(p=0; p<avfc->nb_programs; p++) {
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
521 if(avfc->programs[p]->id == ts_prog) {
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
522 start = p;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
523 found = 1;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
524 break;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
525 }
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
526 }
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
527 if(!found) {
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
528 mp_msg(MSGT_HEADER,MSGL_ERR,"DEMUX_LAVF: program %d doesn't seem to be present\n", ts_prog);
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
529 return NULL;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
530 }
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
531 }
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
532 p = start;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
533 do {
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
534 AVProgram *program = avfc->programs[p];
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
535 mp_msg(MSGT_HEADER,MSGL_INFO,"LAVF: Program %d %s\n", program->id, (program->name ? program->name : ""));
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
536 for(i=0; i<program->nb_stream_indexes; i++)
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
537 handle_stream(demuxer, avfc, program->stream_index[i]);
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
538 if(!priv->cur_program && (demuxer->video->sh || demuxer->audio->sh))
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
539 priv->cur_program = program->id;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
540 p = (p + 1) % avfc->nb_programs;
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
541 } while(p!=start);
4559076416de permit identification and selection of programs
nicodvb
parents: 24843
diff changeset
542 } else
24848
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
543 for(i=0; i<avfc->nb_streams; i++)
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
544 handle_stream(demuxer, avfc, i);
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
545
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
546 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
547 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
548 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
549 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
550 if(!priv->video_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
551 if(!priv->audio_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
552 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n");
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
553 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
554 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
555 demuxer->video->id=-2; // audio-only
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
556 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
557
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
558 return demuxer;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
559 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
560
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
561 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
562 lavf_priv_t *priv= demux->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
563 AVPacket pkt;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
564 demux_packet_t *dp;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
565 demux_stream_t *ds;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
566 int id;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
567 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
568
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
569 demux->filepos=stream_tell(demux->stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
570
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
571 if(av_read_frame(priv->avfc, &pkt) < 0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
572 return 0;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
573
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
574 id= pkt.stream_index;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
575
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
576 if(id==demux->audio->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
577 // audio
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
578 ds=demux->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
579 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
580 ds->sh=demux->a_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
581 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
582 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
583 } else if(id==demux->video->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
584 // video
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
585 ds=demux->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
586 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
587 ds->sh=demux->v_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
588 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
589 }
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
590 } else if(id==demux->sub->id){
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
591 // subtitle
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
592 ds=demux->sub;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
593 sub_utf8=1;
14611
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
594 } else {
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
595 av_free_packet(&pkt);
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
596 return 1;
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
597 }
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
598
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
599 if(0/*pkt.destruct == av_destruct_packet*/){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
600 //ok kids, dont try this at home :)
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18985
diff changeset
601 dp=malloc(sizeof(demux_packet_t));
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
602 dp->len=pkt.size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
603 dp->next=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
604 dp->refcount=1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
605 dp->master=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
606 dp->buffer=pkt.data;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
607 pkt.destruct= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
608 }else{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
609 dp=new_demux_packet(pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
610 memcpy(dp->buffer, pkt.data, pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
611 av_free_packet(&pkt);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
612 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
613
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
614 if(pkt.pts != AV_NOPTS_VALUE){
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
615 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
616 priv->last_pts= dp->pts * AV_TIME_BASE;
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
617 if(pkt.duration)
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
618 dp->endpts = dp->pts + pkt.duration * av_q2d(priv->avfc->streams[id]->time_base);
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
619 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
620 dp->pos=demux->filepos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
621 dp->flags= !!(pkt.flags&PKT_FLAG_KEY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
622 // append packet to DS stream:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
623 ds_add_packet(ds,dp);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
624 return 1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
625 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
626
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
627 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
628 lavf_priv_t *priv = demuxer->priv;
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
629 int avsflags = 0;
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
630 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
631
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25879
diff changeset
632 if (flags & SEEK_ABSOLUTE) {
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
633 priv->last_pts = priv->avfc->start_time;
25843
245e2ffbb2d5 100l, inverted condition for AVSEEK_FLAG_BACKWARD
reimar
parents: 25842
diff changeset
634 } else {
25842
f8fe66772c3a Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents: 25841
diff changeset
635 if (rel_seek_secs < 0) avsflags = AVSEEK_FLAG_BACKWARD;
f8fe66772c3a Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on
reimar
parents: 25841
diff changeset
636 }
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25879
diff changeset
637 if (flags & SEEK_FACTOR) {
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
638 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
639 return;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
640 priv->last_pts += rel_seek_secs * priv->avfc->duration;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
641 } else {
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
642 priv->last_pts += rel_seek_secs * AV_TIME_BASE;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
643 }
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
644 av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
645 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
646
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
647 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
648 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
649 lavf_priv_t *priv = demuxer->priv;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
650
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
651 switch (cmd) {
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25900
diff changeset
652 case DEMUXER_CTRL_CORRECT_PTS:
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25900
diff changeset
653 return DEMUXER_CTRL_OK;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
654 case DEMUXER_CTRL_GET_TIME_LENGTH:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
655 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
656 return DEMUXER_CTRL_DONTKNOW;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
657
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16175
diff changeset
658 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
659 return DEMUXER_CTRL_OK;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
660
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
661 case DEMUXER_CTRL_GET_PERCENT_POS:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
662 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
663 return DEMUXER_CTRL_DONTKNOW;
25841
86aa99edff16 Cosmetics: remove some trailing whitespace
reimar
parents: 25840
diff changeset
664
19160
ccb42ce33c23 Take start time into consideration when calculation percentage position
reimar
parents: 19073
diff changeset
665 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration);
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
666 return DEMUXER_CTRL_OK;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
667 case DEMUXER_CTRL_SWITCH_AUDIO:
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
668 case DEMUXER_CTRL_SWITCH_VIDEO:
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
669 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
670 int id = *((int*)arg);
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
671 int newid = -2;
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
672 int i, curridx = -1;
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
673 int nstreams, *pstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
674 demux_stream_t *ds;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
675
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
676 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO)
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
677 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
678 ds = demuxer->video;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
679 nstreams = priv->video_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
680 pstreams = priv->vstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
681 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
682 else
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
683 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
684 ds = demuxer->audio;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
685 nstreams = priv->audio_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
686 pstreams = priv->astreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
687 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
688 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
689 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
690 if(pstreams[i] == ds->id) //current stream id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
691 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
692 curridx = i;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
693 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
694 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
695 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
696
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
697 if(id == -2) { // no sound
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
698 i = -1;
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
699 } else if(id == -1) { // next track
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
700 i = (curridx + 2) % (nstreams + 1) - 1;
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
701 if (i >= 0)
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
702 newid = pstreams[i];
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
703 }
26094
2b4e40be7cb0 Support switching to/from nosound in demux_lavf.
eugeni
parents: 26091
diff changeset
704 else // select track by id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
705 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
706 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
707 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
708 if(pstreams[i] == id)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
709 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
710 newid = id;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
711 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
712 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
713 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
714 }
24843
2bd6d730782f permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
nicodvb
parents: 24842
diff changeset
715 if(i == curridx)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
716 return DEMUXER_CTRL_NOTIMPL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
717 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
718 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
719 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
720 if(ds->id >= 0)
24848
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
721 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
722 *((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
723 if(newid >= 0)
24848
dd73d5a64b01 reindented previously modified code
nicodvb
parents: 24845
diff changeset
724 priv->avfc->streams[newid]->discard = AVDISCARD_NONE;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
725 return DEMUXER_CTRL_OK;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
726 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
727 }
24845
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
728 case DEMUXER_CTRL_IDENTIFY_PROGRAM:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
729 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
730 demux_program_t *prog = arg;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
731 AVProgram *program;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
732 int p, i;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
733
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
734 if(priv->avfc->nb_programs < 2)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
735 return DEMUXER_CTRL_NOTIMPL;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
736
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
737 if(prog->progid == -1)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
738 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
739 p = 0;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
740 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
741 p++;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
742 p = (p + 1) % priv->avfc->nb_programs;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
743 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
744 else
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
745 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
746 for(i=0; i<priv->avfc->nb_programs; i++)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
747 if(priv->avfc->programs[i]->id == prog->progid)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
748 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
749 if(i==priv->avfc->nb_programs)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
750 return DEMUXER_CTRL_NOTIMPL;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
751 p = i;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
752 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
753 prog->vid = prog->aid = prog->sid = -2; //no audio and no video by default
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
754 redo:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
755 program = priv->avfc->programs[p];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
756 for(i=0; i<program->nb_stream_indexes; i++)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
757 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
758 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
759 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
760 case CODEC_TYPE_VIDEO:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
761 if(prog->vid == -2)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
762 prog->vid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
763 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
764 case CODEC_TYPE_AUDIO:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
765 if(prog->aid == -2)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
766 prog->aid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
767 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
768 case CODEC_TYPE_SUBTITLE:
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
769 if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT)
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
770 prog->sid = program->stream_index[i];
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
771 break;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
772 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
773 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
774 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
775 {
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
776 p = (p + 1) % priv->avfc->nb_programs;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
777 goto redo;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
778 }
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
779 priv->cur_program = prog->progid = program->id;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
780 return DEMUXER_CTRL_OK;
3dacff6ae67c implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
nicodvb
parents: 24844
diff changeset
781 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
782 default:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
783 return DEMUXER_CTRL_NOTIMPL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
784 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
785 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
786
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
787 static void demux_close_lavf(demuxer_t *demuxer)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
788 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
789 lavf_priv_t* priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
790 if (priv){
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
791 if(priv->avfc)
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
792 {
24757
cc80a9169d90 Add -lavfdopts cryptokey
reimar
parents: 24674
diff changeset
793 av_freep(&priv->avfc->key);
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
794 av_close_input_stream(priv->avfc);
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
795 }
25471
5075d5ff1da8 Get rid of URLProtocol mess (especially problematic since it made use
reimar
parents: 25241
diff changeset
796 av_freep(&priv->pb);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
797 free(priv); demuxer->priv= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
798 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
799 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
800
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
801
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25659
diff changeset
802 const demuxer_desc_t demuxer_desc_lavf = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
803 "libavformat demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
804 "lavf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
805 "libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
806 "Michael Niedermayer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
807 "supports many formats, requires libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
808 DEMUXER_TYPE_LAVF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
809 0, // Check after other demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
810 lavf_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
811 demux_lavf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
812 demux_open_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
813 demux_close_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
814 demux_seek_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
815 demux_lavf_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
816 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
817
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25659
diff changeset
818 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
819 "libavformat preferred demuxer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
820 "lavfpref",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
821 "libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
822 "Michael Niedermayer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
823 "supports many formats, requires libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
824 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
825 1,
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
826 lavf_check_preferred_file,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
827 demux_lavf_fill_buffer,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
828 demux_open_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
829 demux_close_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
830 demux_seek_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
831 demux_lavf_control
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
832 };