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