annotate libmpdemux/demux_lavf.c @ 24634:221ad386f6e4

remove useless int->double conversion
author henry
date Sat, 29 Sep 2007 07:49:02 +0000
parents 2bc6fcc627f4
children 0ad5adc5f363
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
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
34 #ifdef USE_LIBAVFORMAT_SO
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
35 #include <ffmpeg/avformat.h>
21995
f615c862f862 Remove ff_gcd prototype and include avutil.h instead where it is defined.
reimar
parents: 21966
diff changeset
36 #include <ffmpeg/avutil.h>
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
37 #include <ffmpeg/opt.h>
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
38 #else
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
39 #include "avformat.h"
21995
f615c862f862 Remove ff_gcd prototype and include avutil.h instead where it is defined.
reimar
parents: 21966
diff changeset
40 #include "avutil.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
41 #include "avi.h"
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
42 #include "opt.h"
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
43 #endif
21822
fc4ce8a91a2e Include "internal" libavformat/riff.h also when dynamic libavformat is used
reimar
parents: 21779
diff changeset
44 #include "riff.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
45
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
46 #define PROBE_BUF_SIZE 2048
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
47
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
48 extern char *audio_lang;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
49 static unsigned int opt_probesize = 0;
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
50 static char *opt_format;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
51
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
52 m_option_t lavfdopts_conf[] = {
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
53 {"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
54 {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL},
19598
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;
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
65 int sub_streams;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
66 int64_t last_pts;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
67 int astreams[MAX_A_STREAMS];
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
68 int vstreams[MAX_V_STREAMS];
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
69 int sstreams[MAX_S_STREAMS];
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
70 }lavf_priv_t;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
71
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
72 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
73 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
74
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
75 static const AVCodecTag 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')},
22916
48b3b0aab275 support for THP ADPCM audio
diego
parents: 22876
diff changeset
79 { CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')},
21779
michael
parents: 21771
diff changeset
80 { 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
81 { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')},
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
82 { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
83 { 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
84 { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')},
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
85 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')},
22058
b149aa896f8d Support 16bit bigendian PCM audio from libavformat
reimar
parents: 21995
diff changeset
86 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')},
20944
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
87 { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
88 { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
89 { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
90 { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')},
20910582789d cosmetics: Restore alphabetical order, align both tables.
diego
parents: 20942
diff changeset
91 { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')},
21362
76f120c4e0f1 support for Westwood SND1 audio
diego
parents: 21100
diff changeset
92 { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')},
20990
459138abb222 support for XAN DPCM audio
diego
parents: 20980
diff changeset
93 { 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
94 { 0, 0 },
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
95 };
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
96
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
97 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
98
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
99 static const AVCodecTag mp_bmp_tags[] = {
23088
6a40ec31cfa7 Add support for Bethesda Software VID video.
diego
parents: 23010
diff changeset
100 { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')},
22918
b2be172c1366 support for C93 video
diego
parents: 22916
diff changeset
101 { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')},
20940
7b56f3f4fa80 support for Delphine CIN audio and video
diego
parents: 20936
diff changeset
102 { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')},
22690
8b0d9b0558e8 add fourcc for dxa files, approved by diego
compn
parents: 22605
diff changeset
103 { CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')},
20963
1cbcd97346dd support flic video through lavf
diego
parents: 20944
diff changeset
104 { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')},
20980
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
105 { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')},
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
106 { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')},
20942
2093d87ed14b support for RoQ video and audio through libavformat
diego
parents: 20941
diff changeset
107 { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')},
22876
e577ef2bd29e Add support for the THP game format.
diego
parents: 22690
diff changeset
108 { CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')},
20933
ac704f65fe31 Add support for Tiertex SEQ video.
diego
parents: 20931
diff changeset
109 { 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
110 { CODEC_ID_TXD, MKTAG('T', 'X', 'D', 'V')},
20935
4a8c67e44c7f cosmetics: alphabetical order and prettyprinting for the CodecTag table
diego
parents: 20934
diff changeset
111 { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')},
20980
70ca50bcc4a8 support for some more fringe formats, still buggy ..
diego
parents: 20963
diff changeset
112 { 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
113 { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')},
24355
d30d020b8fe7 Add nuv codec tag mapping
reimar
parents: 24354
diff changeset
114 { 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
115 { 0, 0 },
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
116 };
404fb439acba Add our own CODEC_ID -> fourcc translation tables so we do not need
reimar
parents: 20070
diff changeset
117
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
118 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
119
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
120 static int mp_open(URLContext *h, const char *filename, int flags){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
121 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
122 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
123
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
124 static int mp_read(URLContext *h, unsigned char *buf, int size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
125 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
126 int ret;
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
127
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
128 if(stream_eof(stream)) //needed?
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
129 return -1;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
130 ret=stream_read(stream, buf, size);
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
131
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
132 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
133 return ret;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
134 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
135
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
136 static int mp_write(URLContext *h, unsigned char *buf, int size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
137 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
138 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
139
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
140 static offset_t mp_seek(URLContext *h, offset_t pos, int whence){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
141 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
142
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
143 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", h, (int)pos, whence);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
144 if(whence == SEEK_CUR)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
145 pos +=stream_tell(stream);
24085
71d17c28f545 We can support SEEK_END seeks only when stream->end_pos is known
reimar
parents: 24084
diff changeset
146 else if(whence == SEEK_END && stream->end_pos > 0)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
147 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
148 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
149 pos += stream->start_pos;
24084
2b572bde6b3d Add support for AVSEEK_SIZE in demux_lavf
reimar
parents: 24082
diff changeset
150 else if(whence == AVSEEK_SIZE && stream->end_pos > 0)
2b572bde6b3d Add support for AVSEEK_SIZE in demux_lavf
reimar
parents: 24082
diff changeset
151 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
152 else
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
153 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
154
24082
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
155 if(pos<0)
13893a33f5ba Do not seek to an invalid position.
reimar
parents: 23758
diff changeset
156 return -1;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
157 if(pos<stream->end_pos && stream->eof)
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
158 stream_reset(stream);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
159 if(stream_seek(stream, pos)==0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
160 return -1;
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
161
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
162 return pos - stream->start_pos;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
163 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
165 static int mp_close(URLContext *h){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
166 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
167 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
168
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
169 static URLProtocol mp_protocol = {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
170 "mp",
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
171 mp_open,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
172 mp_read,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
173 mp_write,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
174 mp_seek,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
175 mp_close,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
176 };
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
177
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
178 static void list_formats(void) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
179 AVInputFormat *fmt;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
180 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
181 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
182 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
183 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
184
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
185 static int lavf_check_file(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
186 AVProbeData avpd;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
187 uint8_t buf[PROBE_BUF_SIZE];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
188 lavf_priv_t *priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
189
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
190 if(!demuxer->priv)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
191 demuxer->priv=calloc(sizeof(lavf_priv_t),1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
192 priv= demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
193
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
194 av_register_all();
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
195
15819
faust3
parents: 15308
diff changeset
196 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE)
faust3
parents: 15308
diff changeset
197 return 0;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
198 avpd.filename= demuxer->stream->url;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
199 avpd.buf= buf;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
200 avpd.buf_size= PROBE_BUF_SIZE;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
201
22150
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
202 if (opt_format) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
203 if (strcmp(opt_format, "help") == 0) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
204 list_formats();
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 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
208 if (!priv->avif) {
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
209 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
210 return 0;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
211 }
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
212 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
213 return DEMUXER_TYPE_LAVF;
6d50b08a8bcd Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
reimar
parents: 22058
diff changeset
214 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
215 priv->avif= av_probe_input_format(&avpd, 1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
216 if(!priv->avif){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
217 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
218 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
219 }else
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
220 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
221
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
222 return DEMUXER_TYPE_LAVF;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
223 }
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
224
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
225 static const char *preferred_list[] = {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
226 "dxa",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
227 "wv",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
228 "nuv",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
229 "nut",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
230 "gxf",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
231 "mxf",
22972
46593cc4aeba Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents: 22971
diff changeset
232 "flv",
46593cc4aeba Use lavf_preferred mechanism to replace more extension-based detection hacks
reimar
parents: 22971
diff changeset
233 "swf",
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
234 NULL
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
235 };
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
236
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
237 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
238 if (lavf_check_file(demuxer)) {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
239 char **p = preferred_list;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
240 lavf_priv_t *priv = demuxer->priv;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
241 while (*p) {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
242 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
243 return DEMUXER_TYPE_LAVF_PREFERRED;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
244 p++;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
245 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
246 }
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
247 return 0;
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
248 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
249
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
250 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
251 AVFormatContext *avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
252 AVFormatParameters ap;
24633
2bc6fcc627f4 fix warnings
henry
parents: 24520
diff changeset
253 const AVOption *opt;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
254 lavf_priv_t *priv= demuxer->priv;
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
255 int i,g;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
256 char mp_filename[256]="mp:";
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
257
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
258 memset(&ap, 0, sizeof(AVFormatParameters));
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
259
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
260 stream_seek(demuxer->stream, 0);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
261
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
262 register_protocol(&mp_protocol);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
263
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
264 avfc = av_alloc_format_context();
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
265
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
266 if (correct_pts)
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
267 avfc->flags |= AVFMT_FLAG_GENPTS;
21568
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
268 if (index_mode == 0)
51a7cbc52102 Respect -noidx in lavf demuxer
reimar
parents: 21548
diff changeset
269 avfc->flags |= AVFMT_FLAG_IGNIDX;
21548
bf65ffcf0cdb Set AVFMT_FLAG_GENPTS if -correct-pts is used.
uau
parents: 21362
diff changeset
270
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
271 ap.prealloced_context = 1;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
272 if(opt_probesize) {
24634
221ad386f6e4 remove useless int->double conversion
henry
parents: 24633
diff changeset
273 opt = av_set_int(avfc, "probesize", opt_probesize);
221ad386f6e4 remove useless int->double conversion
henry
parents: 24633
diff changeset
274 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
275 }
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
276
12463
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
277 if(demuxer->stream->url)
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
278 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3);
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
279 else
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
280 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
281
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
282 url_fopen(&priv->pb, mp_filename, URL_RDONLY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
283
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
284 ((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
285
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
286 if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
287 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
288 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
289 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
290
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
291 priv->avfc= avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
292
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
293 if(av_find_stream_info(avfc) < 0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
294 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
295 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
296 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
297
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
298 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
299 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
300 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright);
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
301 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
302 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
303 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
304 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
305 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre );
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
306
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
307 for(i=0; i<avfc->nb_streams; i++){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
308 AVStream *st= avfc->streams[i];
16000
cc9662daeccf LIBAVFORMAT_BUILD >= 4629
michael
parents: 15819
diff changeset
309 AVCodecContext *codec= st->codec;
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 19062
diff changeset
310
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
311 switch(codec->codec_type){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
312 case CODEC_TYPE_AUDIO:{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
313 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1);
18985
add5f992bba2 more c++ decl crap
rfelker
parents: 18843
diff changeset
314 sh_audio_t* sh_audio;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
315 if(priv->audio_streams >= MAX_A_STREAMS)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
316 break;
18985
add5f992bba2 more c++ decl crap
rfelker
parents: 18843
diff changeset
317 sh_audio=new_sh_audio(demuxer, i);
23010
74efb0fa8a0b with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents: 22990
diff changeset
318 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i);
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
319 if(!sh_audio)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
320 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
321 priv->astreams[priv->audio_streams] = i;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
322 priv->audio_streams++;
22990
a76748e71a18 Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
reimar
parents: 22972
diff changeset
323 // mp4a tag is used for all mp4 files no matter what they actually contain
a76748e71a18 Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
reimar
parents: 22972
diff changeset
324 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
a76748e71a18 Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
reimar
parents: 22972
diff changeset
325 codec->codec_tag= 0;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
326 if(!codec->codec_tag)
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
327 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
328 wf->wFormatTag= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
329 wf->nChannels= codec->channels;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
330 wf->nSamplesPerSec= codec->sample_rate;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
331 wf->nAvgBytesPerSec= codec->bit_rate/8;
22266
273a5ecea962 dont set 0 nBlockAlign
michael
parents: 22150
diff changeset
332 wf->nBlockAlign= codec->block_align ? codec->block_align : 1;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
333 wf->wBitsPerSample= codec->bits_per_sample;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
334 wf->cbSize= codec->extradata_size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
335 if(codec->extradata_size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
336 memcpy(
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
337 wf + 1,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
338 codec->extradata,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
339 codec->extradata_size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
340 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
341 sh_audio->wf= wf;
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
342 sh_audio->audio.dwSampleSize= codec->block_align;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
343 if(codec->frame_size && codec->sample_rate){
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
344 sh_audio->audio.dwScale=codec->frame_size;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
345 sh_audio->audio.dwRate= codec->sample_rate;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
346 }else{
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
347 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
348 sh_audio->audio.dwRate = codec->bit_rate;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
349 }
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
350 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate);
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
351 sh_audio->audio.dwScale /= g;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
352 sh_audio->audio.dwRate /= g;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
353 // 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
354 sh_audio->ds= demuxer->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
355 sh_audio->format= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
356 sh_audio->channels= codec->channels;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
357 sh_audio->samplerate= codec->sample_rate;
15007
c03962274c4b set i_bps
michael
parents: 15004
diff changeset
358 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
359 switch (codec->codec_id) {
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
360 case CODEC_ID_PCM_S8:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
361 case CODEC_ID_PCM_U8:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
362 sh_audio->samplesize = 1;
16135
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
363 break;
16134
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
364 case CODEC_ID_PCM_S16LE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
365 case CODEC_ID_PCM_S16BE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
366 case CODEC_ID_PCM_U16LE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
367 case CODEC_ID_PCM_U16BE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
368 sh_audio->samplesize = 2;
16135
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
369 break;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
370 case CODEC_ID_PCM_ALAW:
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
371 sh_audio->format = 0x6;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
372 break;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
373 case CODEC_ID_PCM_MULAW:
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
374 sh_audio->format = 0x7;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
375 break;
16134
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
376 }
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
377 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
378 if((audio_lang && st->language[0] && !strncmp(audio_lang, st->language, 3))
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
379 || (demuxer->audio->id == i || demuxer->audio->id == -1)
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
380 ) {
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
381 demuxer->audio->id = i;
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
382 demuxer->audio->sh= demuxer->a_streams[i];
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
383 }
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
384 else
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
385 st->discard= AVDISCARD_ALL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
386 break;}
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
387 case CODEC_TYPE_VIDEO:{
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
388 sh_video_t* sh_video;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
389 BITMAPINFOHEADER *bih;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
390 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
391 break;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
392 sh_video=new_sh_video(demuxer, i);
23010
74efb0fa8a0b with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents: 22990
diff changeset
393 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "lavf", i);
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
394 if(!sh_video) break;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
395 priv->vstreams[priv->video_streams] = i;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
396 priv->video_streams++;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
397 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
398
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
399 if(!codec->codec_tag)
21966
d9494ca70ca7 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
reimar
parents: 21962
diff changeset
400 codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
401 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
402 bih->biWidth= codec->width;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
403 bih->biHeight= codec->height;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
404 bih->biBitCount= codec->bits_per_sample;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
405 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
406 bih->biCompression= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
407 sh_video->bih= bih;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
408 sh_video->disp_w= codec->width;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
409 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
410 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
411 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
412 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
413 } else {
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
414 sh_video->video.dwRate= codec->time_base.den;
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
415 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
416 }
17556
e3f1229395b1 10l 1000 fps fix
michael
parents: 17553
diff changeset
417 sh_video->fps=av_q2d(st->r_frame_rate);
e3f1229395b1 10l 1000 fps fix
michael
parents: 17553
diff changeset
418 sh_video->frametime=1/av_q2d(st->r_frame_rate);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
419 sh_video->format = bih->biCompression;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
420 sh_video->aspect= codec->width * codec->sample_aspect_ratio.num
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
421 / (float)(codec->height * codec->sample_aspect_ratio.den);
15007
c03962274c4b set i_bps
michael
parents: 15004
diff changeset
422 sh_video->i_bps= codec->bit_rate/8;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
423 mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n",
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
424 codec->width, codec->sample_aspect_ratio.num,
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
425 codec->height, codec->sample_aspect_ratio.den);
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
426
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
427 sh_video->ds= demuxer->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
428 if(codec->extradata_size)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
429 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
430 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih, MSGL_V);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
431 /* short biPlanes;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
432 int biXPelsPerMeter;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
433 int biYPelsPerMeter;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
434 int biClrUsed;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
435 int biClrImportant;*/
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
436 if(demuxer->video->id != i && demuxer->video->id != -1)
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
437 st->discard= AVDISCARD_ALL;
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
438 else{
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
439 demuxer->video->id = i;
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
440 demuxer->video->sh= demuxer->v_streams[i];
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
441 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
442 break;}
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
443 case CODEC_TYPE_SUBTITLE:{
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
444 sh_sub_t* sh_sub;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
445 if(priv->sub_streams >= MAX_S_STREAMS)
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
446 break;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
447 /* only support text subtitles for now */
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
448 if(codec->codec_id != CODEC_ID_TEXT)
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
449 break;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
450 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams);
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
451 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_SubtitleID, "lavf", priv->sub_streams);
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
452 if(!sh_sub) break;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
453 priv->sstreams[priv->sub_streams] = i;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
454 sh_sub->type = 't';
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
455 demuxer->sub->sh = demuxer->s_streams[priv->sub_streams++];
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
456 break;}
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
457 default:
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
458 st->discard= AVDISCARD_ALL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
459 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
460 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
461
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
462 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
463 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
464 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
465 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
466 if(!priv->video_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
467 if(!priv->audio_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
468 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
469 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
470 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
471 demuxer->video->id=-2; // audio-only
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
472 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
473
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
474 return demuxer;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
475 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
476
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
477 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
478 lavf_priv_t *priv= demux->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
479 AVPacket pkt;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
480 demux_packet_t *dp;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
481 demux_stream_t *ds;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
482 int id;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
483 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
484
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
485 demux->filepos=stream_tell(demux->stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
486
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
487 if(av_read_frame(priv->avfc, &pkt) < 0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
488 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
489
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
490 id= pkt.stream_index;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
491
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
492 if(id==demux->audio->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
493 // audio
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
494 ds=demux->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
495 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
496 ds->sh=demux->a_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
497 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
498 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
499 } else if(id==demux->video->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
500 // video
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
501 ds=demux->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
502 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
503 ds->sh=demux->v_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
504 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
505 }
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
506 } else if(id==demux->sub->id){
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
507 // subtitle
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
508 ds=demux->sub;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
509 sub_utf8=1;
14611
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
510 } else {
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
511 av_free_packet(&pkt);
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
512 return 1;
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
513 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
514
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
515 if(0/*pkt.destruct == av_destruct_packet*/){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
516 //ok kids, dont try this at home :)
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18985
diff changeset
517 dp=malloc(sizeof(demux_packet_t));
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
518 dp->len=pkt.size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
519 dp->next=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
520 dp->refcount=1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
521 dp->master=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
522 dp->buffer=pkt.data;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
523 pkt.destruct= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
524 }else{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
525 dp=new_demux_packet(pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
526 memcpy(dp->buffer, pkt.data, pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
527 av_free_packet(&pkt);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
528 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
529
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
530 if(pkt.pts != AV_NOPTS_VALUE){
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
531 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
532 priv->last_pts= dp->pts * AV_TIME_BASE;
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
533 if(pkt.duration)
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
534 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
535 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
536 dp->pos=demux->filepos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
537 dp->flags= !!(pkt.flags&PKT_FLAG_KEY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
538 // append packet to DS stream:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
539 ds_add_packet(ds,dp);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
540 return 1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
541 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
542
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
543 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
544 lavf_priv_t *priv = demuxer->priv;
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
545 int avsflags = 0;
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
546 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
547
20070
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
548 if (flags & 1) // absolute seek
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
549 priv->last_pts = priv->avfc->start_time;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
550 if (flags & 2) { // percent seek
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
551 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
552 return;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
553 priv->last_pts += rel_seek_secs * priv->avfc->duration;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
554 } else {
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
555 priv->last_pts += rel_seek_secs * AV_TIME_BASE;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
556 if (rel_seek_secs < 0) avsflags = AVSEEK_FLAG_BACKWARD;
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
557 }
b4d4142f7ae8 Implement absolute and percent-based seek
reimar
parents: 19611
diff changeset
558 av_seek_frame(priv->avfc, -1, priv->last_pts, avsflags);
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_control(demuxer_t *demuxer, int cmd, void *arg)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
562 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
563 lavf_priv_t *priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
564
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
565 switch (cmd) {
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
566 case DEMUXER_CTRL_GET_TIME_LENGTH:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
567 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
568 return DEMUXER_CTRL_DONTKNOW;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
569
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16175
diff changeset
570 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
571 return DEMUXER_CTRL_OK;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
572
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
573 case DEMUXER_CTRL_GET_PERCENT_POS:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
574 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
575 return DEMUXER_CTRL_DONTKNOW;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
576
19160
ccb42ce33c23 Take start time into consideration when calculation percentage position
reimar
parents: 19073
diff changeset
577 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration);
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
578 return DEMUXER_CTRL_OK;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
579 case DEMUXER_CTRL_SWITCH_AUDIO:
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
580 case DEMUXER_CTRL_SWITCH_VIDEO:
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
581 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
582 int id = *((int*)arg);
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
583 int newid = -2;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
584 int i, curridx = -2;
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
585 int nstreams, *pstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
586 demux_stream_t *ds;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
587
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
588 if(cmd == DEMUXER_CTRL_SWITCH_VIDEO)
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
589 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
590 ds = demuxer->video;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
591 nstreams = priv->video_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
592 pstreams = priv->vstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
593 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
594 else
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
595 {
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
596 ds = demuxer->audio;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
597 nstreams = priv->audio_streams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
598 pstreams = priv->astreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
599 }
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
600 if(ds->id == -2)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
601 return DEMUXER_CTRL_NOTIMPL;
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
602 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
603 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
604 if(pstreams[i] == ds->id) //current stream id
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
605 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
606 curridx = i;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
607 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
608 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
609 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
610
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
611 if(id < 0)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
612 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
613 i = (curridx + 1) % nstreams;
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
614 newid = pstreams[i];
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
615 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
616 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
617 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
618 for(i = 0; i < nstreams; i++)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
619 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
620 if(pstreams[i] == id)
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
621 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
622 newid = id;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
623 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
624 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
625 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
626 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
627 if(newid == -2 || i == curridx)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
628 return DEMUXER_CTRL_NOTIMPL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
629 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
630 {
21100
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
631 ds_free_packs(ds);
6bc989360c8b check we aren't short of sh_videos before allocating another one
nicodvb
parents: 20990
diff changeset
632 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
633 *((int*)arg) = ds->id = newid;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
634 priv->avfc->streams[newid]->discard = AVDISCARD_NONE;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
635 return DEMUXER_CTRL_OK;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
636 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
637 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
638 default:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
639 return DEMUXER_CTRL_NOTIMPL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
640 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
641 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
642
23758
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
643 /** \brief Get the language code for a subtitle track.
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
644
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
645 Retrieves the language code for a subtitle track.
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
646
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
647 \param demuxer The demuxer to work on
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
648 \param track_num The subtitle track number to get the language from
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
649 */
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
650 char *demux_lavf_sub_lang(demuxer_t *demuxer, int track_num)
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
651 {
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
652 lavf_priv_t *priv = demuxer->priv;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
653 return priv->avfc->streams[priv->sstreams[track_num]]->language;
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
654 }
795631068b92 add support for subtitles thru lavf
aurel
parents: 23274
diff changeset
655
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
656 static void demux_close_lavf(demuxer_t *demuxer)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
657 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
658 lavf_priv_t* priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
659 if (priv){
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
660 if(priv->avfc)
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
661 {
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
662 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
663 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
664 free(priv); demuxer->priv= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
665 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
666 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
667
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
668
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
669 demuxer_desc_t demuxer_desc_lavf = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
670 "libavformat demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
671 "lavf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
672 "libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
673 "Michael Niedermayer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
674 "supports many formats, requires libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
675 DEMUXER_TYPE_LAVF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
676 0, // Check after other demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
677 lavf_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
678 demux_lavf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
679 demux_open_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
680 demux_close_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
681 demux_seek_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
682 demux_lavf_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
683 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
684
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
685 demuxer_desc_t demuxer_desc_lavf_preferred = {
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
686 "libavformat preferred demuxer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
687 "lavfpref",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
688 "libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
689 "Michael Niedermayer",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
690 "supports many formats, requires libavformat",
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
691 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
692 1,
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
693 lavf_check_preferred_file,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
694 demux_lavf_fill_buffer,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
695 demux_open_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
696 demux_close_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
697 demux_seek_lavf,
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
698 demux_lavf_control
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22918
diff changeset
699 };