Mercurial > libavformat.hg
annotate asf.c @ 1764:913e0d9b82d3 libavformat
iam pretty sure send time is dts and not pts ...
author | michael |
---|---|
date | Wed, 07 Feb 2007 23:06:13 +0000 |
parents | 12a896fa993b |
children | b090df664f0d |
rev | line source |
---|---|
0 | 1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1388
diff
changeset
|
2 * ASF compatible demuxer |
0 | 3 * Copyright (c) 2000, 2001 Fabrice Bellard. |
4 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1333
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1333
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1333
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
0 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * 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:
1333
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
0 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1333
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * 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:
1333
diff
changeset
|
18 * 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
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 20 */ |
21 #include "avformat.h" | |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
22 #include "riff.h" |
0 | 23 #include "mpegaudio.h" |
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
24 #include "asf.h" |
1503 | 25 #include "common.h" |
0 | 26 |
348 | 27 #undef NDEBUG |
28 #include <assert.h> | |
29 | |
373
e47d9c8e2054
asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
372
diff
changeset
|
30 #define FRAME_HEADER_SIZE 17 |
885 | 31 // Fix Me! FRAME_HEADER_SIZE may be different. |
373
e47d9c8e2054
asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
372
diff
changeset
|
32 |
0 | 33 static const GUID index_guid = { |
1687 | 34 0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb |
0 | 35 }; |
36 | |
37 /**********************************/ | |
38 /* decoding */ | |
39 | |
40 //#define DEBUG | |
41 | |
42 #ifdef DEBUG | |
69 | 43 #define PRINT_IF_GUID(g,cmp) \ |
44 if (!memcmp(g, &cmp, sizeof(GUID))) \ | |
45 printf("(GUID: %s) ", #cmp) | |
46 | |
0 | 47 static void print_guid(const GUID *g) |
48 { | |
49 int i; | |
69 | 50 PRINT_IF_GUID(g, asf_header); |
51 else PRINT_IF_GUID(g, file_header); | |
52 else PRINT_IF_GUID(g, stream_header); | |
53 else PRINT_IF_GUID(g, audio_stream); | |
54 else PRINT_IF_GUID(g, audio_conceal_none); | |
55 else PRINT_IF_GUID(g, video_stream); | |
56 else PRINT_IF_GUID(g, video_conceal_none); | |
831
8e1b338096a0
changes to ignore command media embedded in MS WMV files patch by ("Brown, Mike": mikeb, vibephone com)
michael
parents:
828
diff
changeset
|
57 else PRINT_IF_GUID(g, command_stream); |
69 | 58 else PRINT_IF_GUID(g, comment_header); |
59 else PRINT_IF_GUID(g, codec_comment_header); | |
60 else PRINT_IF_GUID(g, codec_comment1_header); | |
61 else PRINT_IF_GUID(g, data_header); | |
62 else PRINT_IF_GUID(g, index_guid); | |
63 else PRINT_IF_GUID(g, head1_guid); | |
64 else PRINT_IF_GUID(g, head2_guid); | |
65 else PRINT_IF_GUID(g, my_guid); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
66 else PRINT_IF_GUID(g, ext_stream_header); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
67 else PRINT_IF_GUID(g, extended_content_header); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
68 else PRINT_IF_GUID(g, ext_stream_embed_stream_header); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
69 else PRINT_IF_GUID(g, ext_stream_audio_stream); |
1750 | 70 else PRINT_IF_GUID(g, metadata_header); |
69 | 71 else |
72 printf("(GUID: unknown) "); | |
1687 | 73 for(i=0;i<16;i++) |
74 printf(" 0x%02x,", (*g)[i]); | |
0 | 75 printf("}\n"); |
76 } | |
949 | 77 #undef PRINT_IF_GUID |
0 | 78 #endif |
79 | |
80 static void get_guid(ByteIOContext *s, GUID *g) | |
81 { | |
1687 | 82 assert(sizeof(*g) == 16); |
83 get_buffer(s, g, sizeof(*g)); | |
0 | 84 } |
85 | |
86 #if 0 | |
87 static void get_str16(ByteIOContext *pb, char *buf, int buf_size) | |
88 { | |
89 int len, c; | |
90 char *q; | |
91 | |
92 len = get_le16(pb); | |
93 q = buf; | |
94 while (len > 0) { | |
95 c = get_le16(pb); | |
96 if ((q - buf) < buf_size - 1) | |
97 *q++ = c; | |
98 len--; | |
99 } | |
100 *q = '\0'; | |
101 } | |
102 #endif | |
103 | |
104 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) | |
105 { | |
1503 | 106 char* q = buf; |
107 len /= 2; | |
108 while (len--) { | |
109 uint8_t tmp; | |
110 PUT_UTF8(get_le16(pb), tmp, if (q - buf < buf_size - 1) *q++ = tmp;) | |
0 | 111 } |
112 *q = '\0'; | |
113 } | |
114 | |
115 static int asf_probe(AVProbeData *pd) | |
116 { | |
117 /* check file header */ | |
118 if (pd->buf_size <= 32) | |
119 return 0; | |
120 | |
1687 | 121 if (!memcmp(pd->buf, &asf_header, sizeof(GUID))) |
0 | 122 return AVPROBE_SCORE_MAX; |
123 else | |
124 return 0; | |
125 } | |
126 | |
1750 | 127 static int get_value(ByteIOContext *pb, int type){ |
128 switch(type){ | |
129 case 2: return get_le32(pb); | |
130 case 3: return get_le32(pb); | |
131 case 4: return get_le64(pb); | |
132 case 5: return get_le16(pb); | |
133 default:return INT_MIN; | |
134 } | |
135 } | |
136 | |
0 | 137 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) |
138 { | |
139 ASFContext *asf = s->priv_data; | |
140 GUID g; | |
141 ByteIOContext *pb = &s->pb; | |
142 AVStream *st; | |
143 ASFStream *asf_st; | |
144 int size, i; | |
65 | 145 int64_t gsize; |
1750 | 146 AVRational dar[128]; |
147 | |
148 memset(dar, 0, sizeof(dar)); | |
0 | 149 |
150 get_guid(pb, &g); | |
151 if (memcmp(&g, &asf_header, sizeof(GUID))) | |
152 goto fail; | |
153 get_le64(pb); | |
154 get_le32(pb); | |
155 get_byte(pb); | |
156 get_byte(pb); | |
157 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); | |
158 for(;;) { | |
159 get_guid(pb, &g); | |
160 gsize = get_le64(pb); | |
161 #ifdef DEBUG | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
162 printf("%08"PRIx64": ", url_ftell(pb) - 24); |
0 | 163 print_guid(&g); |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
164 printf(" size=0x%"PRIx64"\n", gsize); |
0 | 165 #endif |
166 if (gsize < 24) | |
167 goto fail; | |
168 if (!memcmp(&g, &file_header, sizeof(GUID))) { | |
169 get_guid(pb, &asf->hdr.guid); | |
887 | 170 asf->hdr.file_size = get_le64(pb); |
171 asf->hdr.create_time = get_le64(pb); | |
1701 | 172 asf->nb_packets = get_le64(pb); |
887 | 173 asf->hdr.send_time = get_le64(pb); |
174 asf->hdr.play_time = get_le64(pb); | |
175 asf->hdr.preroll = get_le32(pb); | |
176 asf->hdr.ignore = get_le32(pb); | |
177 asf->hdr.flags = get_le32(pb); | |
178 asf->hdr.min_pktsize = get_le32(pb); | |
179 asf->hdr.max_pktsize = get_le32(pb); | |
180 asf->hdr.max_bitrate = get_le32(pb); | |
181 asf->packet_size = asf->hdr.max_pktsize; | |
0 | 182 } else if (!memcmp(&g, &stream_header, sizeof(GUID))) { |
1263
cf88f6719743
total_size should be 64bit (1 hunk of the asf seeking patch from DrDivx / Steve Lhomme)
michael
parents:
1206
diff
changeset
|
183 int type, type_specific_size, sizeX; |
cf88f6719743
total_size should be 64bit (1 hunk of the asf seeking patch from DrDivx / Steve Lhomme)
michael
parents:
1206
diff
changeset
|
184 uint64_t total_size; |
0 | 185 unsigned int tag1; |
65 | 186 int64_t pos1, pos2; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
187 int test_for_ext_stream_audio; |
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; | |
743 | 199 st->start_time = asf->hdr.preroll; |
1552 | 200 if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming... |
201 st->duration = asf->hdr.send_time / | |
202 (10000000 / 1000) - st->start_time; | |
203 } | |
0 | 204 get_guid(pb, &g); |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
205 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
206 test_for_ext_stream_audio = 0; |
0 | 207 if (!memcmp(&g, &audio_stream, sizeof(GUID))) { |
208 type = CODEC_TYPE_AUDIO; | |
209 } else if (!memcmp(&g, &video_stream, sizeof(GUID))) { | |
210 type = CODEC_TYPE_VIDEO; | |
831
8e1b338096a0
changes to ignore command media embedded in MS WMV files patch by ("Brown, Mike": mikeb, vibephone com)
michael
parents:
828
diff
changeset
|
211 } else if (!memcmp(&g, &command_stream, sizeof(GUID))) { |
8e1b338096a0
changes to ignore command media embedded in MS WMV files patch by ("Brown, Mike": mikeb, vibephone com)
michael
parents:
828
diff
changeset
|
212 type = CODEC_TYPE_UNKNOWN; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
213 } else if (!memcmp(&g, &ext_stream_embed_stream_header, sizeof(GUID))) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
214 test_for_ext_stream_audio = 1; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
215 type = CODEC_TYPE_UNKNOWN; |
0 | 216 } else { |
217 goto fail; | |
218 } | |
219 get_guid(pb, &g); | |
220 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
|
221 type_specific_size = get_le32(pb); |
0 | 222 get_le32(pb); |
887 | 223 st->id = get_le16(pb) & 0x7f; /* stream id */ |
0 | 224 // 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
|
225 asf->asfid2avid[st->id] = s->nb_streams - 1; |
0 | 226 |
227 get_le32(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
228 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
229 if (test_for_ext_stream_audio) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
230 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
231 if (!memcmp(&g, &ext_stream_audio_stream, sizeof(GUID))) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
232 type = CODEC_TYPE_AUDIO; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
233 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
234 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
235 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
236 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
237 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
238 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
239 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
240 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
241 |
887 | 242 st->codec->codec_type = type; |
0 | 243 if (type == CODEC_TYPE_AUDIO) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
244 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
|
245 st->need_parsing = 1; |
887 | 246 /* We have to init the frame size at some point .... */ |
247 pos2 = url_ftell(pb); | |
248 if (gsize > (pos2 + 8 - pos1 + 24)) { | |
249 asf_st->ds_span = get_byte(pb); | |
250 asf_st->ds_packet_size = get_le16(pb); | |
251 asf_st->ds_chunk_size = get_le16(pb); | |
1701 | 252 get_le16(pb); //ds_data_size |
253 get_byte(pb); //ds_silence_data | |
887 | 254 } |
255 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", | |
256 // asf_st->ds_packet_size, asf_st->ds_chunk_size, | |
257 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); | |
258 if (asf_st->ds_span > 1) { | |
259 if (!asf_st->ds_chunk_size | |
1700
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
260 || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1) |
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
261 || asf_st->ds_packet_size % asf_st->ds_chunk_size) |
887 | 262 asf_st->ds_span = 0; // disable descrambling |
263 } | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
264 switch (st->codec->codec_id) { |
232 | 265 case CODEC_ID_MP3: |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
266 st->codec->frame_size = MPA_FRAME_SIZE; |
0 | 267 break; |
268 case CODEC_ID_PCM_S16LE: | |
269 case CODEC_ID_PCM_S16BE: | |
270 case CODEC_ID_PCM_U16LE: | |
271 case CODEC_ID_PCM_U16BE: | |
272 case CODEC_ID_PCM_S8: | |
273 case CODEC_ID_PCM_U8: | |
274 case CODEC_ID_PCM_ALAW: | |
275 case CODEC_ID_PCM_MULAW: | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
276 st->codec->frame_size = 1; |
0 | 277 break; |
278 default: | |
279 /* This is probably wrong, but it prevents a crash later */ | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
280 st->codec->frame_size = 1; |
0 | 281 break; |
282 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
283 } else if (type == CODEC_TYPE_VIDEO) { |
887 | 284 get_le32(pb); |
0 | 285 get_le32(pb); |
286 get_byte(pb); | |
287 size = get_le16(pb); /* size */ | |
732 | 288 sizeX= get_le32(pb); /* size */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
289 st->codec->width = get_le32(pb); |
887 | 290 st->codec->height = get_le32(pb); |
0 | 291 /* not available for asf */ |
292 get_le16(pb); /* panes */ | |
887 | 293 st->codec->bits_per_sample = get_le16(pb); /* depth */ |
0 | 294 tag1 = get_le32(pb); |
887 | 295 url_fskip(pb, 20); |
732 | 296 // av_log(NULL, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX); |
297 size= sizeX; | |
887 | 298 if (size > 40) { |
299 st->codec->extradata_size = size - 40; | |
300 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
301 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); | |
302 } | |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
303 |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
304 /* Extract palette from extradata if bpp <= 8 */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
305 /* This code assumes that extradata contains only palette */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
306 /* This is true for all paletted codecs implemented in ffmpeg */ |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
307 if (st->codec->extradata_size && (st->codec->bits_per_sample <= 8)) { |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
308 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
309 #ifdef WORDS_BIGENDIAN |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
310 for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
311 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
|
312 #else |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
313 memcpy(st->codec->palctrl->palette, st->codec->extradata, |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
314 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
315 #endif |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
316 st->codec->palctrl->palette_changed = 1; |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
317 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
318 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
319 st->codec->codec_tag = tag1; |
887 | 320 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); |
573 | 321 if(tag1 == MKTAG('D', 'V', 'R', ' ')) |
322 st->need_parsing = 1; | |
0 | 323 } |
324 pos2 = url_ftell(pb); | |
325 url_fskip(pb, gsize - (pos2 - pos1 + 24)); | |
326 } else if (!memcmp(&g, &data_header, sizeof(GUID))) { | |
1206
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
327 asf->data_object_offset = url_ftell(pb); |
1552 | 328 // if not streaming, gsize is not unlimited (how?), and there is enough space in the file.. |
329 if (!(asf->hdr.flags & 0x01) && gsize != (uint64_t)-1 && gsize >= 24) { | |
1206
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
330 asf->data_object_size = gsize - 24; |
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
331 } else { |
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
332 asf->data_object_size = (uint64_t)-1; |
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
333 } |
0 | 334 break; |
335 } else if (!memcmp(&g, &comment_header, sizeof(GUID))) { | |
336 int len1, len2, len3, len4, len5; | |
337 | |
338 len1 = get_le16(pb); | |
339 len2 = get_le16(pb); | |
340 len3 = get_le16(pb); | |
341 len4 = get_le16(pb); | |
342 len5 = get_le16(pb); | |
1704 | 343 get_str16_nolen(pb, len1, s->title , sizeof(s->title)); |
344 get_str16_nolen(pb, len2, s->author , sizeof(s->author)); | |
0 | 345 get_str16_nolen(pb, len3, s->copyright, sizeof(s->copyright)); |
1704 | 346 get_str16_nolen(pb, len4, s->comment , sizeof(s->comment)); |
887 | 347 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
|
348 } 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
|
349 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
|
350 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
351 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
|
352 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
|
353 { |
1264
3d00cb7b7426
value_num should also be 64bit (1 hunk from the asf seeking patch by DrDivx/Steve Lhomme)
michael
parents:
1263
diff
changeset
|
354 int name_len,value_type,value_len; |
3d00cb7b7426
value_num should also be 64bit (1 hunk from the asf seeking patch by DrDivx/Steve Lhomme)
michael
parents:
1263
diff
changeset
|
355 uint64_t value_num = 0; |
1703 | 356 char name[1024]; |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
357 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
358 name_len = get_le16(pb); |
1703 | 359 get_str16_nolen(pb, name_len, name, sizeof(name)); |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
360 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
|
361 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
|
362 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
|
363 { |
1706 | 364 if (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album)); |
365 else if(!strcmp(name,"WM/Genre" )) get_str16_nolen(pb, value_len, s->genre, sizeof(s->genre)); | |
366 else url_fskip(pb, value_len); | |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
367 } |
792 | 368 if ((value_type >= 2) && (value_type <= 5)) // boolean or DWORD or QWORD or WORD |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
369 { |
1750 | 370 value_num= get_value(pb, value_type); |
1704 | 371 if (!strcmp(name,"WM/Track" )) s->track = value_num + 1; |
372 if (!strcmp(name,"WM/TrackNumber")) s->track = value_num; | |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
373 } |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
374 } |
1750 | 375 } else if (!memcmp(&g, &metadata_header, sizeof(GUID))) { |
376 int n, stream_num, name_len, value_len, value_type, value_num; | |
377 n = get_le16(pb); | |
378 | |
379 for(i=0;i<n;i++) { | |
380 char name[1024]; | |
381 | |
382 get_le16(pb); //lang_list_index | |
383 stream_num= get_le16(pb); | |
384 name_len= get_le16(pb); | |
385 value_type= get_le16(pb); | |
386 value_len= get_le32(pb); | |
387 | |
388 get_str16_nolen(pb, name_len, name, sizeof(name)); | |
389 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name); | |
390 value_num= get_le16(pb);//we should use get_value() here but it doesnt work 2 is le16 here but le32 elsewhere | |
391 url_fskip(pb, value_len - 2); | |
392 | |
393 if(stream_num<128){ | |
394 if (!strcmp(name, "AspectRatioX")) dar[stream_num].num= value_num; | |
395 else if(!strcmp(name, "AspectRatioY")) dar[stream_num].den= value_num; | |
396 } | |
397 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
398 } else if (!memcmp(&g, &ext_stream_header, sizeof(GUID))) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
399 int ext_len, payload_ext_ct, stream_ct; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
400 uint32_t ext_d; |
972 | 401 int64_t pos_ex_st; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
402 pos_ex_st = url_ftell(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
403 |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
404 get_le64(pb); // starttime |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
405 get_le64(pb); // endtime |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
406 get_le32(pb); // leak-datarate |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
407 get_le32(pb); // bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
408 get_le32(pb); // init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
409 get_le32(pb); // alt-leak-datarate |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
410 get_le32(pb); // alt-bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
411 get_le32(pb); // alt-init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
412 get_le32(pb); // max-object-size |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
413 get_le32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved) |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
414 get_le16(pb); // stream-num |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
415 get_le16(pb); // stream-language-id-index |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
416 get_le64(pb); // avg frametime in 100ns units |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
417 stream_ct = get_le16(pb); //stream-name-count |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
418 payload_ext_ct = get_le16(pb); //payload-extension-system-count |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
419 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
420 for (i=0; i<stream_ct; i++){ |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
421 get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
422 ext_len = get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
423 url_fseek(pb, ext_len, SEEK_CUR); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
424 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
425 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
426 for (i=0; i<payload_ext_ct; i++){ |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
427 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
428 ext_d=get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
429 ext_len=get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
430 url_fseek(pb, ext_len, SEEK_CUR); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
431 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
432 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
433 // there could be a optional stream properties object to follow |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
434 // if so the next iteration will pick it up |
0 | 435 } else if (!memcmp(&g, &head1_guid, sizeof(GUID))) { |
436 int v1, v2; | |
437 get_guid(pb, &g); | |
438 v1 = get_le32(pb); | |
439 v2 = get_le16(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
440 #if 0 |
0 | 441 } else if (!memcmp(&g, &codec_comment_header, sizeof(GUID))) { |
442 int len, v1, n, num; | |
443 char str[256], *q; | |
444 char tag[16]; | |
445 | |
446 get_guid(pb, &g); | |
447 print_guid(&g); | |
448 | |
449 n = get_le32(pb); | |
450 for(i=0;i<n;i++) { | |
451 num = get_le16(pb); /* stream number */ | |
452 get_str16(pb, str, sizeof(str)); | |
453 get_str16(pb, str, sizeof(str)); | |
454 len = get_le16(pb); | |
455 q = tag; | |
456 while (len > 0) { | |
457 v1 = get_byte(pb); | |
458 if ((q - tag) < sizeof(tag) - 1) | |
459 *q++ = v1; | |
460 len--; | |
461 } | |
462 *q = '\0'; | |
463 } | |
464 #endif | |
465 } else if (url_feof(pb)) { | |
466 goto fail; | |
467 } else { | |
468 url_fseek(pb, gsize - 24, SEEK_CUR); | |
469 } | |
470 } | |
471 get_guid(pb, &g); | |
472 get_le64(pb); | |
473 get_byte(pb); | |
474 get_byte(pb); | |
475 if (url_feof(pb)) | |
476 goto fail; | |
477 asf->data_offset = url_ftell(pb); | |
478 asf->packet_size_left = 0; | |
479 | |
1750 | 480 |
481 for(i=0; i<128; i++){ | |
482 int stream_num= asf->asfid2avid[i]; | |
483 if(stream_num>=0 && dar[i].num>0 && dar[i].den>0){ | |
484 AVCodecContext *codec= s->streams[stream_num]->codec; | |
1752
12a896fa993b
Set correct aspect ratio (it's sample aspect, not display aspect)
kostya
parents:
1750
diff
changeset
|
485 av_reduce(&codec->sample_aspect_ratio.num, |
12a896fa993b
Set correct aspect ratio (it's sample aspect, not display aspect)
kostya
parents:
1750
diff
changeset
|
486 &codec->sample_aspect_ratio.den, |
12a896fa993b
Set correct aspect ratio (it's sample aspect, not display aspect)
kostya
parents:
1750
diff
changeset
|
487 dar[i].num, dar[i].den, INT_MAX); |
1750 | 488 //av_log(NULL, AV_LOG_ERROR, "dar %d:%d sar=%d:%d\n", dar[i].num, dar[i].den, codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.den); |
489 } | |
490 } | |
491 | |
0 | 492 return 0; |
493 | |
494 fail: | |
495 for(i=0;i<s->nb_streams;i++) { | |
496 AVStream *st = s->streams[i]; | |
887 | 497 if (st) { |
498 av_free(st->priv_data); | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
499 av_free(st->codec->extradata); |
887 | 500 } |
0 | 501 av_free(st); |
502 } | |
503 return -1; | |
504 } | |
505 | |
506 #define DO_2BITS(bits, var, defval) \ | |
507 switch (bits & 3) \ | |
508 { \ | |
509 case 3: var = get_le32(pb); rsize += 4; break; \ | |
510 case 2: var = get_le16(pb); rsize += 2; break; \ | |
511 case 1: var = get_byte(pb); rsize++; break; \ | |
512 default: var = defval; break; \ | |
513 } | |
514 | |
1716 | 515 /** |
516 * | |
517 * @return <0 in case of an error | |
518 */ | |
0 | 519 static int asf_get_packet(AVFormatContext *s) |
520 { | |
521 ASFContext *asf = s->priv_data; | |
522 ByteIOContext *pb = &s->pb; | |
523 uint32_t packet_length, padsize; | |
353 | 524 int rsize = 9; |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
525 int c, d, e, off; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
526 |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
527 off= (url_ftell(&s->pb) - s->data_offset) % asf->packet_size + 3; |
885 | 528 |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
529 c=d=e=-1; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
530 while(off-- > 0){ |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
531 c=d; d=e; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
532 e= get_byte(pb); |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
533 if(c == 0x82 && !d && !e) |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
534 break; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
535 } |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
536 |
0 | 537 if (c != 0x82) { |
538 if (!url_feof(pb)) | |
887 | 539 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb)); |
0 | 540 } |
541 if ((c & 0x0f) == 2) { // always true for now | |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
542 if (d || e) { |
0 | 543 if (!url_feof(pb)) |
887 | 544 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); |
1716 | 545 return -1; |
887 | 546 } |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
547 d= get_byte(pb); |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
548 e= get_byte(pb); |
353 | 549 rsize+=2; |
550 /* }else{ | |
551 if (!url_feof(pb)) | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
552 printf("ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb)); |
887 | 553 return AVERROR_IO;*/ |
0 | 554 } |
555 | |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
556 asf->packet_flags = d; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
557 asf->packet_property = e; |
0 | 558 |
559 DO_2BITS(asf->packet_flags >> 5, packet_length, asf->packet_size); | |
560 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored | |
561 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length | |
562 | |
1333 | 563 //the following checks prevent overflows and infinite loops |
564 if(packet_length >= (1U<<29)){ | |
565 av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, url_ftell(pb)); | |
1713 | 566 return -1; |
1333 | 567 } |
1715 | 568 if(padsize >= packet_length){ |
1333 | 569 av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, url_ftell(pb)); |
1713 | 570 return -1; |
1333 | 571 } |
572 | |
0 | 573 asf->packet_timestamp = get_le32(pb); |
574 get_le16(pb); /* duration */ | |
575 // rsize has at least 11 bytes which have to be present | |
576 | |
577 if (asf->packet_flags & 0x01) { | |
887 | 578 asf->packet_segsizetype = get_byte(pb); rsize++; |
0 | 579 asf->packet_segments = asf->packet_segsizetype & 0x3f; |
580 } else { | |
887 | 581 asf->packet_segments = 1; |
0 | 582 asf->packet_segsizetype = 0x80; |
583 } | |
584 asf->packet_size_left = packet_length - padsize - rsize; | |
585 if (packet_length < asf->hdr.min_pktsize) | |
586 padsize += asf->hdr.min_pktsize - packet_length; | |
587 asf->packet_padsize = padsize; | |
588 #ifdef DEBUG | |
589 printf("packet: size=%d padsize=%d left=%d\n", asf->packet_size, asf->packet_padsize, asf->packet_size_left); | |
590 #endif | |
591 return 0; | |
592 } | |
593 | |
1708 | 594 /** |
595 * | |
596 * @return <0 if error | |
597 */ | |
598 static int asf_read_frame_header(AVFormatContext *s){ | |
599 ASFContext *asf = s->priv_data; | |
600 ByteIOContext *pb = &s->pb; | |
601 int rsize = 1; | |
602 int num = get_byte(pb); | |
603 | |
604 asf->packet_segments--; | |
605 asf->packet_key_frame = num >> 7; | |
606 asf->stream_index = asf->asfid2avid[num & 0x7f]; | |
607 // sequence should be ignored! | |
608 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); | |
609 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); | |
610 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); | |
611 //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); | |
612 if (asf->packet_replic_size >= 8) { | |
613 asf->packet_obj_size = get_le32(pb); | |
614 if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ | |
615 av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); | |
616 return -1; | |
617 } | |
618 asf->packet_frag_timestamp = get_le32(pb); // timestamp | |
619 url_fskip(pb, asf->packet_replic_size - 8); | |
620 rsize += asf->packet_replic_size; // FIXME - check validity | |
621 } else if (asf->packet_replic_size==1){ | |
622 // multipacket - frag_offset is begining timestamp | |
623 asf->packet_time_start = asf->packet_frag_offset; | |
624 asf->packet_frag_offset = 0; | |
625 asf->packet_frag_timestamp = asf->packet_timestamp; | |
626 | |
627 asf->packet_time_delta = get_byte(pb); | |
628 rsize++; | |
629 }else if(asf->packet_replic_size!=0){ | |
630 av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); | |
631 return -1; | |
632 } | |
633 if (asf->packet_flags & 0x01) { | |
634 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal | |
1712 | 635 if(asf->packet_frag_size > asf->packet_size_left - rsize){ |
636 av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid\n"); | |
637 return -1; | |
638 } | |
1708 | 639 //printf("Fragsize %d\n", asf->packet_frag_size); |
640 } else { | |
641 asf->packet_frag_size = asf->packet_size_left - rsize; | |
642 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize); | |
643 } | |
644 if (asf->packet_replic_size == 1) { | |
645 asf->packet_multi_size = asf->packet_frag_size; | |
646 if (asf->packet_multi_size > asf->packet_size_left) | |
647 return -1; | |
648 } | |
649 asf->packet_size_left -= rsize; | |
650 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); | |
651 | |
652 return 0; | |
653 } | |
654 | |
0 | 655 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) |
656 { | |
657 ASFContext *asf = s->priv_data; | |
658 ASFStream *asf_st = 0; | |
659 ByteIOContext *pb = &s->pb; | |
660 //static int pc = 0; | |
661 for (;;) { | |
1713 | 662 if(url_feof(pb)) |
663 return AVERROR_IO; | |
887 | 664 if (asf->packet_size_left < FRAME_HEADER_SIZE |
665 || asf->packet_segments < 1) { | |
666 //asf->packet_size_left <= asf->packet_padsize) { | |
667 int ret = asf->packet_size_left + asf->packet_padsize; | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
668 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); |
1333 | 669 assert(ret>=0); |
887 | 670 /* fail safe */ |
671 url_fskip(pb, ret); | |
1707
7e12a19c140f
more correct packet alignment check and correction
michael
parents:
1706
diff
changeset
|
672 |
349 | 673 asf->packet_pos= url_ftell(&s->pb); |
1206
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
674 if (asf->data_object_size != (uint64_t)-1 && |
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
675 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) |
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
676 return AVERROR_IO; /* Do not exceed the size of the data object */ |
887 | 677 ret = asf_get_packet(s); |
678 //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++); | |
1713 | 679 if (ret < 0) |
680 assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); | |
0 | 681 asf->packet_time_start = 0; |
682 continue; | |
887 | 683 } |
684 if (asf->packet_time_start == 0) { | |
1708 | 685 if(asf_read_frame_header(s) < 0){ |
686 asf->packet_segments= 0; | |
1696 | 687 continue; |
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
|
688 } |
887 | 689 if (asf->stream_index < 0 |
708 | 690 || s->streams[asf->stream_index]->discard >= AVDISCARD_ALL |
691 || (!asf->packet_key_frame && s->streams[asf->stream_index]->discard >= AVDISCARD_NONKEY) | |
692 ) { | |
0 | 693 asf->packet_time_start = 0; |
887 | 694 /* unhandled packet (should not happen) */ |
695 url_fskip(pb, asf->packet_frag_size); | |
696 asf->packet_size_left -= asf->packet_frag_size; | |
652 | 697 if(asf->stream_index < 0) |
1708 | 698 av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size); |
0 | 699 continue; |
887 | 700 } |
701 asf->asf_st = s->streams[asf->stream_index]->priv_data; | |
702 } | |
703 asf_st = asf->asf_st; | |
0 | 704 |
887 | 705 if (asf->packet_replic_size == 1) { |
706 // frag_offset is here used as the begining timestamp | |
707 asf->packet_frag_timestamp = asf->packet_time_start; | |
708 asf->packet_time_start += asf->packet_time_delta; | |
709 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb); | |
710 asf->packet_size_left--; | |
0 | 711 asf->packet_multi_size--; |
887 | 712 if (asf->packet_multi_size < asf->packet_obj_size) |
713 { | |
714 asf->packet_time_start = 0; | |
715 url_fskip(pb, asf->packet_multi_size); | |
716 asf->packet_size_left -= asf->packet_multi_size; | |
0 | 717 continue; |
887 | 718 } |
719 asf->packet_multi_size -= asf->packet_obj_size; | |
720 //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); | |
721 } | |
1744 | 722 if ( asf_st->pkt.size != asf->packet_obj_size |
723 || asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { //FIXME is this condition sufficient? | |
1710
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
724 if(asf_st->pkt.data){ |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
725 av_log(s, AV_LOG_INFO, "freeing incomplete packet size %d, new %d\n", asf_st->pkt.size, asf->packet_obj_size); |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
726 asf_st->frag_offset = 0; |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
727 av_free_packet(&asf_st->pkt); |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
728 } |
887 | 729 /* new packet */ |
730 av_new_packet(&asf_st->pkt, asf->packet_obj_size); | |
731 asf_st->seq = asf->packet_seq; | |
732 asf_st->pkt.pts = asf->packet_frag_timestamp; | |
733 asf_st->pkt.stream_index = asf->stream_index; | |
885 | 734 asf_st->pkt.pos = |
735 asf_st->packet_pos= asf->packet_pos; | |
736 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", | |
349 | 737 //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & PKT_FLAG_KEY, |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
738 //s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size); |
887 | 739 if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO) |
740 asf->packet_key_frame = 1; | |
741 if (asf->packet_key_frame) | |
742 asf_st->pkt.flags |= PKT_FLAG_KEY; | |
743 } | |
0 | 744 |
887 | 745 /* read data */ |
746 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", | |
747 // asf->packet_size, asf_st->pkt.size, asf->packet_frag_offset, | |
748 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data); | |
749 asf->packet_size_left -= asf->packet_frag_size; | |
750 if (asf->packet_size_left < 0) | |
0 | 751 continue; |
1709 | 752 |
753 if( asf->packet_frag_offset >= asf_st->pkt.size | |
754 || asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset){ | |
755 av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n", | |
756 asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size); | |
757 continue; | |
758 } | |
759 | |
887 | 760 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, |
761 asf->packet_frag_size); | |
762 asf_st->frag_offset += asf->packet_frag_size; | |
763 /* test if whole packet is read */ | |
764 if (asf_st->frag_offset == asf_st->pkt.size) { | |
765 /* return packet */ | |
766 if (asf_st->ds_span > 1) { | |
1700
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
767 if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span){ |
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
768 av_log(s, AV_LOG_ERROR, "pkt.size != ds_packet_size * ds_span\n"); |
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
769 }else{ |
887 | 770 /* packet descrambling */ |
1332 | 771 uint8_t *newdata = av_malloc(asf_st->pkt.size); |
887 | 772 if (newdata) { |
773 int offset = 0; | |
774 while (offset < asf_st->pkt.size) { | |
775 int off = offset / asf_st->ds_chunk_size; | |
776 int row = off / asf_st->ds_span; | |
777 int col = off % asf_st->ds_span; | |
778 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; | |
779 //printf("off:%d row:%d col:%d idx:%d\n", off, row, col, idx); | |
1700
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
780 |
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
781 assert(offset + asf_st->ds_chunk_size <= asf_st->pkt.size); |
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
782 assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size); |
887 | 783 memcpy(newdata + offset, |
784 asf_st->pkt.data + idx * asf_st->ds_chunk_size, | |
785 asf_st->ds_chunk_size); | |
786 offset += asf_st->ds_chunk_size; | |
787 } | |
788 av_free(asf_st->pkt.data); | |
789 asf_st->pkt.data = newdata; | |
790 } | |
1700
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
791 } |
887 | 792 } |
793 asf_st->frag_offset = 0; | |
1699 | 794 *pkt= asf_st->pkt; |
887 | 795 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size); |
796 asf_st->pkt.size = 0; | |
797 asf_st->pkt.data = 0; | |
798 break; // packet completed | |
799 } | |
0 | 800 } |
801 return 0; | |
802 } | |
803 | |
804 static int asf_read_close(AVFormatContext *s) | |
805 { | |
806 int i; | |
807 | |
808 for(i=0;i<s->nb_streams;i++) { | |
887 | 809 AVStream *st = s->streams[i]; |
810 av_free(st->priv_data); | |
1711 | 811 av_free(st->codec->palctrl); |
0 | 812 } |
813 return 0; | |
814 } | |
815 | |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
816 // 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
|
817 // 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
|
818 // 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
|
819 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
|
820 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
821 ASFContext *asf = s->priv_data; |
349 | 822 ASFStream *asf_st; |
823 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
|
824 |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
825 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
|
826 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
|
827 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
|
828 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
|
829 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
|
830 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
|
831 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
|
832 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
|
833 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
|
834 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
|
835 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
|
836 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
|
837 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
|
838 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
|
839 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
|
840 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
|
841 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
|
842 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
|
843 asf->packet_time_start = 0; |
885 | 844 |
349 | 845 for(i=0; i<s->nb_streams; i++){ |
846 asf_st= s->streams[i]->priv_data; | |
847 av_free_packet(&asf_st->pkt); | |
848 asf_st->frag_offset=0; | |
849 asf_st->seq=0; | |
850 } | |
851 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
|
852 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
853 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
854 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
|
855 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
856 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
|
857 AVPacket pkt1, *pkt = &pkt1; |
349 | 858 ASFStream *asf_st; |
859 int64_t pts; | |
348 | 860 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
|
861 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
|
862 int64_t start_pos[s->nb_streams]; |
885 | 863 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
864 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
|
865 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
|
866 } |
885 | 867 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
868 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
|
869 *ppos= pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
870 url_fseek(&s->pb, pos, SEEK_SET); |
885 | 871 |
349 | 872 //printf("asf_read_pts\n"); |
873 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
|
874 for(;;){ |
349 | 875 if (av_read_frame(s, pkt) < 0){ |
1714 | 876 av_log(s, AV_LOG_INFO, "asf_read_pts failed\n"); |
887 | 877 return AV_NOPTS_VALUE; |
349 | 878 } |
885 | 879 |
991 | 880 pts= pkt->pts; |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
881 |
348 | 882 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
|
883 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
|
884 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
|
885 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
886 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
|
887 |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
888 // 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
|
889 pos= asf_st->packet_pos; |
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
890 |
1266 | 891 av_add_index_entry(s->streams[i], pos, pts, pkt->size, 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
|
892 start_pos[i]= asf_st->packet_pos + 1; |
885 | 893 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
894 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
|
895 break; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
896 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
897 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
898 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
899 *ppos= pos; |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
900 //printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts); |
348 | 901 |
902 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
|
903 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
904 |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
905 static void asf_build_simple_index(AVFormatContext *s, int stream_index) |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
906 { |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
907 GUID g; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
908 ASFContext *asf = s->priv_data; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
909 int64_t gsize, itime; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
910 int64_t pos, current_pos, index_pts; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
911 int i; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
912 int pct,ict; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
913 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
914 current_pos = url_ftell(&s->pb); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
915 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
916 url_fseek(&s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
917 get_guid(&s->pb, &g); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
918 if (!memcmp(&g, &index_guid, sizeof(GUID))) { |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
919 gsize = get_le64(&s->pb); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
920 get_guid(&s->pb, &g); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
921 itime=get_le64(&s->pb); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
922 pct=get_le32(&s->pb); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
923 ict=get_le32(&s->pb); |
1388
3172bf94c066
Use proper PRI?64 macros for %ll? format to fix printf format warnings:
rathann
parents:
1358
diff
changeset
|
924 av_log(NULL, AV_LOG_DEBUG, "itime:0x%"PRIx64", pct:%d, ict:%d\n",itime,pct,ict); |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
925 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
926 for (i=0;i<ict;i++){ |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
927 int pktnum=get_le32(&s->pb); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
928 int pktct =get_le16(&s->pb); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
929 av_log(NULL, AV_LOG_DEBUG, "pktnum:%d, pktct:%d\n", pktnum, pktct); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
930 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
931 pos=s->data_offset + asf->packet_size*(int64_t)pktnum; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
932 index_pts=av_rescale(itime, i, 10000); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
933 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
934 av_add_index_entry(s->streams[stream_index], pos, index_pts, asf->packet_size, 0, AVINDEX_KEYFRAME); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
935 } |
1266 | 936 asf->index_read= 1; |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
937 } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
938 url_fseek(&s->pb, current_pos, SEEK_SET); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
939 } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
940 |
555 | 941 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) |
0 | 942 { |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
943 ASFContext *asf = s->priv_data; |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
944 AVStream *st = s->streams[stream_index]; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
945 int64_t pos; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
946 int index; |
885 | 947 |
350 | 948 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
|
949 return -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
950 |
1266 | 951 if (!asf->index_read) |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
952 asf_build_simple_index(s, stream_index); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
953 |
1266 | 954 if(!(asf->index_read && st->index_entries)){ |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
955 if(av_seek_frame_binary(s, stream_index, pts, flags)<0) |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
956 return -1; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
957 }else{ |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
958 index= av_index_search_timestamp(st, pts, flags); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
959 if(index<0) |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
960 return -1; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
961 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
962 /* find the position */ |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
963 pos = st->index_entries[index].pos; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
964 pts = st->index_entries[index].timestamp; |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
965 |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
966 // various attempts to find key frame have failed so far |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
967 // asf_reset_header(s); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
968 // url_fseek(&s->pb, pos, SEEK_SET); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
969 // key_pos = pos; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
970 // for(i=0;i<16;i++){ |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
971 // pos = url_ftell(&s->pb); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
972 // if (av_read_frame(s, &pkt) < 0){ |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
973 // av_log(s, AV_LOG_INFO, "seek failed\n"); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
974 // return -1; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
975 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
976 // asf_st = s->streams[stream_index]->priv_data; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
977 // pos += st->parser->frame_offset; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
978 // |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
979 // if (pkt.size > b) { |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
980 // b = pkt.size; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
981 // key_pos = pos; |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
982 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
983 // |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
984 // av_free_packet(&pkt); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
985 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
986 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
987 /* do the seek */ |
1388
3172bf94c066
Use proper PRI?64 macros for %ll? format to fix printf format warnings:
rathann
parents:
1358
diff
changeset
|
988 av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos); |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
989 url_fseek(&s->pb, pos, SEEK_SET); |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
990 } |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
991 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
|
992 return 0; |
0 | 993 } |
994 | |
1169 | 995 AVInputFormat asf_demuxer = { |
0 | 996 "asf", |
997 "asf format", | |
998 sizeof(ASFContext), | |
999 asf_probe, | |
1000 asf_read_header, | |
1001 asf_read_packet, | |
1002 asf_read_close, | |
1003 asf_read_seek, | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
1004 asf_read_pts, |
0 | 1005 }; |