Mercurial > libavformat.hg
annotate asf.c @ 1700:77bd711c0aed libavformat
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
note, the original code might have been exploitable
author | michael |
---|---|
date | Mon, 22 Jan 2007 03:19:00 +0000 |
parents | b959208ba904 |
children | 90be497b752b |
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); |
69 | 70 else |
71 printf("(GUID: unknown) "); | |
1687 | 72 for(i=0;i<16;i++) |
73 printf(" 0x%02x,", (*g)[i]); | |
0 | 74 printf("}\n"); |
75 } | |
949 | 76 #undef PRINT_IF_GUID |
0 | 77 #endif |
78 | |
79 static void get_guid(ByteIOContext *s, GUID *g) | |
80 { | |
1687 | 81 assert(sizeof(*g) == 16); |
82 get_buffer(s, g, sizeof(*g)); | |
0 | 83 } |
84 | |
85 #if 0 | |
86 static void get_str16(ByteIOContext *pb, char *buf, int buf_size) | |
87 { | |
88 int len, c; | |
89 char *q; | |
90 | |
91 len = get_le16(pb); | |
92 q = buf; | |
93 while (len > 0) { | |
94 c = get_le16(pb); | |
95 if ((q - buf) < buf_size - 1) | |
96 *q++ = c; | |
97 len--; | |
98 } | |
99 *q = '\0'; | |
100 } | |
101 #endif | |
102 | |
103 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) | |
104 { | |
1503 | 105 char* q = buf; |
106 len /= 2; | |
107 while (len--) { | |
108 uint8_t tmp; | |
109 PUT_UTF8(get_le16(pb), tmp, if (q - buf < buf_size - 1) *q++ = tmp;) | |
0 | 110 } |
111 *q = '\0'; | |
112 } | |
113 | |
114 static int asf_probe(AVProbeData *pd) | |
115 { | |
116 /* check file header */ | |
117 if (pd->buf_size <= 32) | |
118 return 0; | |
119 | |
1687 | 120 if (!memcmp(pd->buf, &asf_header, sizeof(GUID))) |
0 | 121 return AVPROBE_SCORE_MAX; |
122 else | |
123 return 0; | |
124 } | |
125 | |
126 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) | |
127 { | |
128 ASFContext *asf = s->priv_data; | |
129 GUID g; | |
130 ByteIOContext *pb = &s->pb; | |
131 AVStream *st; | |
132 ASFStream *asf_st; | |
133 int size, i; | |
65 | 134 int64_t gsize; |
0 | 135 |
136 get_guid(pb, &g); | |
137 if (memcmp(&g, &asf_header, sizeof(GUID))) | |
138 goto fail; | |
139 get_le64(pb); | |
140 get_le32(pb); | |
141 get_byte(pb); | |
142 get_byte(pb); | |
143 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); | |
144 for(;;) { | |
145 get_guid(pb, &g); | |
146 gsize = get_le64(pb); | |
147 #ifdef DEBUG | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
148 printf("%08"PRIx64": ", url_ftell(pb) - 24); |
0 | 149 print_guid(&g); |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
150 printf(" size=0x%"PRIx64"\n", gsize); |
0 | 151 #endif |
152 if (gsize < 24) | |
153 goto fail; | |
154 if (!memcmp(&g, &file_header, sizeof(GUID))) { | |
155 get_guid(pb, &asf->hdr.guid); | |
887 | 156 asf->hdr.file_size = get_le64(pb); |
157 asf->hdr.create_time = get_le64(pb); | |
158 asf->hdr.packets_count = get_le64(pb); | |
159 asf->hdr.send_time = get_le64(pb); | |
160 asf->hdr.play_time = get_le64(pb); | |
161 asf->hdr.preroll = get_le32(pb); | |
162 asf->hdr.ignore = get_le32(pb); | |
163 asf->hdr.flags = get_le32(pb); | |
164 asf->hdr.min_pktsize = get_le32(pb); | |
165 asf->hdr.max_pktsize = get_le32(pb); | |
166 asf->hdr.max_bitrate = get_le32(pb); | |
167 asf->packet_size = asf->hdr.max_pktsize; | |
0 | 168 asf->nb_packets = asf->hdr.packets_count; |
169 } 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
|
170 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
|
171 uint64_t total_size; |
0 | 172 unsigned int tag1; |
65 | 173 int64_t pos1, pos2; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
174 int test_for_ext_stream_audio; |
0 | 175 |
176 pos1 = url_ftell(pb); | |
177 | |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
178 st = av_new_stream(s, 0); |
0 | 179 if (!st) |
180 goto fail; | |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
437
diff
changeset
|
181 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ |
0 | 182 asf_st = av_mallocz(sizeof(ASFStream)); |
183 if (!asf_st) | |
184 goto fail; | |
185 st->priv_data = asf_st; | |
743 | 186 st->start_time = asf->hdr.preroll; |
1552 | 187 if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming... |
188 st->duration = asf->hdr.send_time / | |
189 (10000000 / 1000) - st->start_time; | |
190 } | |
0 | 191 get_guid(pb, &g); |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
192 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
193 test_for_ext_stream_audio = 0; |
0 | 194 if (!memcmp(&g, &audio_stream, sizeof(GUID))) { |
195 type = CODEC_TYPE_AUDIO; | |
196 } else if (!memcmp(&g, &video_stream, sizeof(GUID))) { | |
197 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
|
198 } 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
|
199 type = CODEC_TYPE_UNKNOWN; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
200 } 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
|
201 test_for_ext_stream_audio = 1; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
202 type = CODEC_TYPE_UNKNOWN; |
0 | 203 } else { |
204 goto fail; | |
205 } | |
206 get_guid(pb, &g); | |
207 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
|
208 type_specific_size = get_le32(pb); |
0 | 209 get_le32(pb); |
887 | 210 st->id = get_le16(pb) & 0x7f; /* stream id */ |
0 | 211 // 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
|
212 asf->asfid2avid[st->id] = s->nb_streams - 1; |
0 | 213 |
214 get_le32(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
215 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
216 if (test_for_ext_stream_audio) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
217 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
218 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
|
219 type = CODEC_TYPE_AUDIO; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
220 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
221 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
222 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
223 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
224 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
225 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
226 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
227 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
228 |
887 | 229 st->codec->codec_type = type; |
0 | 230 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
|
231 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
|
232 st->need_parsing = 1; |
887 | 233 /* We have to init the frame size at some point .... */ |
234 pos2 = url_ftell(pb); | |
235 if (gsize > (pos2 + 8 - pos1 + 24)) { | |
236 asf_st->ds_span = get_byte(pb); | |
237 asf_st->ds_packet_size = get_le16(pb); | |
238 asf_st->ds_chunk_size = get_le16(pb); | |
239 asf_st->ds_data_size = get_le16(pb); | |
240 asf_st->ds_silence_data = get_byte(pb); | |
241 } | |
242 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", | |
243 // asf_st->ds_packet_size, asf_st->ds_chunk_size, | |
244 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); | |
245 if (asf_st->ds_span > 1) { | |
246 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
|
247 || (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
|
248 || asf_st->ds_packet_size % asf_st->ds_chunk_size) |
887 | 249 asf_st->ds_span = 0; // disable descrambling |
250 } | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
251 switch (st->codec->codec_id) { |
232 | 252 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
|
253 st->codec->frame_size = MPA_FRAME_SIZE; |
0 | 254 break; |
255 case CODEC_ID_PCM_S16LE: | |
256 case CODEC_ID_PCM_S16BE: | |
257 case CODEC_ID_PCM_U16LE: | |
258 case CODEC_ID_PCM_U16BE: | |
259 case CODEC_ID_PCM_S8: | |
260 case CODEC_ID_PCM_U8: | |
261 case CODEC_ID_PCM_ALAW: | |
262 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
|
263 st->codec->frame_size = 1; |
0 | 264 break; |
265 default: | |
266 /* 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
|
267 st->codec->frame_size = 1; |
0 | 268 break; |
269 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
270 } else if (type == CODEC_TYPE_VIDEO) { |
887 | 271 get_le32(pb); |
0 | 272 get_le32(pb); |
273 get_byte(pb); | |
274 size = get_le16(pb); /* size */ | |
732 | 275 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
|
276 st->codec->width = get_le32(pb); |
887 | 277 st->codec->height = get_le32(pb); |
0 | 278 /* not available for asf */ |
279 get_le16(pb); /* panes */ | |
887 | 280 st->codec->bits_per_sample = get_le16(pb); /* depth */ |
0 | 281 tag1 = get_le32(pb); |
887 | 282 url_fskip(pb, 20); |
732 | 283 // av_log(NULL, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX); |
284 size= sizeX; | |
887 | 285 if (size > 40) { |
286 st->codec->extradata_size = size - 40; | |
287 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
288 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); | |
289 } | |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
290 |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
291 /* Extract palette from extradata if bpp <= 8 */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
292 /* This code assumes that extradata contains only palette */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
293 /* 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
|
294 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
|
295 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
296 #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
|
297 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
|
298 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
|
299 #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
|
300 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
|
301 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
302 #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
|
303 st->codec->palctrl->palette_changed = 1; |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
304 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
305 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
306 st->codec->codec_tag = tag1; |
887 | 307 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); |
573 | 308 if(tag1 == MKTAG('D', 'V', 'R', ' ')) |
309 st->need_parsing = 1; | |
0 | 310 } |
311 pos2 = url_ftell(pb); | |
312 url_fskip(pb, gsize - (pos2 - pos1 + 24)); | |
313 } 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
|
314 asf->data_object_offset = url_ftell(pb); |
1552 | 315 // if not streaming, gsize is not unlimited (how?), and there is enough space in the file.. |
316 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
|
317 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
|
318 } else { |
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
319 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
|
320 } |
0 | 321 break; |
322 } else if (!memcmp(&g, &comment_header, sizeof(GUID))) { | |
323 int len1, len2, len3, len4, len5; | |
324 | |
325 len1 = get_le16(pb); | |
326 len2 = get_le16(pb); | |
327 len3 = get_le16(pb); | |
328 len4 = get_le16(pb); | |
329 len5 = get_le16(pb); | |
330 get_str16_nolen(pb, len1, s->title, sizeof(s->title)); | |
331 get_str16_nolen(pb, len2, s->author, sizeof(s->author)); | |
332 get_str16_nolen(pb, len3, s->copyright, sizeof(s->copyright)); | |
333 get_str16_nolen(pb, len4, s->comment, sizeof(s->comment)); | |
887 | 334 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
|
335 } 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
|
336 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
|
337 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
338 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
|
339 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
|
340 { |
1264
3d00cb7b7426
value_num should also be 64bit (1 hunk from the asf seeking patch by DrDivx/Steve Lhomme)
michael
parents:
1263
diff
changeset
|
341 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
|
342 uint64_t value_num = 0; |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
343 char *name, *value; |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
344 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
345 name_len = get_le16(pb); |
1688 | 346 name = av_malloc(name_len * 2); |
1503 | 347 get_str16_nolen(pb, name_len, name, name_len * 2); |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
348 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
|
349 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
|
350 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
|
351 { |
1688 | 352 value = av_malloc(value_len * 2); |
1503 | 353 get_str16_nolen(pb, value_len, value, |
354 value_len * 2); | |
643 | 355 if (strcmp(name,"WM/AlbumTitle")==0) { pstrcpy(s->album, sizeof(s->album), value); } |
1603 | 356 if (strcmp(name,"WM/Genre")==0) { pstrcpy(s->genre, sizeof(s->genre), value); } |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
357 av_free(value); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
358 } |
792 | 359 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
|
360 { |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
361 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
|
362 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
|
363 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
|
364 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
|
365 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
|
366 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
|
367 } |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
368 av_free(name); |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
369 } |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
370 } 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
|
371 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
|
372 uint32_t ext_d; |
972 | 373 int64_t pos_ex_st; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
374 pos_ex_st = url_ftell(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
375 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
376 get_le64(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
377 get_le64(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
378 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
379 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
380 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
381 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
382 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
383 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
384 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
385 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
386 get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
387 get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
388 get_le64(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
389 stream_ct = get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
390 payload_ext_ct = get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
391 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
392 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
|
393 get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
394 ext_len = get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
395 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
|
396 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
397 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
398 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
|
399 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
400 ext_d=get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
401 ext_len=get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
402 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
|
403 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
404 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
405 // 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
|
406 // if so the next iteration will pick it up |
0 | 407 } else if (!memcmp(&g, &head1_guid, sizeof(GUID))) { |
408 int v1, v2; | |
409 get_guid(pb, &g); | |
410 v1 = get_le32(pb); | |
411 v2 = get_le16(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
412 #if 0 |
0 | 413 } else if (!memcmp(&g, &codec_comment_header, sizeof(GUID))) { |
414 int len, v1, n, num; | |
415 char str[256], *q; | |
416 char tag[16]; | |
417 | |
418 get_guid(pb, &g); | |
419 print_guid(&g); | |
420 | |
421 n = get_le32(pb); | |
422 for(i=0;i<n;i++) { | |
423 num = get_le16(pb); /* stream number */ | |
424 get_str16(pb, str, sizeof(str)); | |
425 get_str16(pb, str, sizeof(str)); | |
426 len = get_le16(pb); | |
427 q = tag; | |
428 while (len > 0) { | |
429 v1 = get_byte(pb); | |
430 if ((q - tag) < sizeof(tag) - 1) | |
431 *q++ = v1; | |
432 len--; | |
433 } | |
434 *q = '\0'; | |
435 } | |
436 #endif | |
437 } else if (url_feof(pb)) { | |
438 goto fail; | |
439 } else { | |
440 url_fseek(pb, gsize - 24, SEEK_CUR); | |
441 } | |
442 } | |
443 get_guid(pb, &g); | |
444 get_le64(pb); | |
445 get_byte(pb); | |
446 get_byte(pb); | |
447 if (url_feof(pb)) | |
448 goto fail; | |
449 asf->data_offset = url_ftell(pb); | |
450 asf->packet_size_left = 0; | |
451 | |
452 return 0; | |
453 | |
454 fail: | |
455 for(i=0;i<s->nb_streams;i++) { | |
456 AVStream *st = s->streams[i]; | |
887 | 457 if (st) { |
458 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
|
459 av_free(st->codec->extradata); |
887 | 460 } |
0 | 461 av_free(st); |
462 } | |
463 return -1; | |
464 } | |
465 | |
466 #define DO_2BITS(bits, var, defval) \ | |
467 switch (bits & 3) \ | |
468 { \ | |
469 case 3: var = get_le32(pb); rsize += 4; break; \ | |
470 case 2: var = get_le16(pb); rsize += 2; break; \ | |
471 case 1: var = get_byte(pb); rsize++; break; \ | |
472 default: var = defval; break; \ | |
473 } | |
474 | |
475 static int asf_get_packet(AVFormatContext *s) | |
476 { | |
477 ASFContext *asf = s->priv_data; | |
478 ByteIOContext *pb = &s->pb; | |
479 uint32_t packet_length, padsize; | |
353 | 480 int rsize = 9; |
481 int c; | |
885 | 482 |
353 | 483 assert((url_ftell(&s->pb) - s->data_offset) % asf->packet_size == 0); |
885 | 484 |
353 | 485 c = get_byte(pb); |
0 | 486 if (c != 0x82) { |
487 if (!url_feof(pb)) | |
887 | 488 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb)); |
0 | 489 } |
490 if ((c & 0x0f) == 2) { // always true for now | |
887 | 491 if (get_le16(pb) != 0) { |
0 | 492 if (!url_feof(pb)) |
887 | 493 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); |
494 return AVERROR_IO; | |
495 } | |
353 | 496 rsize+=2; |
497 /* }else{ | |
498 if (!url_feof(pb)) | |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
499 printf("ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb)); |
887 | 500 return AVERROR_IO;*/ |
0 | 501 } |
502 | |
503 asf->packet_flags = get_byte(pb); | |
504 asf->packet_property = get_byte(pb); | |
505 | |
506 DO_2BITS(asf->packet_flags >> 5, packet_length, asf->packet_size); | |
507 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored | |
508 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length | |
509 | |
1333 | 510 //the following checks prevent overflows and infinite loops |
511 if(packet_length >= (1U<<29)){ | |
512 av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, url_ftell(pb)); | |
513 return 0; // FIXME this should be -1 | |
514 } | |
515 if(padsize >= (1U<<29)){ | |
516 av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, url_ftell(pb)); | |
517 return 0; // FIXME this should be -1 | |
518 } | |
519 | |
0 | 520 asf->packet_timestamp = get_le32(pb); |
521 get_le16(pb); /* duration */ | |
522 // rsize has at least 11 bytes which have to be present | |
523 | |
524 if (asf->packet_flags & 0x01) { | |
887 | 525 asf->packet_segsizetype = get_byte(pb); rsize++; |
0 | 526 asf->packet_segments = asf->packet_segsizetype & 0x3f; |
527 } else { | |
887 | 528 asf->packet_segments = 1; |
0 | 529 asf->packet_segsizetype = 0x80; |
530 } | |
531 asf->packet_size_left = packet_length - padsize - rsize; | |
532 if (packet_length < asf->hdr.min_pktsize) | |
533 padsize += asf->hdr.min_pktsize - packet_length; | |
534 asf->packet_padsize = padsize; | |
535 #ifdef DEBUG | |
536 printf("packet: size=%d padsize=%d left=%d\n", asf->packet_size, asf->packet_padsize, asf->packet_size_left); | |
537 #endif | |
538 return 0; | |
539 } | |
540 | |
541 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) | |
542 { | |
543 ASFContext *asf = s->priv_data; | |
544 ASFStream *asf_st = 0; | |
545 ByteIOContext *pb = &s->pb; | |
546 //static int pc = 0; | |
547 for (;;) { | |
887 | 548 int rsize = 0; |
549 if (asf->packet_size_left < FRAME_HEADER_SIZE | |
550 || asf->packet_segments < 1) { | |
551 //asf->packet_size_left <= asf->packet_padsize) { | |
552 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
|
553 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); |
828 | 554 if((url_ftell(&s->pb) + ret - s->data_offset) % asf->packet_size) |
555 ret += asf->packet_size - ((url_ftell(&s->pb) + ret - s->data_offset) % asf->packet_size); | |
1333 | 556 assert(ret>=0); |
887 | 557 /* fail safe */ |
558 url_fskip(pb, ret); | |
349 | 559 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
|
560 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
|
561 (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
|
562 return AVERROR_IO; /* Do not exceed the size of the data object */ |
887 | 563 ret = asf_get_packet(s); |
564 //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++); | |
565 if (ret < 0 || url_feof(pb)) | |
566 return AVERROR_IO; | |
0 | 567 asf->packet_time_start = 0; |
568 continue; | |
887 | 569 } |
570 if (asf->packet_time_start == 0) { | |
571 /* read frame header */ | |
0 | 572 int num = get_byte(pb); |
887 | 573 asf->packet_segments--; |
574 rsize++; | |
1695 | 575 asf->packet_key_frame = num >> 7; |
887 | 576 asf->stream_index = asf->asfid2avid[num & 0x7f]; |
577 // sequence should be ignored! | |
578 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); | |
579 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); | |
580 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); | |
349 | 581 //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); |
1696 | 582 if (asf->packet_replic_size >= 8) { |
887 | 583 asf->packet_obj_size = get_le32(pb); |
1660
e071dbfd4769
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.wmv
michael
parents:
1603
diff
changeset
|
584 if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ |
e071dbfd4769
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.wmv
michael
parents:
1603
diff
changeset
|
585 av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); |
e071dbfd4769
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.wmv
michael
parents:
1603
diff
changeset
|
586 continue; |
e071dbfd4769
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.wmv
michael
parents:
1603
diff
changeset
|
587 } |
887 | 588 asf->packet_frag_timestamp = get_le32(pb); // timestamp |
1696 | 589 url_fskip(pb, asf->packet_replic_size - 8); |
887 | 590 rsize += asf->packet_replic_size; // FIXME - check validity |
591 } else if (asf->packet_replic_size==1){ | |
592 // multipacket - frag_offset is begining timestamp | |
593 asf->packet_time_start = asf->packet_frag_offset; | |
0 | 594 asf->packet_frag_offset = 0; |
887 | 595 asf->packet_frag_timestamp = asf->packet_timestamp; |
0 | 596 |
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
|
597 asf->packet_time_delta = get_byte(pb); |
887 | 598 rsize++; |
1696 | 599 }else if(asf->packet_replic_size!=0){ |
600 av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); | |
601 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
|
602 } |
887 | 603 if (asf->packet_flags & 0x01) { |
604 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal | |
0 | 605 #undef DO_2BITS |
887 | 606 //printf("Fragsize %d\n", asf->packet_frag_size); |
607 } else { | |
608 asf->packet_frag_size = asf->packet_size_left - rsize; | |
609 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize); | |
610 } | |
611 if (asf->packet_replic_size == 1) { | |
612 asf->packet_multi_size = asf->packet_frag_size; | |
613 if (asf->packet_multi_size > asf->packet_size_left) { | |
614 asf->packet_segments = 0; | |
0 | 615 continue; |
887 | 616 } |
617 } | |
618 asf->packet_size_left -= rsize; | |
619 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); | |
0 | 620 |
887 | 621 if (asf->stream_index < 0 |
708 | 622 || s->streams[asf->stream_index]->discard >= AVDISCARD_ALL |
623 || (!asf->packet_key_frame && s->streams[asf->stream_index]->discard >= AVDISCARD_NONKEY) | |
624 ) { | |
0 | 625 asf->packet_time_start = 0; |
887 | 626 /* unhandled packet (should not happen) */ |
627 url_fskip(pb, asf->packet_frag_size); | |
628 asf->packet_size_left -= asf->packet_frag_size; | |
652 | 629 if(asf->stream_index < 0) |
630 av_log(s, AV_LOG_ERROR, "ff asf skip %d %d\n", asf->packet_frag_size, num & 0x7f); | |
0 | 631 continue; |
887 | 632 } |
633 asf->asf_st = s->streams[asf->stream_index]->priv_data; | |
634 } | |
635 asf_st = asf->asf_st; | |
0 | 636 |
887 | 637 if ((asf->packet_frag_offset != asf_st->frag_offset |
638 || (asf->packet_frag_offset | |
639 && asf->packet_seq != asf_st->seq)) // seq should be ignored | |
640 ) { | |
641 /* cannot continue current packet: free it */ | |
642 // FIXME better check if packet was already allocated | |
643 av_log(s, AV_LOG_INFO, "ff asf parser skips: %d - %d o:%d - %d %d %d fl:%d\n", | |
644 asf_st->pkt.size, | |
645 asf->packet_obj_size, | |
646 asf->packet_frag_offset, asf_st->frag_offset, | |
647 asf->packet_seq, asf_st->seq, asf->packet_frag_size); | |
648 if (asf_st->pkt.size) | |
649 av_free_packet(&asf_st->pkt); | |
650 asf_st->frag_offset = 0; | |
651 if (asf->packet_frag_offset != 0) { | |
652 url_fskip(pb, asf->packet_frag_size); | |
653 av_log(s, AV_LOG_INFO, "ff asf parser skipping %db\n", asf->packet_frag_size); | |
654 asf->packet_size_left -= asf->packet_frag_size; | |
655 continue; | |
656 } | |
657 } | |
658 if (asf->packet_replic_size == 1) { | |
659 // frag_offset is here used as the begining timestamp | |
660 asf->packet_frag_timestamp = asf->packet_time_start; | |
661 asf->packet_time_start += asf->packet_time_delta; | |
662 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb); | |
663 asf->packet_size_left--; | |
0 | 664 asf->packet_multi_size--; |
887 | 665 if (asf->packet_multi_size < asf->packet_obj_size) |
666 { | |
667 asf->packet_time_start = 0; | |
668 url_fskip(pb, asf->packet_multi_size); | |
669 asf->packet_size_left -= asf->packet_multi_size; | |
0 | 670 continue; |
887 | 671 } |
672 asf->packet_multi_size -= asf->packet_obj_size; | |
673 //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); | |
674 } | |
675 if (asf_st->frag_offset == 0) { | |
676 /* new packet */ | |
677 av_new_packet(&asf_st->pkt, asf->packet_obj_size); | |
678 asf_st->seq = asf->packet_seq; | |
679 asf_st->pkt.pts = asf->packet_frag_timestamp; | |
680 asf_st->pkt.stream_index = asf->stream_index; | |
885 | 681 asf_st->pkt.pos = |
682 asf_st->packet_pos= asf->packet_pos; | |
683 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", | |
349 | 684 //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
|
685 //s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size); |
887 | 686 if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO) |
687 asf->packet_key_frame = 1; | |
688 if (asf->packet_key_frame) | |
689 asf_st->pkt.flags |= PKT_FLAG_KEY; | |
690 } | |
0 | 691 |
887 | 692 /* read data */ |
693 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", | |
694 // asf->packet_size, asf_st->pkt.size, asf->packet_frag_offset, | |
695 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data); | |
696 asf->packet_size_left -= asf->packet_frag_size; | |
697 if (asf->packet_size_left < 0) | |
0 | 698 continue; |
887 | 699 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, |
700 asf->packet_frag_size); | |
701 asf_st->frag_offset += asf->packet_frag_size; | |
702 /* test if whole packet is read */ | |
703 if (asf_st->frag_offset == asf_st->pkt.size) { | |
704 /* return packet */ | |
705 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
|
706 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
|
707 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
|
708 }else{ |
887 | 709 /* packet descrambling */ |
1332 | 710 uint8_t *newdata = av_malloc(asf_st->pkt.size); |
887 | 711 if (newdata) { |
712 int offset = 0; | |
713 while (offset < asf_st->pkt.size) { | |
714 int off = offset / asf_st->ds_chunk_size; | |
715 int row = off / asf_st->ds_span; | |
716 int col = off % asf_st->ds_span; | |
717 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; | |
718 //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
|
719 |
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
|
720 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
|
721 assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size); |
887 | 722 memcpy(newdata + offset, |
723 asf_st->pkt.data + idx * asf_st->ds_chunk_size, | |
724 asf_st->ds_chunk_size); | |
725 offset += asf_st->ds_chunk_size; | |
726 } | |
727 av_free(asf_st->pkt.data); | |
728 asf_st->pkt.data = newdata; | |
729 } | |
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
|
730 } |
887 | 731 } |
732 asf_st->frag_offset = 0; | |
1699 | 733 *pkt= asf_st->pkt; |
887 | 734 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size); |
735 asf_st->pkt.size = 0; | |
736 asf_st->pkt.data = 0; | |
737 break; // packet completed | |
738 } | |
0 | 739 } |
740 return 0; | |
741 } | |
742 | |
743 static int asf_read_close(AVFormatContext *s) | |
744 { | |
745 int i; | |
746 | |
747 for(i=0;i<s->nb_streams;i++) { | |
887 | 748 AVStream *st = s->streams[i]; |
749 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
|
750 av_free(st->codec->palctrl); |
0 | 751 } |
752 return 0; | |
753 } | |
754 | |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
755 // 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
|
756 // 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
|
757 // 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
|
758 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
|
759 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
760 ASFContext *asf = s->priv_data; |
349 | 761 ASFStream *asf_st; |
762 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
|
763 |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
764 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
|
765 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
|
766 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
|
767 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
|
768 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
|
769 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
|
770 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
|
771 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
|
772 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
|
773 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
|
774 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
|
775 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
|
776 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
|
777 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
|
778 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
|
779 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
|
780 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
|
781 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
|
782 asf->packet_time_start = 0; |
885 | 783 |
349 | 784 for(i=0; i<s->nb_streams; i++){ |
785 asf_st= s->streams[i]->priv_data; | |
786 av_free_packet(&asf_st->pkt); | |
787 asf_st->frag_offset=0; | |
788 asf_st->seq=0; | |
789 } | |
790 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
|
791 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
792 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
793 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
|
794 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
795 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
|
796 AVPacket pkt1, *pkt = &pkt1; |
349 | 797 ASFStream *asf_st; |
798 int64_t pts; | |
348 | 799 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
|
800 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
|
801 int64_t start_pos[s->nb_streams]; |
885 | 802 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
803 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
|
804 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
|
805 } |
885 | 806 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
807 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
|
808 *ppos= pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
809 url_fseek(&s->pb, pos, SEEK_SET); |
885 | 810 |
349 | 811 //printf("asf_read_pts\n"); |
812 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
|
813 for(;;){ |
349 | 814 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
|
815 av_log(s, AV_LOG_INFO, "seek failed\n"); |
887 | 816 return AV_NOPTS_VALUE; |
349 | 817 } |
885 | 818 |
991 | 819 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
|
820 |
348 | 821 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
|
822 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
|
823 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
|
824 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
825 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
|
826 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
827 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
|
828 pos= asf_st->packet_pos; |
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
829 |
1266 | 830 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
|
831 start_pos[i]= asf_st->packet_pos + 1; |
885 | 832 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
833 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
|
834 break; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
835 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
836 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
837 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
838 *ppos= pos; |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
839 //printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts); |
348 | 840 |
841 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
|
842 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
843 |
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
|
844 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
|
845 { |
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
|
846 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
|
847 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
|
848 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
|
849 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
|
850 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
|
851 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
|
852 |
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
|
853 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
|
854 |
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
|
855 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
|
856 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
|
857 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
|
858 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
|
859 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
|
860 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
|
861 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
|
862 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
|
863 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
|
864 |
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
|
865 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
|
866 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
|
867 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
|
868 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
|
869 |
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
|
870 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
|
871 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
|
872 |
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
|
873 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
|
874 } |
1266 | 875 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
|
876 } |
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
|
877 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
|
878 } |
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
|
879 |
555 | 880 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) |
0 | 881 { |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
882 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
|
883 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
|
884 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
|
885 int index; |
885 | 886 |
350 | 887 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
|
888 return -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
889 |
1266 | 890 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
|
891 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
|
892 |
1266 | 893 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
|
894 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
|
895 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
|
896 }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
|
897 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
|
898 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
|
899 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
|
900 |
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
|
901 /* 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
|
902 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
|
903 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
|
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 // 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
|
906 // 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
|
907 // 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
|
908 // 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
|
909 // 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
|
910 // 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
|
911 // 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
|
912 // 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
|
913 // 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
|
914 // } |
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 // 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
|
916 // 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
|
917 // |
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 (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
|
919 // 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
|
920 // 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
|
921 // } |
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 // |
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 // 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
|
924 // } |
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 /* do the seek */ |
1388
3172bf94c066
Use proper PRI?64 macros for %ll? format to fix printf format warnings:
rathann
parents:
1358
diff
changeset
|
927 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
|
928 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
|
929 } |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
930 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
|
931 return 0; |
0 | 932 } |
933 | |
1169 | 934 AVInputFormat asf_demuxer = { |
0 | 935 "asf", |
936 "asf format", | |
937 sizeof(ASFContext), | |
938 asf_probe, | |
939 asf_read_header, | |
940 asf_read_packet, | |
941 asf_read_close, | |
942 asf_read_seek, | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
943 asf_read_pts, |
0 | 944 }; |