annotate libmpdemux/demux_lavf.c @ 21548:bf65ffcf0cdb

Set AVFMT_FLAG_GENPTS if -correct-pts is used. This should allow using -correct-pts (and thus filters which adjust pts or add frames) with dvd or other mpeg container files by specifying "-correct-pts -demuxer lavf -vc ffmpeg12". Might work with libmpeg2 decoder too but certainly not with internal demuxer. Using this flag isn't quite optimal as it can cause extra buffering of demuxed frames, but at least it's better than just failing until a more complex solution is implemented.
author uau
date Sun, 10 Dec 2006 00:50:38 +0000
parents 76f120c4e0f1
children 51a7cbc52102
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"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
26 // #include "help_mp.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
27
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
28 #include "stream.h"
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"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
32
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
33 #ifdef USE_LIBAVFORMAT_SO
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
34 #include <ffmpeg/avformat.h>
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
35 #include <ffmpeg/opt.h>
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
36 typedef struct CodecTag {
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
37 int id;
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
38 unsigned int tag;
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
39 unsigned int invalid_asf : 1;
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
40 } CodecTag;
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
41 #else
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
42 #include "avformat.h"
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
43 #include "riff.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
44 #include "avi.h"
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
45 #include "opt.h"
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
46 #endif
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
47
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
48 #define PROBE_BUF_SIZE 2048
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
49
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
50 extern char *audio_lang;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
51 static unsigned int opt_probesize = 0;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
52
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
53 m_option_t lavfdopts_conf[] = {
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
54 {"probesize", &(opt_probesize), CONF_TYPE_INT, CONF_RANGE, 32, INT_MAX, NULL},
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
55 {NULL, NULL, 0, 0, 0, 0, NULL}
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
56 };
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
57
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
58
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
59 typedef struct lavf_priv_t{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
60 AVInputFormat *avif;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
61 AVFormatContext *avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
62 ByteIOContext pb;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
63 int audio_streams;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
64 int video_streams;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
65 int64_t last_pts;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
66 int astreams[MAX_A_STREAMS];
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
67 int vstreams[MAX_V_STREAMS];
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
68 }lavf_priv_t;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
69
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
70 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
71 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
72
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
73 int64_t ff_gcd(int64_t a, int64_t b);
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
74
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
75 const CodecTag mp_wav_tags[] = {
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
76 { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
77 { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
78 { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
79 { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
80 { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
81 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
82 { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
83 { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
84 { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
85 { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
86 { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')},
21362
76f120c4e0f1 support for Westwood SND1 audio
diego
parents: 21100
diff changeset
87 { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')},
20990
459138abb222 support for XAN DPCM audio
diego
parents: 20980
diff changeset
88 { 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
89 { 0, 0 },
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
90 };
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
91
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
92 const CodecTag mp_bmp_tags[] = {
20940
7b56f3f4fa80 support for Delphine CIN audio and video
diego
parents: 20936
diff changeset
93 { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')},
20963
1cbcd97346dd support flic video through lavf
diego
parents: 20944
diff changeset
94 { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')},
20980
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
95 { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')},
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
96 { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')},
20942
2093d87ed14b support for RoQ video and audio through libavformat
diego
parents: 20941
diff changeset
97 { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')},
20933
ac704f65fe31 Add support for Tiertex SEQ video.
diego
parents: 20931
diff changeset
98 { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')},
20935
4a8c67e44c7f cosmetics: alphabetical order and prettyprinting for the CodecTag table
diego
parents: 20934
diff changeset
99 { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')},
20980
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
100 { 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
101 { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')},
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
102 { 0, 0 },
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
103 };
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
104
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
105 static int mp_open(URLContext *h, const char *filename, int flags){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
106 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
107 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
108
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
109 static int mp_read(URLContext *h, unsigned char *buf, int size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
110 stream_t *stream = (stream_t*)h->priv_data;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
111 int ret;
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
112
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
113 if(stream_eof(stream)) //needed?
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
114 return -1;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
115 ret=stream_read(stream, buf, size);
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
116
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
117 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, h, buf, size, stream->eof);
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
118 return ret;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
119 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
120
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
121 static int mp_write(URLContext *h, unsigned char *buf, int size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
122 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
123 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
124
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
125 static offset_t mp_seek(URLContext *h, offset_t pos, int whence){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
126 stream_t *stream = (stream_t*)h->priv_data;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
127
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
128 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", h, (int)pos, whence);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
129 if(whence == SEEK_CUR)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
130 pos +=stream_tell(stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
131 else if(whence == SEEK_END)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
132 pos += stream->end_pos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
133 else if(whence != SEEK_SET)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
134 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
135
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
136 if(pos<stream->end_pos && stream->eof)
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
137 stream_reset(stream);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
138 if(stream_seek(stream, pos)==0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
139 return -1;
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
140
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
141 return pos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
142 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
143
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
144 static int mp_close(URLContext *h){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
145 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
146 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
147
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
148 static URLProtocol mp_protocol = {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
149 "mp",
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
150 mp_open,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
151 mp_read,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
152 mp_write,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
153 mp_seek,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
154 mp_close,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
155 };
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
156
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
157 static int lavf_check_file(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
158 AVProbeData avpd;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
159 uint8_t buf[PROBE_BUF_SIZE];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
160 lavf_priv_t *priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
161
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
162 if(!demuxer->priv)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
163 demuxer->priv=calloc(sizeof(lavf_priv_t),1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
164 priv= demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
165
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
166 av_register_all();
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
167
15819
faust3
parents: 15308
diff changeset
168 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE)
faust3
parents: 15308
diff changeset
169 return 0;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
170 avpd.filename= demuxer->stream->url;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
171 avpd.buf= buf;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
172 avpd.buf_size= PROBE_BUF_SIZE;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
173
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
174 priv->avif= av_probe_input_format(&avpd, 1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
175 if(!priv->avif){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
176 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
177 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
178 }else
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
179 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
180
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
181 return DEMUXER_TYPE_LAVF;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
182 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
183
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
184 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
185 AVFormatContext *avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
186 AVFormatParameters ap;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
187 AVOption *opt;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
188 lavf_priv_t *priv= demuxer->priv;
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
189 int i,g;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
190 char mp_filename[256]="mp:";
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
191
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
192 memset(&ap, 0, sizeof(AVFormatParameters));
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
193
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
194 stream_seek(demuxer->stream, 0);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
195
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
196 register_protocol(&mp_protocol);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
197
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
198 avfc = av_alloc_format_context();
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
199
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
200 if (correct_pts)
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
201 avfc->flags |= AVFMT_FLAG_GENPTS;
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
202
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
203 ap.prealloced_context = 1;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
204 if(opt_probesize) {
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
205 double d = (double) opt_probesize;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
206 opt = av_set_double(avfc, "probesize", opt_probesize);
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
207 if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option probesize to %.3f\r\n", d);
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
208 }
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
209
12463
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
210 if(demuxer->stream->url)
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
211 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3);
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
212 else
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
213 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
214
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
215 url_fopen(&priv->pb, mp_filename, URL_RDONLY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
216
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
217 ((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
218
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
219 if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
220 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
221 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
222 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
223
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
224 priv->avfc= avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
225
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
226 if(av_find_stream_info(avfc) < 0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
227 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
228 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
229 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
230
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
231 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
232 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
233 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright);
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
234 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
235 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
236 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
237 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
238 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre );
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
239
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
240 for(i=0; i<avfc->nb_streams; i++){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
241 AVStream *st= avfc->streams[i];
16000
cc9662daeccf LIBAVFORMAT_BUILD >= 4629
michael
parents: 15819
diff changeset
242 AVCodecContext *codec= st->codec;
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 19062
diff changeset
243
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
244 switch(codec->codec_type){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
245 case CODEC_TYPE_AUDIO:{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
246 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1);
18985
add5f992bba2 more c++ decl crap
rfelker
parents: 18843
diff changeset
247 sh_audio_t* sh_audio;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
248 if(priv->audio_streams >= MAX_A_STREAMS)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
249 break;
18985
add5f992bba2 more c++ decl crap
rfelker
parents: 18843
diff changeset
250 sh_audio=new_sh_audio(demuxer, i);
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
251 if(!sh_audio)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
252 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
253 priv->astreams[priv->audio_streams] = i;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
254 priv->audio_streams++;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
255 if(!codec->codec_tag)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
256 codec->codec_tag= codec_get_wav_tag(codec->codec_id);
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
257 if(!codec->codec_tag)
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
258 codec->codec_tag= codec_get_tag(mp_wav_tags, codec->codec_id);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
259 wf->wFormatTag= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
260 wf->nChannels= codec->channels;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
261 wf->nSamplesPerSec= codec->sample_rate;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
262 wf->nAvgBytesPerSec= codec->bit_rate/8;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
263 wf->nBlockAlign= codec->block_align;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
264 wf->wBitsPerSample= codec->bits_per_sample;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
265 wf->cbSize= codec->extradata_size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
266 if(codec->extradata_size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
267 memcpy(
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
268 wf + 1,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
269 codec->extradata,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
270 codec->extradata_size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
271 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
272 sh_audio->wf= wf;
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
273 sh_audio->audio.dwSampleSize= codec->block_align;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
274 if(codec->frame_size && codec->sample_rate){
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
275 sh_audio->audio.dwScale=codec->frame_size;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
276 sh_audio->audio.dwRate= codec->sample_rate;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
277 }else{
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
278 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
279 sh_audio->audio.dwRate = codec->bit_rate;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
280 }
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
281 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate);
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
282 sh_audio->audio.dwScale /= g;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
283 sh_audio->audio.dwRate /= g;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
284 // 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);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
285 sh_audio->ds= demuxer->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
286 sh_audio->format= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
287 sh_audio->channels= codec->channels;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
288 sh_audio->samplerate= codec->sample_rate;
15007
c03962274c4b set i_bps
michael
parents: 15004
diff changeset
289 sh_audio->i_bps= codec->bit_rate/8;
16134
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
290 switch (codec->codec_id) {
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
291 case CODEC_ID_PCM_S8:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
292 case CODEC_ID_PCM_U8:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
293 sh_audio->samplesize = 1;
16135
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
294 break;
16134
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
295 case CODEC_ID_PCM_S16LE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
296 case CODEC_ID_PCM_S16BE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
297 case CODEC_ID_PCM_U16LE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
298 case CODEC_ID_PCM_U16BE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
299 sh_audio->samplesize = 2;
16135
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
300 break;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
301 case CODEC_ID_PCM_ALAW:
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
302 sh_audio->format = 0x6;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
303 break;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
304 case CODEC_ID_PCM_MULAW:
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
305 sh_audio->format = 0x7;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
306 break;
16134
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
307 }
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
308 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V);
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
309 if((audio_lang && st->language[0] && !strncmp(audio_lang, st->language, 3))
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
310 || (demuxer->audio->id == i || demuxer->audio->id == -1)
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
311 ) {
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
312 demuxer->audio->id = i;
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
313 demuxer->audio->sh= demuxer->a_streams[i];
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
314 }
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
315 else
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
316 st->discard= AVDISCARD_ALL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
317 break;}
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
318 case CODEC_TYPE_VIDEO:{
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
319 sh_video_t* sh_video;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
320 BITMAPINFOHEADER *bih;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
321 if(priv->video_streams >= MAX_V_STREAMS)
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
322 break;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
323 sh_video=new_sh_video(demuxer, i);
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
324 if(!sh_video) break;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
325 priv->vstreams[priv->video_streams] = i;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
326 priv->video_streams++;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
327 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
328
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
329 if(!codec->codec_tag)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
330 codec->codec_tag= codec_get_bmp_tag(codec->codec_id);
20733
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
331 if(!codec->codec_tag)
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
332 codec->codec_tag= codec_get_tag(mp_bmp_tags, codec->codec_id);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
333 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
334 bih->biWidth= codec->width;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
335 bih->biHeight= codec->height;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
336 bih->biBitCount= codec->bits_per_sample;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
337 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
338 bih->biCompression= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
339 sh_video->bih= bih;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
340 sh_video->disp_w= codec->width;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
341 sh_video->disp_h= codec->height;
16718
044260623695 makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents: 16346
diff changeset
342 if (st->time_base.den) { /* if container has time_base, use that */
044260623695 makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents: 16346
diff changeset
343 sh_video->video.dwRate= st->time_base.den;
044260623695 makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents: 16346
diff changeset
344 sh_video->video.dwScale= st->time_base.num;
044260623695 makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents: 16346
diff changeset
345 } else {
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
346 sh_video->video.dwRate= codec->time_base.den;
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
347 sh_video->video.dwScale= codec->time_base.num;
16718
044260623695 makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents: 16346
diff changeset
348 }
17556
e3f1229395b1 10l 1000 fps fix
michael
parents: 17553
diff changeset
349 sh_video->fps=av_q2d(st->r_frame_rate);
e3f1229395b1 10l 1000 fps fix
michael
parents: 17553
diff changeset
350 sh_video->frametime=1/av_q2d(st->r_frame_rate);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
351 sh_video->format = bih->biCompression;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
352 sh_video->aspect= codec->width * codec->sample_aspect_ratio.num
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
353 / (float)(codec->height * codec->sample_aspect_ratio.den);
15007
c03962274c4b set i_bps
michael
parents: 15004
diff changeset
354 sh_video->i_bps= codec->bit_rate/8;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
355 mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n",
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
356 codec->width, codec->sample_aspect_ratio.num,
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
357 codec->height, codec->sample_aspect_ratio.den);
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
358
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
359 sh_video->ds= demuxer->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
360 if(codec->extradata_size)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
361 memcpy(sh_video->bih + 1, codec->extradata, codec->extradata_size);
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
362 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih, MSGL_V);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
363 /* short biPlanes;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
364 int biXPelsPerMeter;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
365 int biYPelsPerMeter;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
366 int biClrUsed;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
367 int biClrImportant;*/
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
368 if(demuxer->video->id != i && demuxer->video->id != -1)
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
369 st->discard= AVDISCARD_ALL;
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
370 else{
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
371 demuxer->video->id = i;
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
372 demuxer->video->sh= demuxer->v_streams[i];
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
373 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
374 break;}
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
375 default:
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
376 st->discard= AVDISCARD_ALL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
377 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
378 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
379
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
380 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
381 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
382 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
383 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
384 if(!priv->video_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
385 if(!priv->audio_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
386 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
387 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
388 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
389 demuxer->video->id=-2; // audio-only
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
390 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
391
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
392 return demuxer;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
393 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
394
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
395 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
396 lavf_priv_t *priv= demux->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
397 AVPacket pkt;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
398 demux_packet_t *dp;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
399 demux_stream_t *ds;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
400 int id;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
401 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
402
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
403 demux->filepos=stream_tell(demux->stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
404
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
405 if(av_read_frame(priv->avfc, &pkt) < 0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
406 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
407
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
408 id= pkt.stream_index;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
409
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
410 if(id==demux->audio->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
411 // audio
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
412 ds=demux->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
413 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
414 ds->sh=demux->a_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
415 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
416 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
417 } else if(id==demux->video->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
418 // video
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
419 ds=demux->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
420 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
421 ds->sh=demux->v_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
422 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
423 }
14611
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
424 } else {
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
425 av_free_packet(&pkt);
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
426 return 1;
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
427 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
428
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
429 if(0/*pkt.destruct == av_destruct_packet*/){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
430 //ok kids, dont try this at home :)
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18985
diff changeset
431 dp=malloc(sizeof(demux_packet_t));
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
432 dp->len=pkt.size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
433 dp->next=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
434 dp->refcount=1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
435 dp->master=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
436 dp->buffer=pkt.data;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
437 pkt.destruct= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
438 }else{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
439 dp=new_demux_packet(pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
440 memcpy(dp->buffer, pkt.data, pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
441 av_free_packet(&pkt);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
442 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
443
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
444 if(pkt.pts != AV_NOPTS_VALUE){
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
445 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
446 priv->last_pts= dp->pts * AV_TIME_BASE;
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
447 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
448 dp->pos=demux->filepos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
449 dp->flags= !!(pkt.flags&PKT_FLAG_KEY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
450 // append packet to DS stream:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
451 ds_add_packet(ds,dp);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
452 return 1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
453 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
454
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
455 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
456 lavf_priv_t *priv = demuxer->priv;
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
457 int avsflags = 0;
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
458 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
459
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
460 if (flags & 1) // absolute seek
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
461 priv->last_pts = priv->avfc->start_time;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
462 if (flags & 2) { // percent seek
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
463 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
464 return;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
465 priv->last_pts += rel_seek_secs * priv->avfc->duration;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
466 } else {
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
467 priv->last_pts += rel_seek_secs * AV_TIME_BASE;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
468 if (rel_seek_secs < 0) avsflags = AVSEEK_FLAG_BACKWARD;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
469 }
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
470 av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
471 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
472
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
473 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
474 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
475 lavf_priv_t *priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
476
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
477 switch (cmd) {
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
478 case DEMUXER_CTRL_GET_TIME_LENGTH:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
479 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
480 return DEMUXER_CTRL_DONTKNOW;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
481
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16175
diff changeset
482 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
483 return DEMUXER_CTRL_OK;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
484
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
485 case DEMUXER_CTRL_GET_PERCENT_POS:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
486 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
487 return DEMUXER_CTRL_DONTKNOW;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
488
19160
ccb42ce33c23 Take start time into consideration when calculation percentage position
reimar
parents: 19073
diff changeset
489 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration);
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
490 return DEMUXER_CTRL_OK;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
491 case DEMUXER_CTRL_SWITCH_AUDIO:
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
492 case DEMUXER_CTRL_SWITCH_VIDEO:
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
493 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
494 int id = *((int*)arg);
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
495 int newid = -2;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
496 int i, curridx = -2;
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
497 int nstreams, *pstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
498 demux_stream_t *ds;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
499
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
500 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO)
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
501 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
502 ds = demuxer->video;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
503 nstreams = priv->video_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
504 pstreams = priv->vstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
505 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
506 else
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
507 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
508 ds = demuxer->audio;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
509 nstreams = priv->audio_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
510 pstreams = priv->astreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
511 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
512 if(ds->id == -2)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
513 return DEMUXER_CTRL_NOTIMPL;
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
514 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
515 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
516 if(pstreams[i] == ds->id) //current stream id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
517 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
518 curridx = i;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
519 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
520 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
521 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
522
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
523 if(id < 0)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
524 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
525 i = (curridx + 1) % nstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
526 newid = pstreams[i];
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
527 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
528 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
529 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
530 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
531 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
532 if(pstreams[i] == id)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
533 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
534 newid = id;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
535 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
536 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
537 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
538 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
539 if(newid == -2 || i == curridx)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
540 return DEMUXER_CTRL_NOTIMPL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
541 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
542 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
543 ds_free_packs(ds);
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
544 priv->avfc->streams[ds->id]->discard = AVDISCARD_ALL;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
545 *((int*)arg) = ds->id = newid;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
546 priv->avfc->streams[newid]->discard = AVDISCARD_NONE;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
547 return DEMUXER_CTRL_OK;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
548 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
549 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
550 default:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
551 return DEMUXER_CTRL_NOTIMPL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
552 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
553 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
554
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
555 static void demux_close_lavf(demuxer_t *demuxer)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
556 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
557 lavf_priv_t* priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
558 if (priv){
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
559 if(priv->avfc)
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
560 {
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
561 av_close_input_file(priv->avfc); priv->avfc= NULL;
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
562 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
563 free(priv); demuxer->priv= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
564 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
565 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
566
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
567
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
568 demuxer_desc_t demuxer_desc_lavf = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
569 "libavformat demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
570 "lavf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
571 "libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
572 "Michael Niedermayer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
573 "supports many formats, requires libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
574 DEMUXER_TYPE_LAVF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
575 0, // Check after other demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
576 lavf_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
577 demux_lavf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
578 demux_open_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
579 demux_close_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
580 demux_seek_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
581 demux_lavf_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
582 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
583