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