Mercurial > libavformat.hg
annotate asf.c @ 651:6a5ba24b2c6b libavformat
fixing demuxing for short files where the framerate detection failed
author | michael |
---|---|
date | Sat, 22 Jan 2005 02:30:45 +0000 |
parents | 253b5292946a |
children | b47948262721 |
rev | line source |
---|---|
0 | 1 /* |
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
2 * ASF compatible decoder. |
0 | 3 * Copyright (c) 2000, 2001 Fabrice Bellard. |
4 * | |
5 * This library is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
9 * | |
10 * This library is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 */ | |
19 #include "avformat.h" | |
20 #include "avi.h" | |
21 #include "mpegaudio.h" | |
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
22 #include "asf.h" |
0 | 23 |
348 | 24 #undef NDEBUG |
25 #include <assert.h> | |
26 | |
373
e47d9c8e2054
asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
372
diff
changeset
|
27 #define FRAME_HEADER_SIZE 17 |
e47d9c8e2054
asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
372
diff
changeset
|
28 // Fix Me! FRAME_HEADER_SIZE may be different. |
e47d9c8e2054
asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
372
diff
changeset
|
29 |
0 | 30 static const GUID index_guid = { |
31 0x33000890, 0xe5b1, 0x11cf, { 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb }, | |
32 }; | |
33 | |
34 /**********************************/ | |
35 /* decoding */ | |
36 | |
37 //#define DEBUG | |
38 | |
39 #ifdef DEBUG | |
69 | 40 #define PRINT_IF_GUID(g,cmp) \ |
41 if (!memcmp(g, &cmp, sizeof(GUID))) \ | |
42 printf("(GUID: %s) ", #cmp) | |
43 | |
0 | 44 static void print_guid(const GUID *g) |
45 { | |
46 int i; | |
69 | 47 PRINT_IF_GUID(g, asf_header); |
48 else PRINT_IF_GUID(g, file_header); | |
49 else PRINT_IF_GUID(g, stream_header); | |
50 else PRINT_IF_GUID(g, audio_stream); | |
51 else PRINT_IF_GUID(g, audio_conceal_none); | |
52 else PRINT_IF_GUID(g, video_stream); | |
53 else PRINT_IF_GUID(g, video_conceal_none); | |
54 else PRINT_IF_GUID(g, comment_header); | |
55 else PRINT_IF_GUID(g, codec_comment_header); | |
56 else PRINT_IF_GUID(g, codec_comment1_header); | |
57 else PRINT_IF_GUID(g, data_header); | |
58 else PRINT_IF_GUID(g, index_guid); | |
59 else PRINT_IF_GUID(g, head1_guid); | |
60 else PRINT_IF_GUID(g, head2_guid); | |
61 else PRINT_IF_GUID(g, my_guid); | |
62 else | |
63 printf("(GUID: unknown) "); | |
0 | 64 printf("0x%08x, 0x%04x, 0x%04x, {", g->v1, g->v2, g->v3); |
65 for(i=0;i<8;i++) | |
66 printf(" 0x%02x,", g->v4[i]); | |
67 printf("}\n"); | |
68 } | |
69 | 69 #undef PRINT_IF_GUID(g,cmp) |
0 | 70 #endif |
71 | |
72 static void get_guid(ByteIOContext *s, GUID *g) | |
73 { | |
74 int i; | |
75 | |
76 g->v1 = get_le32(s); | |
77 g->v2 = get_le16(s); | |
78 g->v3 = get_le16(s); | |
79 for(i=0;i<8;i++) | |
80 g->v4[i] = get_byte(s); | |
81 } | |
82 | |
83 #if 0 | |
84 static void get_str16(ByteIOContext *pb, char *buf, int buf_size) | |
85 { | |
86 int len, c; | |
87 char *q; | |
88 | |
89 len = get_le16(pb); | |
90 q = buf; | |
91 while (len > 0) { | |
92 c = get_le16(pb); | |
93 if ((q - buf) < buf_size - 1) | |
94 *q++ = c; | |
95 len--; | |
96 } | |
97 *q = '\0'; | |
98 } | |
99 #endif | |
100 | |
101 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) | |
102 { | |
103 int c; | |
104 char *q; | |
105 | |
106 q = buf; | |
107 while (len > 0) { | |
108 c = get_le16(pb); | |
109 if ((q - buf) < buf_size - 1) | |
110 *q++ = c; | |
111 len-=2; | |
112 } | |
113 *q = '\0'; | |
114 } | |
115 | |
116 static int asf_probe(AVProbeData *pd) | |
117 { | |
118 GUID g; | |
119 const unsigned char *p; | |
120 int i; | |
121 | |
122 /* check file header */ | |
123 if (pd->buf_size <= 32) | |
124 return 0; | |
125 p = pd->buf; | |
126 g.v1 = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); | |
127 p += 4; | |
128 g.v2 = p[0] | (p[1] << 8); | |
129 p += 2; | |
130 g.v3 = p[0] | (p[1] << 8); | |
131 p += 2; | |
132 for(i=0;i<8;i++) | |
133 g.v4[i] = *p++; | |
134 | |
135 if (!memcmp(&g, &asf_header, sizeof(GUID))) | |
136 return AVPROBE_SCORE_MAX; | |
137 else | |
138 return 0; | |
139 } | |
140 | |
141 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) | |
142 { | |
143 ASFContext *asf = s->priv_data; | |
144 GUID g; | |
145 ByteIOContext *pb = &s->pb; | |
146 AVStream *st; | |
147 ASFStream *asf_st; | |
148 int size, i; | |
65 | 149 int64_t gsize; |
0 | 150 |
151 get_guid(pb, &g); | |
152 if (memcmp(&g, &asf_header, sizeof(GUID))) | |
153 goto fail; | |
154 get_le64(pb); | |
155 get_le32(pb); | |
156 get_byte(pb); | |
157 get_byte(pb); | |
158 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); | |
159 for(;;) { | |
160 get_guid(pb, &g); | |
161 gsize = get_le64(pb); | |
162 #ifdef DEBUG | |
163 printf("%08Lx: ", url_ftell(pb) - 24); | |
164 print_guid(&g); | |
165 printf(" size=0x%Lx\n", gsize); | |
166 #endif | |
167 if (gsize < 24) | |
168 goto fail; | |
169 if (!memcmp(&g, &file_header, sizeof(GUID))) { | |
170 get_guid(pb, &asf->hdr.guid); | |
171 asf->hdr.file_size = get_le64(pb); | |
172 asf->hdr.create_time = get_le64(pb); | |
173 asf->hdr.packets_count = get_le64(pb); | |
174 asf->hdr.play_time = get_le64(pb); | |
175 asf->hdr.send_time = get_le64(pb); | |
176 asf->hdr.preroll = get_le32(pb); | |
177 asf->hdr.ignore = get_le32(pb); | |
178 asf->hdr.flags = get_le32(pb); | |
179 asf->hdr.min_pktsize = get_le32(pb); | |
180 asf->hdr.max_pktsize = get_le32(pb); | |
181 asf->hdr.max_bitrate = get_le32(pb); | |
182 asf->packet_size = asf->hdr.max_pktsize; | |
183 asf->nb_packets = asf->hdr.packets_count; | |
184 } else if (!memcmp(&g, &stream_header, sizeof(GUID))) { | |
84
0068a6902911
correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
74
diff
changeset
|
185 int type, total_size, type_specific_size; |
0 | 186 unsigned int tag1; |
65 | 187 int64_t pos1, pos2; |
0 | 188 |
189 pos1 = url_ftell(pb); | |
190 | |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
191 st = av_new_stream(s, 0); |
0 | 192 if (!st) |
193 goto fail; | |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
437
diff
changeset
|
194 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ |
0 | 195 asf_st = av_mallocz(sizeof(ASFStream)); |
196 if (!asf_st) | |
197 goto fail; | |
198 st->priv_data = asf_st; | |
627 | 199 st->start_time = asf->hdr.preroll * (int64_t)AV_TIME_BASE / 1000; |
200 st->duration = asf->hdr.send_time / | |
201 (10000000 / AV_TIME_BASE) - st->start_time; | |
0 | 202 get_guid(pb, &g); |
203 if (!memcmp(&g, &audio_stream, sizeof(GUID))) { | |
204 type = CODEC_TYPE_AUDIO; | |
205 } else if (!memcmp(&g, &video_stream, sizeof(GUID))) { | |
206 type = CODEC_TYPE_VIDEO; | |
207 } else { | |
208 goto fail; | |
209 } | |
210 get_guid(pb, &g); | |
211 total_size = get_le64(pb); | |
84
0068a6902911
correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
74
diff
changeset
|
212 type_specific_size = get_le32(pb); |
0 | 213 get_le32(pb); |
214 st->id = get_le16(pb) & 0x7f; /* stream id */ | |
215 // mapping of asf ID to AV stream ID; | |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
216 asf->asfid2avid[st->id] = s->nb_streams - 1; |
0 | 217 |
218 get_le32(pb); | |
219 st->codec.codec_type = type; | |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
220 /* 1 fps default (XXX: put 0 fps instead) */ |
623 | 221 st->codec.frame_rate = 1000; |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
222 st->codec.frame_rate_base = 1; |
0 | 223 if (type == CODEC_TYPE_AUDIO) { |
84
0068a6902911
correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
74
diff
changeset
|
224 get_wav_header(pb, &st->codec, type_specific_size); |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
225 st->need_parsing = 1; |
0 | 226 /* We have to init the frame size at some point .... */ |
227 pos2 = url_ftell(pb); | |
228 if (gsize > (pos2 + 8 - pos1 + 24)) { | |
229 asf_st->ds_span = get_byte(pb); | |
230 asf_st->ds_packet_size = get_le16(pb); | |
231 asf_st->ds_chunk_size = get_le16(pb); | |
232 asf_st->ds_data_size = get_le16(pb); | |
233 asf_st->ds_silence_data = get_byte(pb); | |
234 } | |
235 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", | |
236 // asf_st->ds_packet_size, asf_st->ds_chunk_size, | |
237 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); | |
238 if (asf_st->ds_span > 1) { | |
239 if (!asf_st->ds_chunk_size | |
240 || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1)) | |
241 asf_st->ds_span = 0; // disable descrambling | |
242 } | |
243 switch (st->codec.codec_id) { | |
232 | 244 case CODEC_ID_MP3: |
0 | 245 st->codec.frame_size = MPA_FRAME_SIZE; |
246 break; | |
247 case CODEC_ID_PCM_S16LE: | |
248 case CODEC_ID_PCM_S16BE: | |
249 case CODEC_ID_PCM_U16LE: | |
250 case CODEC_ID_PCM_U16BE: | |
251 case CODEC_ID_PCM_S8: | |
252 case CODEC_ID_PCM_U8: | |
253 case CODEC_ID_PCM_ALAW: | |
254 case CODEC_ID_PCM_MULAW: | |
255 st->codec.frame_size = 1; | |
256 break; | |
257 default: | |
258 /* This is probably wrong, but it prevents a crash later */ | |
259 st->codec.frame_size = 1; | |
260 break; | |
261 } | |
262 } else { | |
263 get_le32(pb); | |
264 get_le32(pb); | |
265 get_byte(pb); | |
266 size = get_le16(pb); /* size */ | |
267 get_le32(pb); /* size */ | |
268 st->codec.width = get_le32(pb); | |
269 st->codec.height = get_le32(pb); | |
270 /* not available for asf */ | |
271 get_le16(pb); /* panes */ | |
117 | 272 st->codec.bits_per_sample = get_le16(pb); /* depth */ |
0 | 273 tag1 = get_le32(pb); |
274 url_fskip(pb, 20); | |
275 if (size > 40) { | |
276 st->codec.extradata_size = size - 40; | |
587
fe24632a577b
allocate a few bytes more for extradata so the bitstream reader if its used by the codec for parsing extardata, doesnt read over the end
michael
parents:
573
diff
changeset
|
277 st->codec.extradata = av_mallocz(st->codec.extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
0 | 278 get_buffer(pb, st->codec.extradata, st->codec.extradata_size); |
279 } | |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
280 |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
281 /* Extract palette from extradata if bpp <= 8 */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
282 /* This code assumes that extradata contains only palette */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
283 /* This is true for all paletted codecs implemented in ffmpeg */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
284 if (st->codec.extradata_size && (st->codec.bits_per_sample <= 8)) { |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
285 st->codec.palctrl = av_mallocz(sizeof(AVPaletteControl)); |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
286 #ifdef WORDS_BIGENDIAN |
300
6ee1b02f9b2a
* fixes for broken builds on Solaris, OS2 and all bingendian
romansh
parents:
297
diff
changeset
|
287 for (i = 0; i < FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)/4; i++) |
6ee1b02f9b2a
* fixes for broken builds on Solaris, OS2 and all bingendian
romansh
parents:
297
diff
changeset
|
288 st->codec.palctrl->palette[i] = bswap_32(((uint32_t*)st->codec.extradata)[i]); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
289 #else |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
290 memcpy(st->codec.palctrl->palette, st->codec.extradata, |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
291 FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)); |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
292 #endif |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
293 st->codec.palctrl->palette_changed = 1; |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
294 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
295 |
74 | 296 st->codec.codec_tag = tag1; |
0 | 297 st->codec.codec_id = codec_get_id(codec_bmp_tags, tag1); |
573 | 298 if(tag1 == MKTAG('D', 'V', 'R', ' ')) |
299 st->need_parsing = 1; | |
0 | 300 } |
301 pos2 = url_ftell(pb); | |
302 url_fskip(pb, gsize - (pos2 - pos1 + 24)); | |
303 } else if (!memcmp(&g, &data_header, sizeof(GUID))) { | |
304 break; | |
305 } else if (!memcmp(&g, &comment_header, sizeof(GUID))) { | |
306 int len1, len2, len3, len4, len5; | |
307 | |
308 len1 = get_le16(pb); | |
309 len2 = get_le16(pb); | |
310 len3 = get_le16(pb); | |
311 len4 = get_le16(pb); | |
312 len5 = get_le16(pb); | |
313 get_str16_nolen(pb, len1, s->title, sizeof(s->title)); | |
314 get_str16_nolen(pb, len2, s->author, sizeof(s->author)); | |
315 get_str16_nolen(pb, len3, s->copyright, sizeof(s->copyright)); | |
316 get_str16_nolen(pb, len4, s->comment, sizeof(s->comment)); | |
317 url_fskip(pb, len5); | |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
318 } else if (!memcmp(&g, &extended_content_header, sizeof(GUID))) { |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
319 int desc_count, i; |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
320 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
321 desc_count = get_le16(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
322 for(i=0;i<desc_count;i++) |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
323 { |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
324 int name_len,value_type,value_len,value_num = 0; |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
325 char *name, *value; |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
326 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
327 name_len = get_le16(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
328 name = (char *)av_mallocz(name_len); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
329 get_str16_nolen(pb, name_len, name, name_len); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
330 value_type = get_le16(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
331 value_len = get_le16(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
332 if ((value_type == 0) || (value_type == 1)) // unicode or byte |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
333 { |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
334 value = (char *)av_mallocz(value_len); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
335 get_str16_nolen(pb, value_len, value, value_len); |
643 | 336 if (strcmp(name,"WM/AlbumTitle")==0) { pstrcpy(s->album, sizeof(s->album), value); } |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
337 av_free(value); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
338 } |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
339 if ((value_type >= 2) || (value_type <= 5)) // boolean or DWORD or QWORD or WORD |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
340 { |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
341 if (value_type==2) value_num = get_le32(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
342 if (value_type==3) value_num = get_le32(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
343 if (value_type==4) value_num = get_le64(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
344 if (value_type==5) value_num = get_le16(pb); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
345 if (strcmp(name,"WM/Track")==0) s->track = value_num + 1; |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
346 if (strcmp(name,"WM/TrackNumber")==0) s->track = value_num; |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
347 } |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
348 av_free(name); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
349 } |
0 | 350 #if 0 |
351 } else if (!memcmp(&g, &head1_guid, sizeof(GUID))) { | |
352 int v1, v2; | |
353 get_guid(pb, &g); | |
354 v1 = get_le32(pb); | |
355 v2 = get_le16(pb); | |
356 } else if (!memcmp(&g, &codec_comment_header, sizeof(GUID))) { | |
357 int len, v1, n, num; | |
358 char str[256], *q; | |
359 char tag[16]; | |
360 | |
361 get_guid(pb, &g); | |
362 print_guid(&g); | |
363 | |
364 n = get_le32(pb); | |
365 for(i=0;i<n;i++) { | |
366 num = get_le16(pb); /* stream number */ | |
367 get_str16(pb, str, sizeof(str)); | |
368 get_str16(pb, str, sizeof(str)); | |
369 len = get_le16(pb); | |
370 q = tag; | |
371 while (len > 0) { | |
372 v1 = get_byte(pb); | |
373 if ((q - tag) < sizeof(tag) - 1) | |
374 *q++ = v1; | |
375 len--; | |
376 } | |
377 *q = '\0'; | |
378 } | |
379 #endif | |
380 } else if (url_feof(pb)) { | |
381 goto fail; | |
382 } else { | |
383 url_fseek(pb, gsize - 24, SEEK_CUR); | |
384 } | |
385 } | |
386 get_guid(pb, &g); | |
387 get_le64(pb); | |
388 get_byte(pb); | |
389 get_byte(pb); | |
390 if (url_feof(pb)) | |
391 goto fail; | |
392 asf->data_offset = url_ftell(pb); | |
393 asf->packet_size_left = 0; | |
394 | |
395 return 0; | |
396 | |
397 fail: | |
398 for(i=0;i<s->nb_streams;i++) { | |
399 AVStream *st = s->streams[i]; | |
400 if (st) { | |
401 av_free(st->priv_data); | |
402 av_free(st->codec.extradata); | |
403 } | |
404 av_free(st); | |
405 } | |
406 return -1; | |
407 } | |
408 | |
409 #define DO_2BITS(bits, var, defval) \ | |
410 switch (bits & 3) \ | |
411 { \ | |
412 case 3: var = get_le32(pb); rsize += 4; break; \ | |
413 case 2: var = get_le16(pb); rsize += 2; break; \ | |
414 case 1: var = get_byte(pb); rsize++; break; \ | |
415 default: var = defval; break; \ | |
416 } | |
417 | |
418 static int asf_get_packet(AVFormatContext *s) | |
419 { | |
420 ASFContext *asf = s->priv_data; | |
421 ByteIOContext *pb = &s->pb; | |
422 uint32_t packet_length, padsize; | |
353 | 423 int rsize = 9; |
424 int c; | |
425 | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
426 if((url_ftell(&s->pb) - s->data_offset) % asf->packet_size) |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
427 return -1; |
353 | 428 assert((url_ftell(&s->pb) - s->data_offset) % asf->packet_size == 0); |
429 | |
430 c = get_byte(pb); | |
0 | 431 if (c != 0x82) { |
432 if (!url_feof(pb)) | |
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
433 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%lld\n", c, url_ftell(pb)); |
0 | 434 } |
435 if ((c & 0x0f) == 2) { // always true for now | |
436 if (get_le16(pb) != 0) { | |
437 if (!url_feof(pb)) | |
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
438 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); |
482 | 439 return AVERROR_IO; |
0 | 440 } |
353 | 441 rsize+=2; |
442 /* }else{ | |
443 if (!url_feof(pb)) | |
444 printf("ff asf bad header %x at:%lld\n", c, url_ftell(pb)); | |
482 | 445 return AVERROR_IO;*/ |
0 | 446 } |
447 | |
448 asf->packet_flags = get_byte(pb); | |
449 asf->packet_property = get_byte(pb); | |
450 | |
451 DO_2BITS(asf->packet_flags >> 5, packet_length, asf->packet_size); | |
452 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored | |
453 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length | |
454 | |
455 asf->packet_timestamp = get_le32(pb); | |
456 get_le16(pb); /* duration */ | |
457 // rsize has at least 11 bytes which have to be present | |
458 | |
459 if (asf->packet_flags & 0x01) { | |
460 asf->packet_segsizetype = get_byte(pb); rsize++; | |
461 asf->packet_segments = asf->packet_segsizetype & 0x3f; | |
462 } else { | |
463 asf->packet_segments = 1; | |
464 asf->packet_segsizetype = 0x80; | |
465 } | |
466 asf->packet_size_left = packet_length - padsize - rsize; | |
467 if (packet_length < asf->hdr.min_pktsize) | |
468 padsize += asf->hdr.min_pktsize - packet_length; | |
469 asf->packet_padsize = padsize; | |
470 #ifdef DEBUG | |
471 printf("packet: size=%d padsize=%d left=%d\n", asf->packet_size, asf->packet_padsize, asf->packet_size_left); | |
472 #endif | |
473 return 0; | |
474 } | |
475 | |
476 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) | |
477 { | |
478 ASFContext *asf = s->priv_data; | |
479 ASFStream *asf_st = 0; | |
480 ByteIOContext *pb = &s->pb; | |
481 //static int pc = 0; | |
482 for (;;) { | |
483 int rsize = 0; | |
484 if (asf->packet_size_left < FRAME_HEADER_SIZE | |
485 || asf->packet_segments < 1) { | |
486 //asf->packet_size_left <= asf->packet_padsize) { | |
487 int ret = asf->packet_size_left + asf->packet_padsize; | |
488 //printf("PacketLeftSize:%d Pad:%d Pos:%Ld\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); | |
489 /* fail safe */ | |
490 url_fskip(pb, ret); | |
349 | 491 asf->packet_pos= url_ftell(&s->pb); |
0 | 492 ret = asf_get_packet(s); |
493 //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++); | |
494 if (ret < 0 || url_feof(pb)) | |
482 | 495 return AVERROR_IO; |
0 | 496 asf->packet_time_start = 0; |
497 continue; | |
498 } | |
499 if (asf->packet_time_start == 0) { | |
500 /* read frame header */ | |
501 int num = get_byte(pb); | |
502 asf->packet_segments--; | |
503 rsize++; | |
504 asf->packet_key_frame = (num & 0x80) >> 7; | |
505 asf->stream_index = asf->asfid2avid[num & 0x7f]; | |
506 // sequence should be ignored! | |
507 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); | |
508 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); | |
509 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); | |
349 | 510 //printf("key:%d stream:%d seq:%d offset:%d replic_size:%d\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, //asf->packet_frag_offset, asf->packet_replic_size); |
0 | 511 if (asf->packet_replic_size > 1) { |
352
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
512 assert(asf->packet_replic_size >= 8); |
0 | 513 // it should be always at least 8 bytes - FIXME validate |
514 asf->packet_obj_size = get_le32(pb); | |
515 asf->packet_frag_timestamp = get_le32(pb); // timestamp | |
516 if (asf->packet_replic_size > 8) | |
517 url_fskip(pb, asf->packet_replic_size - 8); | |
518 rsize += asf->packet_replic_size; // FIXME - check validity | |
352
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
519 } else if (asf->packet_replic_size==1){ |
0 | 520 // multipacket - frag_offset is begining timestamp |
521 asf->packet_time_start = asf->packet_frag_offset; | |
522 asf->packet_frag_offset = 0; | |
523 asf->packet_frag_timestamp = asf->packet_timestamp; | |
524 | |
352
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
525 asf->packet_time_delta = get_byte(pb); |
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
526 rsize++; |
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
527 }else{ |
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
528 assert(asf->packet_replic_size==0); |
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
529 } |
0 | 530 if (asf->packet_flags & 0x01) { |
531 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal | |
532 #undef DO_2BITS | |
533 //printf("Fragsize %d\n", asf->packet_frag_size); | |
534 } else { | |
535 asf->packet_frag_size = asf->packet_size_left - rsize; | |
536 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize); | |
537 } | |
538 if (asf->packet_replic_size == 1) { | |
539 asf->packet_multi_size = asf->packet_frag_size; | |
540 if (asf->packet_multi_size > asf->packet_size_left) { | |
541 asf->packet_segments = 0; | |
542 continue; | |
543 } | |
544 } | |
545 asf->packet_size_left -= rsize; | |
546 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); | |
547 | |
548 if (asf->stream_index < 0) { | |
549 asf->packet_time_start = 0; | |
550 /* unhandled packet (should not happen) */ | |
551 url_fskip(pb, asf->packet_frag_size); | |
552 asf->packet_size_left -= asf->packet_frag_size; | |
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
553 av_log(s, AV_LOG_ERROR, "ff asf skip %d %d\n", asf->packet_frag_size, num & 0x7f); |
0 | 554 continue; |
555 } | |
556 asf->asf_st = s->streams[asf->stream_index]->priv_data; | |
557 } | |
558 asf_st = asf->asf_st; | |
559 | |
560 if ((asf->packet_frag_offset != asf_st->frag_offset | |
561 || (asf->packet_frag_offset | |
562 && asf->packet_seq != asf_st->seq)) // seq should be ignored | |
563 ) { | |
564 /* cannot continue current packet: free it */ | |
565 // FIXME better check if packet was already allocated | |
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
566 av_log(s, AV_LOG_INFO, "ff asf parser skips: %d - %d o:%d - %d %d %d fl:%d\n", |
0 | 567 asf_st->pkt.size, |
568 asf->packet_obj_size, | |
569 asf->packet_frag_offset, asf_st->frag_offset, | |
570 asf->packet_seq, asf_st->seq, asf->packet_frag_size); | |
571 if (asf_st->pkt.size) | |
572 av_free_packet(&asf_st->pkt); | |
573 asf_st->frag_offset = 0; | |
574 if (asf->packet_frag_offset != 0) { | |
575 url_fskip(pb, asf->packet_frag_size); | |
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
576 av_log(s, AV_LOG_INFO, "ff asf parser skiping %db\n", asf->packet_frag_size); |
0 | 577 asf->packet_size_left -= asf->packet_frag_size; |
578 continue; | |
579 } | |
580 } | |
581 if (asf->packet_replic_size == 1) { | |
582 // frag_offset is here used as the begining timestamp | |
583 asf->packet_frag_timestamp = asf->packet_time_start; | |
584 asf->packet_time_start += asf->packet_time_delta; | |
585 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb); | |
586 asf->packet_size_left--; | |
587 asf->packet_multi_size--; | |
588 if (asf->packet_multi_size < asf->packet_obj_size) | |
589 { | |
590 asf->packet_time_start = 0; | |
591 url_fskip(pb, asf->packet_multi_size); | |
592 asf->packet_size_left -= asf->packet_multi_size; | |
593 continue; | |
594 } | |
595 asf->packet_multi_size -= asf->packet_obj_size; | |
596 //printf("COMPRESS size %d %d %d ms:%d\n", asf->packet_obj_size, asf->packet_frag_timestamp, asf->packet_size_left, asf->packet_multi_size); | |
597 } | |
598 if (asf_st->frag_offset == 0) { | |
599 /* new packet */ | |
600 av_new_packet(&asf_st->pkt, asf->packet_obj_size); | |
601 asf_st->seq = asf->packet_seq; | |
627 | 602 asf_st->pkt.pts = asf->packet_frag_timestamp; |
0 | 603 asf_st->pkt.stream_index = asf->stream_index; |
352
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
604 asf_st->packet_pos= asf->packet_pos; |
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
605 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", |
349 | 606 //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & PKT_FLAG_KEY, |
352
c5ea5cdb5b58
replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
michael
parents:
351
diff
changeset
|
607 //s->streams[asf->stream_index]->codec.codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size); |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
608 if (s->streams[asf->stream_index]->codec.codec_type == CODEC_TYPE_AUDIO) |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
609 asf->packet_key_frame = 1; |
0 | 610 if (asf->packet_key_frame) |
611 asf_st->pkt.flags |= PKT_FLAG_KEY; | |
612 } | |
613 | |
614 /* read data */ | |
615 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", | |
616 // asf->packet_size, asf_st->pkt.size, asf->packet_frag_offset, | |
617 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data); | |
618 asf->packet_size_left -= asf->packet_frag_size; | |
619 if (asf->packet_size_left < 0) | |
620 continue; | |
621 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, | |
622 asf->packet_frag_size); | |
623 asf_st->frag_offset += asf->packet_frag_size; | |
624 /* test if whole packet is read */ | |
625 if (asf_st->frag_offset == asf_st->pkt.size) { | |
626 /* return packet */ | |
627 if (asf_st->ds_span > 1) { | |
628 /* packet descrambling */ | |
629 char* newdata = av_malloc(asf_st->pkt.size); | |
630 if (newdata) { | |
631 int offset = 0; | |
632 while (offset < asf_st->pkt.size) { | |
633 int off = offset / asf_st->ds_chunk_size; | |
634 int row = off / asf_st->ds_span; | |
635 int col = off % asf_st->ds_span; | |
636 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; | |
637 //printf("off:%d row:%d col:%d idx:%d\n", off, row, col, idx); | |
638 memcpy(newdata + offset, | |
639 asf_st->pkt.data + idx * asf_st->ds_chunk_size, | |
640 asf_st->ds_chunk_size); | |
641 offset += asf_st->ds_chunk_size; | |
642 } | |
643 av_free(asf_st->pkt.data); | |
644 asf_st->pkt.data = newdata; | |
645 } | |
646 } | |
647 asf_st->frag_offset = 0; | |
648 memcpy(pkt, &asf_st->pkt, sizeof(AVPacket)); | |
649 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size); | |
650 asf_st->pkt.size = 0; | |
651 asf_st->pkt.data = 0; | |
652 break; // packet completed | |
653 } | |
654 } | |
655 return 0; | |
656 } | |
657 | |
658 static int asf_read_close(AVFormatContext *s) | |
659 { | |
660 int i; | |
661 | |
662 for(i=0;i<s->nb_streams;i++) { | |
663 AVStream *st = s->streams[i]; | |
664 av_free(st->priv_data); | |
665 av_free(st->codec.extradata); | |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
666 av_free(st->codec.palctrl); |
0 | 667 } |
668 return 0; | |
669 } | |
670 | |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
671 // Added to support seeking after packets have been read |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
672 // If information is not reset, read_packet fails due to |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
673 // leftover information from previous reads |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
674 static void asf_reset_header(AVFormatContext *s) |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
675 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
676 ASFContext *asf = s->priv_data; |
349 | 677 ASFStream *asf_st; |
678 int i; | |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
679 |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
680 asf->packet_nb_frames = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
681 asf->packet_timestamp_start = -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
682 asf->packet_timestamp_end = -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
683 asf->packet_size_left = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
684 asf->packet_segments = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
685 asf->packet_flags = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
686 asf->packet_property = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
687 asf->packet_timestamp = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
688 asf->packet_segsizetype = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
689 asf->packet_segments = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
690 asf->packet_seq = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
691 asf->packet_replic_size = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
692 asf->packet_key_frame = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
693 asf->packet_padsize = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
694 asf->packet_frag_offset = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
695 asf->packet_frag_size = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
696 asf->packet_frag_timestamp = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
697 asf->packet_multi_size = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
698 asf->packet_obj_size = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
699 asf->packet_time_delta = 0; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
700 asf->packet_time_start = 0; |
349 | 701 |
702 for(i=0; i<s->nb_streams; i++){ | |
703 asf_st= s->streams[i]->priv_data; | |
704 av_free_packet(&asf_st->pkt); | |
705 asf_st->frag_offset=0; | |
706 asf_st->seq=0; | |
707 } | |
708 asf->asf_st= NULL; | |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
709 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
710 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
711 static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit) |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
712 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
713 ASFContext *asf = s->priv_data; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
714 AVPacket pkt1, *pkt = &pkt1; |
349 | 715 ASFStream *asf_st; |
716 int64_t pts; | |
348 | 717 int64_t pos= *ppos; |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
718 int i; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
719 int64_t start_pos[s->nb_streams]; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
720 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
721 for(i=0; i<s->nb_streams; i++){ |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
722 start_pos[i]= pos; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
723 } |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
724 |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
725 pos= (pos+asf->packet_size-1-s->data_offset)/asf->packet_size*asf->packet_size+ s->data_offset; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
726 *ppos= pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
727 url_fseek(&s->pb, pos, SEEK_SET); |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
728 |
349 | 729 //printf("asf_read_pts\n"); |
730 asf_reset_header(s); | |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
731 for(;;){ |
349 | 732 if (av_read_frame(s, pkt) < 0){ |
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
733 av_log(s, AV_LOG_INFO, "seek failed\n"); |
348 | 734 return AV_NOPTS_VALUE; |
349 | 735 } |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
736 |
463
696f41bc8784
store index for seeking in the native timebase of each stream
michael
parents:
462
diff
changeset
|
737 pts= pkt->pts * 1000 / AV_TIME_BASE; |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
738 |
348 | 739 av_free_packet(pkt); |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
740 if(pkt->flags&PKT_FLAG_KEY){ |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
741 i= pkt->stream_index; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
742 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
743 asf_st= s->streams[i]->priv_data; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
744 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
745 assert((asf_st->packet_pos - s->data_offset) % asf->packet_size == 0); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
746 pos= asf_st->packet_pos; |
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
747 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
748 av_add_index_entry(s->streams[i], pos, pts, pos - start_pos[i] + 1, AVINDEX_KEYFRAME); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
749 start_pos[i]= asf_st->packet_pos + 1; |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
750 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
751 if(pkt->stream_index == stream_index) |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
752 break; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
753 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
754 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
755 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
756 *ppos= pos; |
349 | 757 //printf("found keyframe at %Ld stream %d stamp:%Ld\n", *ppos, stream_index, pts); |
348 | 758 |
759 return pts; | |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
760 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
761 |
555 | 762 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) |
0 | 763 { |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
764 ASFContext *asf = s->priv_data; |
348 | 765 |
350 | 766 if (asf->packet_size <= 0) |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
767 return -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
768 |
555 | 769 if(av_seek_frame_binary(s, stream_index, pts, flags)<0) |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
770 return -1; |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
771 |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
772 asf_reset_header(s); |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
773 return 0; |
0 | 774 } |
775 | |
776 static AVInputFormat asf_iformat = { | |
777 "asf", | |
778 "asf format", | |
779 sizeof(ASFContext), | |
780 asf_probe, | |
781 asf_read_header, | |
782 asf_read_packet, | |
783 asf_read_close, | |
784 asf_read_seek, | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
785 asf_read_pts, |
0 | 786 }; |
787 | |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
788 #ifdef CONFIG_ENCODERS |
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
789 extern AVOutputFormat asf_oformat; |
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
790 extern AVOutputFormat asf_stream_oformat; |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
791 #endif //CONFIG_ENCODERS |
0 | 792 |
793 int asf_init(void) | |
794 { | |
795 av_register_input_format(&asf_iformat); | |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
796 #ifdef CONFIG_ENCODERS |
0 | 797 av_register_output_format(&asf_oformat); |
798 av_register_output_format(&asf_stream_oformat); | |
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
799 #endif //CONFIG_ENCODERS |
0 | 800 return 0; |
801 } |