annotate libmpdemux/demux_lavf.c @ 19598:4cff22c91b39

added lavfdopts to pass options to libavformat
author nicodvb
date Wed, 30 Aug 2006 22:25:40 +0000
parents c636a4e9565a
children 27c747718955
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>
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
22
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
23 #include "config.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
24 #include "mp_msg.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
25 // #include "help_mp.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
26
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
27 #include "stream.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
28 #include "demuxer.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
29 #include "stheader.h"
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
30 #include "m_option.h"
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
31
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
32 #ifdef USE_LIBAVFORMAT_SO
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
33 #include <ffmpeg/avformat.h>
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
34 #include <ffmpeg/opt.h>
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
35 #else
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
36 #include "avformat.h"
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
37 #include "avi.h"
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
38 #include "opt.h"
17354
60189cd9bbc8 added support for external libavformat
nicodvb
parents: 16718
diff changeset
39 #endif
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
40
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
41 #define PROBE_BUF_SIZE 2048
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
42
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
43 extern char *audio_lang;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
44 static unsigned int opt_probesize = 0;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
45
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
46 m_option_t lavfdopts_conf[] = {
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
47 {"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
48 {NULL, NULL, 0, 0, 0, 0, NULL}
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
49 };
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
50
18775
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
51
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
52 typedef struct lavf_priv_t{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
53 AVInputFormat *avif;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
54 AVFormatContext *avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
55 ByteIOContext pb;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
56 int audio_streams;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
57 int video_streams;
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
58 int64_t last_pts;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
59 int astreams[MAX_A_STREAMS];
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
60 }lavf_priv_t;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
61
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
62 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
63 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
64
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
65 int64_t ff_gcd(int64_t a, int64_t b);
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
66
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
67 static int mp_open(URLContext *h, const char *filename, int flags){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
68 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
69 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
70
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
71 static int mp_read(URLContext *h, unsigned char *buf, int size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
72 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
73 int ret;
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
74
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
75 if(stream_eof(stream)) //needed?
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
76 return -1;
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
77 ret=stream_read(stream, buf, size);
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
78
12165
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
79 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
80 return ret;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
81 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
82
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
83 static int mp_write(URLContext *h, unsigned char *buf, int size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
84 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
85 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
86
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
87 static offset_t mp_seek(URLContext *h, offset_t pos, int whence){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
88 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
89
6ae21c78ed8d libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents: 12164
diff changeset
90 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", h, (int)pos, whence);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
91 if(whence == SEEK_CUR)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
92 pos +=stream_tell(stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
93 else if(whence == SEEK_END)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
94 pos += stream->end_pos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
95 else if(whence != SEEK_SET)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
96 return -1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
97
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
98 if(pos<stream->end_pos && stream->eof)
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
99 stream_reset(stream);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
100 if(stream_seek(stream, pos)==0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
101 return -1;
12166
cceadb8af60b nicer EOF solution, mpeg-ps works now too
michael
parents: 12165
diff changeset
102
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
103 return pos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
104 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
105
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
106 static int mp_close(URLContext *h){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
107 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
108 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
109
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
110 static URLProtocol mp_protocol = {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
111 "mp",
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
112 mp_open,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
113 mp_read,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
114 mp_write,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
115 mp_seek,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
116 mp_close,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
117 };
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
118
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
119 static int lavf_check_file(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
120 AVProbeData avpd;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
121 uint8_t buf[PROBE_BUF_SIZE];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
122 lavf_priv_t *priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
123
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
124 if(!demuxer->priv)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
125 demuxer->priv=calloc(sizeof(lavf_priv_t),1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
126 priv= demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
127
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
128 av_register_all();
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
129
15819
faust3
parents: 15308
diff changeset
130 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE)
faust3
parents: 15308
diff changeset
131 return 0;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
132 avpd.filename= demuxer->stream->url;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
133 avpd.buf= buf;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
134 avpd.buf_size= PROBE_BUF_SIZE;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
135
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
136 priv->avif= av_probe_input_format(&avpd, 1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
137 if(!priv->avif){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
138 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
139 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
140 }else
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
141 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
142
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
143 return DEMUXER_TYPE_LAVF;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
144 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
145
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
146 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
147 AVFormatContext *avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
148 AVFormatParameters ap;
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
149 AVOption *opt;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
150 lavf_priv_t *priv= demuxer->priv;
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
151 int i,g;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
152 char mp_filename[256]="mp:";
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
153
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
154 memset(&ap, 0, sizeof(AVFormatParameters));
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
155
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
156 stream_seek(demuxer->stream, 0);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
157
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
158 register_protocol(&mp_protocol);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
159
19598
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
160 avfc = av_alloc_format_context();
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
161 ap.prealloced_context = 1;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
162 if(opt_probesize) {
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
163 double d = (double) opt_probesize;
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
164 opt = av_set_double(avfc, "probesize", opt_probesize);
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
165 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
166 }
4cff22c91b39 added lavfdopts to pass options to libavformat
nicodvb
parents: 19207
diff changeset
167
12463
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
168 if(demuxer->stream->url)
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
169 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3);
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
170 else
3a7ef0fbc2f9 segfault fix
michael
parents: 12304
diff changeset
171 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
172
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
173 url_fopen(&priv->pb, mp_filename, URL_RDONLY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
174
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
175 ((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
176
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
177 if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
178 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
179 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
180 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
181
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
182 priv->avfc= avfc;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
183
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
184 if(av_find_stream_info(avfc) < 0){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
185 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n");
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
186 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
187 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
188
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
189 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
190 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
191 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright);
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
192 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
193 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
194 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
195 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track );
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
196 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre );
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
197
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
198 for(i=0; i<avfc->nb_streams; i++){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
199 AVStream *st= avfc->streams[i];
16000
cc9662daeccf LIBAVFORMAT_BUILD >= 4629
michael
parents: 15819
diff changeset
200 AVCodecContext *codec= st->codec;
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 19062
diff changeset
201
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
202 switch(codec->codec_type){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
203 case CODEC_TYPE_AUDIO:{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
204 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1);
18985
add5f992bba2 more c++ decl crap
rfelker
parents: 18843
diff changeset
205 sh_audio_t* sh_audio;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
206 if(priv->audio_streams >= MAX_A_STREAMS)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
207 break;
18985
add5f992bba2 more c++ decl crap
rfelker
parents: 18843
diff changeset
208 sh_audio=new_sh_audio(demuxer, i);
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
209 if(!sh_audio)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
210 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
211 priv->astreams[priv->audio_streams] = i;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
212 priv->audio_streams++;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
213 if(!codec->codec_tag)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
214 codec->codec_tag= codec_get_wav_tag(codec->codec_id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
215 wf->wFormatTag= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
216 wf->nChannels= codec->channels;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
217 wf->nSamplesPerSec= codec->sample_rate;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
218 wf->nAvgBytesPerSec= codec->bit_rate/8;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
219 wf->nBlockAlign= codec->block_align;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
220 wf->wBitsPerSample= codec->bits_per_sample;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
221 wf->cbSize= codec->extradata_size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
222 if(codec->extradata_size){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
223 memcpy(
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
224 wf + 1,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
225 codec->extradata,
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
226 codec->extradata_size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
227 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
228 sh_audio->wf= wf;
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
229 sh_audio->audio.dwSampleSize= codec->block_align;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
230 if(codec->frame_size && codec->sample_rate){
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
231 sh_audio->audio.dwScale=codec->frame_size;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
232 sh_audio->audio.dwRate= codec->sample_rate;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
233 }else{
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
234 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
235 sh_audio->audio.dwRate = codec->bit_rate;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
236 }
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
237 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate);
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
238 sh_audio->audio.dwScale /= g;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
239 sh_audio->audio.dwRate /= g;
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15007
diff changeset
240 // 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
241 sh_audio->ds= demuxer->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
242 sh_audio->format= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
243 sh_audio->channels= codec->channels;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
244 sh_audio->samplerate= codec->sample_rate;
15007
c03962274c4b set i_bps
michael
parents: 15004
diff changeset
245 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
246 switch (codec->codec_id) {
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
247 case CODEC_ID_PCM_S8:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
248 case CODEC_ID_PCM_U8:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
249 sh_audio->samplesize = 1;
16135
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
250 break;
16134
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
251 case CODEC_ID_PCM_S16LE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
252 case CODEC_ID_PCM_S16BE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
253 case CODEC_ID_PCM_U16LE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
254 case CODEC_ID_PCM_U16BE:
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
255 sh_audio->samplesize = 2;
16135
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
256 break;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
257 case CODEC_ID_PCM_ALAW:
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
258 sh_audio->format = 0x6;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
259 break;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
260 case CODEC_ID_PCM_MULAW:
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
261 sh_audio->format = 0x7;
7457c791204e Hopefully finally fix the last commit
reimar
parents: 16134
diff changeset
262 break;
16134
a1fd1a7eeb35 lavf demuxer with raw PCM fix (and a related hang)
reimar
parents: 16000
diff changeset
263 }
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
264 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
265 if((audio_lang && st->language[0] && !strncmp(audio_lang, st->language, 3))
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
266 || (demuxer->audio->id == i || demuxer->audio->id == -1)
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
267 ) {
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
268 demuxer->audio->id = i;
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
269 demuxer->audio->sh= demuxer->a_streams[i];
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
270 }
bdcbf1070680 support for -alang
nicodvb
parents: 18762
diff changeset
271 else
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
272 st->discard= AVDISCARD_ALL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
273 break;}
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
274 case CODEC_TYPE_VIDEO:{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
275 BITMAPINFOHEADER *bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
276 sh_video_t* sh_video=new_sh_video(demuxer, i);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
277
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
278 priv->video_streams++;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
279 if(!codec->codec_tag)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
280 codec->codec_tag= codec_get_bmp_tag(codec->codec_id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
281 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
282 bih->biWidth= codec->width;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
283 bih->biHeight= codec->height;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
284 bih->biBitCount= codec->bits_per_sample;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
285 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
286 bih->biCompression= codec->codec_tag;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
287 sh_video->bih= bih;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
288 sh_video->disp_w= codec->width;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
289 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
290 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
291 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
292 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
293 } else {
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
294 sh_video->video.dwRate= codec->time_base.den;
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
295 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
296 }
17556
e3f1229395b1 10l 1000 fps fix
michael
parents: 17553
diff changeset
297 sh_video->fps=av_q2d(st->r_frame_rate);
e3f1229395b1 10l 1000 fps fix
michael
parents: 17553
diff changeset
298 sh_video->frametime=1/av_q2d(st->r_frame_rate);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
299 sh_video->format = bih->biCompression;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
300 sh_video->aspect= codec->width * codec->sample_aspect_ratio.num
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
301 / (float)(codec->height * codec->sample_aspect_ratio.den);
15007
c03962274c4b set i_bps
michael
parents: 15004
diff changeset
302 sh_video->i_bps= codec->bit_rate/8;
12167
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
303 mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n",
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
304 codec->width, codec->sample_aspect_ratio.num,
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
305 codec->height, codec->sample_aspect_ratio.den);
6421ebfc0018 avoid unneeded stream_reset()
michael
parents: 12166
diff changeset
306
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
307 sh_video->ds= demuxer->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
308 if(codec->extradata_size)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
309 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
310 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih, MSGL_V);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
311 /* short biPlanes;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
312 int biXPelsPerMeter;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
313 int biYPelsPerMeter;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
314 int biClrUsed;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
315 int biClrImportant;*/
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
316 if(demuxer->video->id != i && demuxer->video->id != -1)
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
317 st->discard= AVDISCARD_ALL;
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
318 else{
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
319 demuxer->video->id = i;
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
320 demuxer->video->sh= demuxer->v_streams[i];
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
321 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
322 break;}
15004
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
323 default:
ec7bd6ad70b5 discard streams we dont need
michael
parents: 14611
diff changeset
324 st->discard= AVDISCARD_ALL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
325 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
326 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
327
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
328 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
329 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
330 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
331 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
332 if(!priv->video_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
333 if(!priv->audio_streams){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
334 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
335 return NULL;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
336 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
337 demuxer->video->id=-2; // audio-only
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
338 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
339
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
340 return demuxer;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
341 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
342
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
343 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
344 lavf_priv_t *priv= demux->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
345 AVPacket pkt;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
346 demux_packet_t *dp;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
347 demux_stream_t *ds;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
348 int id;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
349 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n");
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
350
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
351 demux->filepos=stream_tell(demux->stream);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
352
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
353 if(av_read_frame(priv->avfc, &pkt) < 0)
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
354 return 0;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
355
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
356 id= pkt.stream_index;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
357
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
358 if(id==demux->audio->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
359 // audio
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
360 ds=demux->audio;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
361 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
362 ds->sh=demux->a_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
363 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
364 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
365 } else if(id==demux->video->id){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
366 // video
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
367 ds=demux->video;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
368 if(!ds->sh){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
369 ds->sh=demux->v_streams[id];
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
370 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
371 }
14611
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
372 } else {
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
373 av_free_packet(&pkt);
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
374 return 1;
0c4a7d871288 discard lavf packets with wrong ids
nicodvb
parents: 13749
diff changeset
375 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
376
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
377 if(0/*pkt.destruct == av_destruct_packet*/){
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
378 //ok kids, dont try this at home :)
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18985
diff changeset
379 dp=malloc(sizeof(demux_packet_t));
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
380 dp->len=pkt.size;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
381 dp->next=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
382 dp->refcount=1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
383 dp->master=NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
384 dp->buffer=pkt.data;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
385 pkt.destruct= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
386 }else{
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
387 dp=new_demux_packet(pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
388 memcpy(dp->buffer, pkt.data, pkt.size);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
389 av_free_packet(&pkt);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
390 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
391
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
392 if(pkt.pts != AV_NOPTS_VALUE){
15308
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
393 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base);
e9865b828a89 LIBAVFORMAT_BUILD >= 4624
michael
parents: 15011
diff changeset
394 priv->last_pts= dp->pts * AV_TIME_BASE;
13747
1bdec8201f77 10l (mplayer doesnt like AV_NOPTS_VALUE)
michael
parents: 13607
diff changeset
395 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
396 dp->pos=demux->filepos;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
397 dp->flags= !!(pkt.flags&PKT_FLAG_KEY);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
398 // append packet to DS stream:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
399 ds_add_packet(ds,dp);
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
400 return 1;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
401 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
402
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
403 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
404 lavf_priv_t *priv = demuxer->priv;
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
405 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
406
13607
3d262519187b LIBAVFORMAT_BUILD >= 4619
michael
parents: 12463
diff changeset
407 av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE, rel_seek_secs < 0 ? AVSEEK_FLAG_BACKWARD : 0);
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
408 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
409
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
410 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
411 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
412 lavf_priv_t *priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
413
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
414 switch (cmd) {
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
415 case DEMUXER_CTRL_GET_TIME_LENGTH:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
416 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
417 return DEMUXER_CTRL_DONTKNOW;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
418
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16175
diff changeset
419 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE;
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
420 return DEMUXER_CTRL_OK;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
421
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
422 case DEMUXER_CTRL_GET_PERCENT_POS:
19207
c636a4e9565a Do not treat AV_NOPTS_VALUE as a valid duration value.
reimar
parents: 19160
diff changeset
423 if (priv->avfc->duration == 0 || priv->avfc->duration == AV_NOPTS_VALUE)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
424 return DEMUXER_CTRL_DONTKNOW;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
425
19160
ccb42ce33c23 Take start time into consideration when calculation percentage position
reimar
parents: 19073
diff changeset
426 *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration);
12168
44f33fb19acf seeking
michael
parents: 12167
diff changeset
427 return DEMUXER_CTRL_OK;
18762
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
428 case DEMUXER_CTRL_SWITCH_AUDIO:
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
429 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
430 int id = *((int*)arg);
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
431 int newid = -2;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
432 int i, curridx = -2;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
433
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
434 if(demuxer->audio->id == -2)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
435 return DEMUXER_CTRL_NOTIMPL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
436 for(i = 0; i < priv->audio_streams; i++)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
437 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
438 if(priv->astreams[i] == demuxer->audio->id) //current stream id
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
439 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
440 curridx = i;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
441 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
442 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
443 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
444
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
445 if(id < 0)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
446 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
447 i = (curridx + 1) % priv->audio_streams;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
448 newid = priv->astreams[i];
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
449 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
450 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
451 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
452 for(i = 0; i < priv->audio_streams; i++)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
453 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
454 if(priv->astreams[i] == id)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
455 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
456 newid = id;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
457 break;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
458 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
459 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
460 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
461 if(newid == -2 || i == curridx)
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
462 return DEMUXER_CTRL_NOTIMPL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
463 else
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
464 {
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
465 ds_free_packs(demuxer->audio);
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
466 priv->avfc->streams[demuxer->audio->id]->discard = AVDISCARD_ALL;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
467 *((int*)arg) = demuxer->audio->id = newid;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
468 priv->avfc->streams[newid]->discard = AVDISCARD_NONE;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
469 return DEMUXER_CTRL_OK;
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
470 }
369074e0eb7b support for audio stream switching
nicodvb
parents: 17977
diff changeset
471 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
472 default:
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
473 return DEMUXER_CTRL_NOTIMPL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
474 }
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 void demux_close_lavf(demuxer_t *demuxer)
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
478 {
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
479 lavf_priv_t* priv = demuxer->priv;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
480 if (priv){
12304
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
481 if(priv->avfc)
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
482 {
434242b0706c fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents: 12168
diff changeset
483 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
484 }
12164
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
485 free(priv); demuxer->priv= NULL;
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
486 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
487 }
77ff303c0eaa demux_lavf
michael
parents:
diff changeset
488
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
489
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
490 demuxer_desc_t demuxer_desc_lavf = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
491 "libavformat demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
492 "lavf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
493 "libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
494 "Michael Niedermayer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
495 "supports many formats, requires libavformat",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
496 DEMUXER_TYPE_LAVF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
497 0, // Check after other demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
498 lavf_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
499 demux_lavf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
500 demux_open_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
501 demux_close_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
502 demux_seek_lavf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
503 demux_lavf_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
504 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16135
diff changeset
505