Mercurial > libavformat.hg
annotate flvdec.c @ 2671:7f320fb9f1c9 libavformat
avoid infinite loop at the end of files which are not properly terminated
author | aurel |
---|---|
date | Wed, 24 Oct 2007 21:44:20 +0000 |
parents | cb5f9ba6b63b |
children | 002ab6bbf9db |
rev | line source |
---|---|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1414
diff
changeset
|
2 * FLV demuxer |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
3 * Copyright (c) 2003 The FFmpeg Project. |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
4 * |
2216 | 5 * This demuxer will generate a 1 byte extradata for VP6F content. |
6 * It is composed of: | |
7 * - upper 4bits: difference between encoded width and visible width | |
8 * - lower 4bits: difference between encoded height and visible height | |
9 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1318
diff
changeset
|
10 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1318
diff
changeset
|
11 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1318
diff
changeset
|
12 * FFmpeg is free software; you can redistribute it and/or |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
13 * modify it under the terms of the GNU Lesser General Public |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
14 * License as published by the Free Software Foundation; either |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1318
diff
changeset
|
15 * version 2.1 of the License, or (at your option) any later version. |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
16 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1318
diff
changeset
|
17 * FFmpeg is distributed in the hope that it will be useful, |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
20 * Lesser General Public License for more details. |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
21 * |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
22 * You should have received a copy of the GNU Lesser General Public |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1318
diff
changeset
|
23 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
25 */ |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
26 #include "avformat.h" |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
27 #include "flv.h" |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
28 |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
29 static int flv_probe(AVProbeData *p) |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
30 { |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
31 const uint8_t *d; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
32 |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
33 d = p->buf; |
1718 | 34 if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0) { |
35 return AVPROBE_SCORE_MAX; | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
36 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
37 return 0; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
38 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
39 |
1568 | 40 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) { |
41 AVCodecContext *acodec = astream->codec; | |
42 switch(flv_codecid) { | |
43 //no distinction between S16 and S8 PCM codec flags | |
44 case FLV_CODECID_PCM_BE: | |
45 acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16BE; break; | |
46 case FLV_CODECID_PCM_LE: | |
47 acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break; | |
48 case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break; | |
2023 | 49 case FLV_CODECID_MP3 : acodec->codec_id = CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break; |
1568 | 50 case FLV_CODECID_NELLYMOSER_8HZ_MONO: |
51 acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate | |
52 case FLV_CODECID_NELLYMOSER: | |
2604 | 53 acodec->codec_id = CODEC_ID_NELLYMOSER; |
54 break; | |
1568 | 55 default: |
56 av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); | |
57 acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET; | |
58 } | |
59 } | |
60 | |
61 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) { | |
62 AVCodecContext *vcodec = vstream->codec; | |
63 switch(flv_codecid) { | |
64 case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; | |
65 case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break; | |
66 case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; | |
2572 | 67 case FLV_CODECID_VP6A : |
68 if(flv_codecid == FLV_CODECID_VP6A) | |
69 vcodec->codec_id = CODEC_ID_VP6A; | |
1568 | 70 if(vcodec->extradata_size != 1) { |
71 vcodec->extradata_size = 1; | |
72 vcodec->extradata = av_malloc(1); | |
73 } | |
74 vcodec->extradata[0] = get_byte(&s->pb); | |
75 return 1; // 1 byte body size adjustment for flv_read_packet() | |
76 default: | |
77 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid); | |
78 vcodec->codec_tag = flv_codecid; | |
79 } | |
80 | |
81 return 0; | |
82 } | |
83 | |
1560
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
84 static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) { |
1561 | 85 int length = get_be16(ioc); |
1560
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
86 if(length >= buffsize) { |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
87 url_fskip(ioc, length); |
1561 | 88 return -1; |
1560
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
89 } |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
90 |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
91 get_buffer(ioc, buffer, length); |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
92 |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
93 buffer[length] = '\0'; |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
94 |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
95 return length; |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
96 } |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
97 |
1568 | 98 static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, unsigned int max_pos, int depth) { |
99 AVCodecContext *acodec, *vcodec; | |
100 ByteIOContext *ioc; | |
101 AMFDataType amf_type; | |
102 char str_val[256]; | |
103 double num_val; | |
104 | |
105 num_val = 0; | |
106 ioc = &s->pb; | |
107 | |
108 amf_type = get_byte(ioc); | |
109 | |
110 switch(amf_type) { | |
111 case AMF_DATA_TYPE_NUMBER: | |
112 num_val = av_int2dbl(get_be64(ioc)); break; | |
113 case AMF_DATA_TYPE_BOOL: | |
114 num_val = get_byte(ioc); break; | |
115 case AMF_DATA_TYPE_STRING: | |
116 if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0) | |
117 return -1; | |
118 break; | |
119 case AMF_DATA_TYPE_OBJECT: { | |
120 unsigned int keylen; | |
121 | |
122 while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) { | |
123 url_fskip(ioc, keylen); //skip key string | |
124 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) | |
125 return -1; //if we couldn't skip, bomb out. | |
126 } | |
127 if(get_byte(ioc) != AMF_END_OF_OBJECT) | |
128 return -1; | |
129 } | |
130 break; | |
131 case AMF_DATA_TYPE_NULL: | |
132 case AMF_DATA_TYPE_UNDEFINED: | |
133 case AMF_DATA_TYPE_UNSUPPORTED: | |
134 break; //these take up no additional space | |
135 case AMF_DATA_TYPE_MIXEDARRAY: | |
136 url_fskip(ioc, 4); //skip 32-bit max array index | |
137 while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { | |
138 //this is the only case in which we would want a nested parse to not skip over the object | |
139 if(amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) | |
140 return -1; | |
141 } | |
142 if(get_byte(ioc) != AMF_END_OF_OBJECT) | |
143 return -1; | |
144 break; | |
145 case AMF_DATA_TYPE_ARRAY: { | |
146 unsigned int arraylen, i; | |
147 | |
148 arraylen = get_be32(ioc); | |
149 for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) { | |
150 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) | |
151 return -1; //if we couldn't skip, bomb out. | |
152 } | |
153 } | |
154 break; | |
155 case AMF_DATA_TYPE_DATE: | |
156 url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16) | |
157 break; | |
158 default: //unsupported type, we couldn't skip | |
159 return -1; | |
160 } | |
161 | |
162 if(depth == 1 && key) { //only look for metadata values when we are not nested and key != NULL | |
163 acodec = astream ? astream->codec : NULL; | |
164 vcodec = vstream ? vstream->codec : NULL; | |
165 | |
166 if(amf_type == AMF_DATA_TYPE_BOOL) { | |
167 if(!strcmp(key, "stereo") && acodec) acodec->channels = num_val > 0 ? 2 : 1; | |
168 } else if(amf_type == AMF_DATA_TYPE_NUMBER) { | |
169 if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE; | |
1719
f813f8755dd1
flv follows in movs footsteps and has random trash in the width/height fields
michael
parents:
1718
diff
changeset
|
170 // else if(!strcmp(key, "width") && vcodec && num_val > 0) vcodec->width = num_val; |
f813f8755dd1
flv follows in movs footsteps and has random trash in the width/height fields
michael
parents:
1718
diff
changeset
|
171 // else if(!strcmp(key, "height") && vcodec && num_val > 0) vcodec->height = num_val; |
1568 | 172 else if(!strcmp(key, "audiocodecid") && acodec) flv_set_audio_codec(s, astream, (int)num_val << FLV_AUDIO_CODECID_OFFSET); |
173 else if(!strcmp(key, "videocodecid") && vcodec) flv_set_video_codec(s, vstream, (int)num_val); | |
174 else if(!strcmp(key, "audiosamplesize") && acodec && num_val >= 0) { | |
175 acodec->bits_per_sample = num_val; | |
176 //we may have to rewrite a previously read codecid because FLV only marks PCM endianness. | |
177 if(num_val == 8 && (acodec->codec_id == CODEC_ID_PCM_S16BE || acodec->codec_id == CODEC_ID_PCM_S16LE)) | |
178 acodec->codec_id = CODEC_ID_PCM_S8; | |
179 } | |
180 else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) { | |
181 //some tools, like FLVTool2, write consistently approximate metadata sample rates | |
182 switch((int)num_val) { | |
183 case 44000: acodec->sample_rate = 44100 ; break; | |
184 case 22000: acodec->sample_rate = 22050 ; break; | |
185 case 11000: acodec->sample_rate = 11025 ; break; | |
186 case 5000 : acodec->sample_rate = 5512 ; break; | |
187 default : acodec->sample_rate = num_val; | |
188 } | |
189 } | |
190 } | |
191 } | |
192 | |
193 return 0; | |
194 } | |
195 | |
196 static int flv_read_metabody(AVFormatContext *s, unsigned int next_pos) { | |
197 AMFDataType type; | |
198 AVStream *stream, *astream, *vstream; | |
199 ByteIOContext *ioc; | |
200 int i, keylen; | |
201 char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want. | |
202 | |
203 astream = NULL; | |
204 vstream = NULL; | |
205 keylen = 0; | |
206 ioc = &s->pb; | |
207 | |
208 //first object needs to be "onMetaData" string | |
209 type = get_byte(ioc); | |
210 if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData")) | |
211 return -1; | |
212 | |
213 //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called. | |
214 for(i = 0; i < s->nb_streams; i++) { | |
215 stream = s->streams[i]; | |
216 if (stream->codec->codec_type == CODEC_TYPE_AUDIO) astream = stream; | |
217 else if(stream->codec->codec_type == CODEC_TYPE_VIDEO) vstream = stream; | |
218 } | |
219 | |
220 //parse the second object (we want a mixed array) | |
221 if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0) | |
222 return -1; | |
223 | |
224 return 0; | |
225 } | |
226 | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
227 static int flv_read_header(AVFormatContext *s, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
228 AVFormatParameters *ap) |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
229 { |
1563
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
230 int offset, flags; |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
231 AVStream *st; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
232 |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
233 url_fskip(&s->pb, 4); |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
234 flags = get_byte(&s->pb); |
1886 | 235 /* old flvtool cleared this field */ |
236 /* FIXME: better fix needed */ | |
237 if (!flags) { | |
238 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO; | |
239 av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n"); | |
240 } | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
241 |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
242 if(flags & FLV_HEADER_FLAG_HASVIDEO){ |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
243 st = av_new_stream(s, 0); |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
244 if (!st) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2216
diff
changeset
|
245 return AVERROR(ENOMEM); |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
246 st->codec->codec_type = CODEC_TYPE_VIDEO; |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
247 av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
248 } |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
249 if(flags & FLV_HEADER_FLAG_HASAUDIO){ |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
250 st = av_new_stream(s, 1); |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
251 if (!st) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2216
diff
changeset
|
252 return AVERROR(ENOMEM); |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
253 st->codec->codec_type = CODEC_TYPE_AUDIO; |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
254 av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
255 } |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
256 |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
257 offset = get_be32(&s->pb); |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
258 url_fseek(&s->pb, offset, SEEK_SET); |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
259 |
1318 | 260 s->start_time = 0; |
261 | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
262 return 0; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
263 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
264 |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
265 static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
266 { |
2571 | 267 int ret, i, type, size, pts, flags, is_audio, next, pos; |
679 | 268 AVStream *st = NULL; |
885 | 269 |
445 | 270 for(;;){ |
1318 | 271 pos = url_ftell(&s->pb); |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
272 url_fskip(&s->pb, 4); /* size of previous packet */ |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
273 type = get_byte(&s->pb); |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
274 size = get_be24(&s->pb); |
2571 | 275 pts = get_be24(&s->pb); |
276 // av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, pts:%d\n", type, size, pts); | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
277 if (url_feof(&s->pb)) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
278 return AVERROR(EIO); |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
279 url_fskip(&s->pb, 4); /* reserved */ |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
280 flags = 0; |
885 | 281 |
445 | 282 if(size == 0) |
283 continue; | |
885 | 284 |
821 | 285 next= size + url_ftell(&s->pb); |
286 | |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
287 if (type == FLV_TAG_TYPE_AUDIO) { |
445 | 288 is_audio=1; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
289 flags = get_byte(&s->pb); |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
290 } else if (type == FLV_TAG_TYPE_VIDEO) { |
445 | 291 is_audio=0; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
292 flags = get_byte(&s->pb); |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
293 } else { |
1568 | 294 if (type == FLV_TAG_TYPE_META && size > 13+1+4) |
295 flv_read_metabody(s, next); | |
296 else /* skip packet */ | |
297 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); | |
821 | 298 url_fseek(&s->pb, next, SEEK_SET); |
445 | 299 continue; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
300 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
301 |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
302 /* now find stream */ |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
303 for(i=0;i<s->nb_streams;i++) { |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
304 st = s->streams[i]; |
445 | 305 if (st->id == is_audio) |
306 break; | |
307 } | |
308 if(i == s->nb_streams){ | |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
309 av_log(NULL, AV_LOG_ERROR, "invalid stream\n"); |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
310 url_fseek(&s->pb, next, SEEK_SET); |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
311 continue; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
312 } |
708 | 313 // av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard); |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
314 if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio)) |
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
315 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) |
708 | 316 || st->discard >= AVDISCARD_ALL |
317 ){ | |
821 | 318 url_fseek(&s->pb, next, SEEK_SET); |
652 | 319 continue; |
320 } | |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
321 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) |
2571 | 322 av_add_index_entry(st, pos, pts, size, 0, AVINDEX_KEYFRAME); |
445 | 323 break; |
324 } | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
325 |
1563
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
326 // if not streamed and no duration from metadata then seek to end to find the duration from the timestamps |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
327 if(!url_is_streamed(&s->pb) && s->duration==AV_NOPTS_VALUE){ |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
328 int size; |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
329 const int pos= url_ftell(&s->pb); |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
330 const int fsize= url_fsize(&s->pb); |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
331 url_fseek(&s->pb, fsize-4, SEEK_SET); |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
332 size= get_be32(&s->pb); |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
333 url_fseek(&s->pb, fsize-3-size, SEEK_SET); |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
334 if(size == get_be24(&s->pb) + 11){ |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
335 s->duration= get_be24(&s->pb) * (int64_t)AV_TIME_BASE / 1000; |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
336 } |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
337 url_fseek(&s->pb, pos, SEEK_SET); |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
338 } |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
339 |
445 | 340 if(is_audio){ |
1568 | 341 if(!st->codec->sample_rate || !st->codec->bits_per_sample || (!st->codec->codec_id && !st->codec->codec_tag)) { |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
342 st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; |
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
343 if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8HZ_MONO) |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
775
diff
changeset
|
344 st->codec->sample_rate= 8000; |
445 | 345 else |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
346 st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3); |
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
347 st->codec->bits_per_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; |
1568 | 348 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); |
445 | 349 } |
350 }else{ | |
1568 | 351 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); |
378 | 352 } |
353 | |
821 | 354 ret= av_get_packet(&s->pb, pkt, size - 1); |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
355 if (ret <= 0) { |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
356 return AVERROR(EIO); |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
357 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
358 /* note: we need to modify the packet size here to handle the last |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
359 packet */ |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
360 pkt->size = ret; |
2571 | 361 pkt->pts = pts; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
362 pkt->stream_index = st->index; |
885 | 363 |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
364 if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)) |
887 | 365 pkt->flags |= PKT_FLAG_KEY; |
885 | 366 |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
367 return ret; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
368 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
369 |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
370 static int flv_read_close(AVFormatContext *s) |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
371 { |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
372 return 0; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
373 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
374 |
1318 | 375 static int flv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) |
376 { | |
377 AVStream *st = s->streams[stream_index]; | |
378 int index = av_index_search_timestamp(st, timestamp, flags); | |
379 if (index < 0) | |
380 return -1; | |
381 url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET); | |
382 | |
383 return 0; | |
384 } | |
385 | |
1167 | 386 AVInputFormat flv_demuxer = { |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
387 "flv", |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
388 "flv format", |
2571 | 389 0, |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
390 flv_probe, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
391 flv_read_header, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
392 flv_read_packet, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
393 flv_read_close, |
1318 | 394 flv_read_seek, |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
395 .extensions = "flv", |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
396 .value = CODEC_ID_FLV1, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
397 }; |