annotate libmpdemux/demux_lavf.c @ 17977:f70772d02eaa

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