Mercurial > libavformat.hg
annotate asfdec.c @ 4592:3cd44adef5e8 libavformat
rename asf-enc.c to asfenc.c and asf.c to asfdec.c for consistency
author | aurel |
---|---|
date | Thu, 26 Feb 2009 15:44:19 +0000 |
parents | asf.c@20c095d77b92 |
children | 0d8b36d98ce2 |
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 |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4167
diff
changeset
|
3 * Copyright (c) 2000, 2001 Fabrice Bellard |
0 | 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 */ |
3286 | 21 |
22 #include "libavutil/common.h" | |
23 #include "libavcodec/mpegaudio.h" | |
0 | 24 #include "avformat.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
25 #include "riff.h" |
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
26 #include "asf.h" |
2652 | 27 #include "asfcrypt.h" |
0 | 28 |
4058 | 29 void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format); |
2708
046577e618bd
Allow propagation of stream selection through the ASF demuxer to the
benoit
parents:
2652
diff
changeset
|
30 |
348 | 31 #undef NDEBUG |
32 #include <assert.h> | |
33 | |
373
e47d9c8e2054
asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
372
diff
changeset
|
34 #define FRAME_HEADER_SIZE 17 |
885 | 35 // 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
|
36 |
0 | 37 static const GUID index_guid = { |
1687 | 38 0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb |
0 | 39 }; |
40 | |
1806
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
41 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
|
42 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
|
43 }; |
0 | 44 /**********************************/ |
45 /* decoding */ | |
46 | |
47 //#define DEBUG | |
48 | |
49 #ifdef DEBUG | |
69 | 50 #define PRINT_IF_GUID(g,cmp) \ |
51 if (!memcmp(g, &cmp, sizeof(GUID))) \ | |
3578 | 52 dprintf(NULL, "(GUID: %s) ", #cmp) |
69 | 53 |
0 | 54 static void print_guid(const GUID *g) |
55 { | |
56 int i; | |
69 | 57 PRINT_IF_GUID(g, asf_header); |
58 else PRINT_IF_GUID(g, file_header); | |
59 else PRINT_IF_GUID(g, stream_header); | |
60 else PRINT_IF_GUID(g, audio_stream); | |
61 else PRINT_IF_GUID(g, audio_conceal_none); | |
62 else PRINT_IF_GUID(g, video_stream); | |
63 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
|
64 else PRINT_IF_GUID(g, command_stream); |
69 | 65 else PRINT_IF_GUID(g, comment_header); |
66 else PRINT_IF_GUID(g, codec_comment_header); | |
67 else PRINT_IF_GUID(g, codec_comment1_header); | |
68 else PRINT_IF_GUID(g, data_header); | |
69 else PRINT_IF_GUID(g, index_guid); | |
70 else PRINT_IF_GUID(g, head1_guid); | |
71 else PRINT_IF_GUID(g, head2_guid); | |
72 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
|
73 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
|
74 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
|
75 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
|
76 else PRINT_IF_GUID(g, ext_stream_audio_stream); |
1750 | 77 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
|
78 else PRINT_IF_GUID(g, stream_bitrate_guid); |
69 | 79 else |
3578 | 80 dprintf(NULL, "(GUID: unknown) "); |
1687 | 81 for(i=0;i<16;i++) |
3578 | 82 dprintf(NULL, " 0x%02x,", (*g)[i]); |
83 dprintf(NULL, "}\n"); | |
0 | 84 } |
949 | 85 #undef PRINT_IF_GUID |
3578 | 86 #else |
87 #define print_guid(g) | |
0 | 88 #endif |
89 | |
90 static void get_guid(ByteIOContext *s, GUID *g) | |
91 { | |
1687 | 92 assert(sizeof(*g) == 16); |
2988
bc099b0e8b6f
typo, also fix warning: asf.c:90: warning: passing argument 2 of 'get_buffer' from incompatible pointer type
bcoudurier
parents:
2855
diff
changeset
|
93 get_buffer(s, *g, sizeof(*g)); |
0 | 94 } |
95 | |
96 #if 0 | |
97 static void get_str16(ByteIOContext *pb, char *buf, int buf_size) | |
98 { | |
99 int len, c; | |
100 char *q; | |
101 | |
102 len = get_le16(pb); | |
103 q = buf; | |
104 while (len > 0) { | |
105 c = get_le16(pb); | |
106 if ((q - buf) < buf_size - 1) | |
107 *q++ = c; | |
108 len--; | |
109 } | |
110 *q = '\0'; | |
111 } | |
112 #endif | |
113 | |
114 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) | |
115 { | |
1503 | 116 char* q = buf; |
117 len /= 2; | |
118 while (len--) { | |
119 uint8_t tmp; | |
120 PUT_UTF8(get_le16(pb), tmp, if (q - buf < buf_size - 1) *q++ = tmp;) | |
0 | 121 } |
122 *q = '\0'; | |
123 } | |
124 | |
125 static int asf_probe(AVProbeData *pd) | |
126 { | |
127 /* check file header */ | |
1687 | 128 if (!memcmp(pd->buf, &asf_header, sizeof(GUID))) |
0 | 129 return AVPROBE_SCORE_MAX; |
130 else | |
131 return 0; | |
132 } | |
133 | |
1750 | 134 static int get_value(ByteIOContext *pb, int type){ |
135 switch(type){ | |
136 case 2: return get_le32(pb); | |
137 case 3: return get_le32(pb); | |
138 case 4: return get_le64(pb); | |
139 case 5: return get_le16(pb); | |
140 default:return INT_MIN; | |
141 } | |
142 } | |
143 | |
4368 | 144 static void get_tag(AVFormatContext *s, const char *key, int type, int len) |
145 { | |
146 char value[1024]; | |
147 if (type <= 1) { // unicode or byte | |
148 get_str16_nolen(s->pb, len, value, sizeof(value)); | |
149 } else if (type <= 5) { // boolean or DWORD or QWORD or WORD | |
150 uint64_t num = get_value(s->pb, type); | |
151 snprintf(value, sizeof(value), "%"PRIu64, num); | |
152 } else { | |
153 url_fskip(s->pb, len); | |
154 return; | |
155 } | |
156 if (strncmp(key, "WM/", 3)) | |
157 key += 3; | |
158 av_metadata_set(&s->metadata, key, value); | |
159 } | |
160 | |
0 | 161 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) |
162 { | |
163 ASFContext *asf = s->priv_data; | |
164 GUID g; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
165 ByteIOContext *pb = s->pb; |
0 | 166 AVStream *st; |
167 ASFStream *asf_st; | |
168 int size, i; | |
65 | 169 int64_t gsize; |
1750 | 170 AVRational dar[128]; |
2064 | 171 uint32_t bitrate[128]; |
1750 | 172 |
173 memset(dar, 0, sizeof(dar)); | |
2064 | 174 memset(bitrate, 0, sizeof(bitrate)); |
0 | 175 |
176 get_guid(pb, &g); | |
177 if (memcmp(&g, &asf_header, sizeof(GUID))) | |
3486 | 178 return -1; |
0 | 179 get_le64(pb); |
180 get_le32(pb); | |
181 get_byte(pb); | |
182 get_byte(pb); | |
183 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); | |
184 for(;;) { | |
185 get_guid(pb, &g); | |
186 gsize = get_le64(pb); | |
3578 | 187 dprintf(s, "%08"PRIx64": ", url_ftell(pb) - 24); |
0 | 188 print_guid(&g); |
3578 | 189 dprintf(s, " size=0x%"PRIx64"\n", gsize); |
1896
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
190 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
|
191 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
|
192 // 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
|
193 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
|
194 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
|
195 } else { |
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
196 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
|
197 } |
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
198 break; |
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
199 } |
0 | 200 if (gsize < 24) |
3486 | 201 return -1; |
0 | 202 if (!memcmp(&g, &file_header, sizeof(GUID))) { |
203 get_guid(pb, &asf->hdr.guid); | |
887 | 204 asf->hdr.file_size = get_le64(pb); |
205 asf->hdr.create_time = get_le64(pb); | |
1701 | 206 asf->nb_packets = get_le64(pb); |
3239 | 207 asf->hdr.play_time = get_le64(pb); |
887 | 208 asf->hdr.send_time = get_le64(pb); |
209 asf->hdr.preroll = get_le32(pb); | |
210 asf->hdr.ignore = get_le32(pb); | |
211 asf->hdr.flags = get_le32(pb); | |
212 asf->hdr.min_pktsize = get_le32(pb); | |
213 asf->hdr.max_pktsize = get_le32(pb); | |
214 asf->hdr.max_bitrate = get_le32(pb); | |
215 asf->packet_size = asf->hdr.max_pktsize; | |
0 | 216 } else if (!memcmp(&g, &stream_header, sizeof(GUID))) { |
3967 | 217 enum CodecType type; |
218 int type_specific_size, sizeX; | |
1263
cf88f6719743
total_size should be 64bit (1 hunk of the asf seeking patch from DrDivx / Steve Lhomme)
michael
parents:
1206
diff
changeset
|
219 uint64_t total_size; |
0 | 220 unsigned int tag1; |
2318
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
221 int64_t pos1, pos2, start_time; |
2018 | 222 int test_for_ext_stream_audio, is_dvr_ms_audio=0; |
0 | 223 |
224 pos1 = url_ftell(pb); | |
225 | |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
226 st = av_new_stream(s, 0); |
0 | 227 if (!st) |
3486 | 228 return AVERROR(ENOMEM); |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
437
diff
changeset
|
229 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ |
0 | 230 asf_st = av_mallocz(sizeof(ASFStream)); |
231 if (!asf_st) | |
3486 | 232 return AVERROR(ENOMEM); |
0 | 233 st->priv_data = asf_st; |
2318
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
234 start_time = asf->hdr.preroll; |
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
235 |
1552 | 236 if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming... |
237 st->duration = asf->hdr.send_time / | |
2318
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
238 (10000000 / 1000) - start_time; |
1552 | 239 } |
0 | 240 get_guid(pb, &g); |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
241 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
242 test_for_ext_stream_audio = 0; |
0 | 243 if (!memcmp(&g, &audio_stream, sizeof(GUID))) { |
244 type = CODEC_TYPE_AUDIO; | |
245 } else if (!memcmp(&g, &video_stream, sizeof(GUID))) { | |
246 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
|
247 } else if (!memcmp(&g, &command_stream, sizeof(GUID))) { |
3567 | 248 type = CODEC_TYPE_DATA; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
249 } 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
|
250 test_for_ext_stream_audio = 1; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
251 type = CODEC_TYPE_UNKNOWN; |
0 | 252 } else { |
3486 | 253 return -1; |
0 | 254 } |
255 get_guid(pb, &g); | |
256 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
|
257 type_specific_size = get_le32(pb); |
0 | 258 get_le32(pb); |
887 | 259 st->id = get_le16(pb) & 0x7f; /* stream id */ |
0 | 260 // 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
|
261 asf->asfid2avid[st->id] = s->nb_streams - 1; |
0 | 262 |
263 get_le32(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
264 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
265 if (test_for_ext_stream_audio) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
266 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
267 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
|
268 type = CODEC_TYPE_AUDIO; |
2018 | 269 is_dvr_ms_audio=1; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
270 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
271 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
272 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
273 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
274 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
275 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
276 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
277 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
278 |
887 | 279 st->codec->codec_type = type; |
0 | 280 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
|
281 get_wav_header(pb, st->codec, type_specific_size); |
2018 | 282 if (is_dvr_ms_audio) { |
283 // codec_id and codec_tag are unreliable in dvr_ms | |
284 // files. Set them later by probing stream. | |
3568 | 285 st->codec->codec_id = CODEC_ID_PROBE; |
2018 | 286 st->codec->codec_tag = 0; |
287 } | |
4545 | 288 if (st->codec->codec_id == CODEC_ID_AAC) { |
289 st->need_parsing = AVSTREAM_PARSE_NONE; | |
290 } else { | |
4546 | 291 st->need_parsing = AVSTREAM_PARSE_FULL; |
4545 | 292 } |
887 | 293 /* We have to init the frame size at some point .... */ |
294 pos2 = url_ftell(pb); | |
1859 | 295 if (gsize >= (pos2 + 8 - pos1 + 24)) { |
887 | 296 asf_st->ds_span = get_byte(pb); |
297 asf_st->ds_packet_size = get_le16(pb); | |
298 asf_st->ds_chunk_size = get_le16(pb); | |
1701 | 299 get_le16(pb); //ds_data_size |
300 get_byte(pb); //ds_silence_data | |
887 | 301 } |
302 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", | |
303 // asf_st->ds_packet_size, asf_st->ds_chunk_size, | |
304 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); | |
305 if (asf_st->ds_span > 1) { | |
306 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
|
307 || (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
|
308 || asf_st->ds_packet_size % asf_st->ds_chunk_size) |
887 | 309 asf_st->ds_span = 0; // disable descrambling |
310 } | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
311 switch (st->codec->codec_id) { |
232 | 312 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
|
313 st->codec->frame_size = MPA_FRAME_SIZE; |
0 | 314 break; |
315 case CODEC_ID_PCM_S16LE: | |
316 case CODEC_ID_PCM_S16BE: | |
317 case CODEC_ID_PCM_U16LE: | |
318 case CODEC_ID_PCM_U16BE: | |
319 case CODEC_ID_PCM_S8: | |
320 case CODEC_ID_PCM_U8: | |
321 case CODEC_ID_PCM_ALAW: | |
322 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
|
323 st->codec->frame_size = 1; |
0 | 324 break; |
325 default: | |
326 /* 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
|
327 st->codec->frame_size = 1; |
0 | 328 break; |
329 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
330 } else if (type == CODEC_TYPE_VIDEO) { |
887 | 331 get_le32(pb); |
0 | 332 get_le32(pb); |
333 get_byte(pb); | |
334 size = get_le16(pb); /* size */ | |
732 | 335 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
|
336 st->codec->width = get_le32(pb); |
887 | 337 st->codec->height = get_le32(pb); |
0 | 338 /* not available for asf */ |
339 get_le16(pb); /* panes */ | |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3759
diff
changeset
|
340 st->codec->bits_per_coded_sample = get_le16(pb); /* depth */ |
0 | 341 tag1 = get_le32(pb); |
887 | 342 url_fskip(pb, 20); |
4508 | 343 // av_log(s, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX); |
732 | 344 size= sizeX; |
887 | 345 if (size > 40) { |
346 st->codec->extradata_size = size - 40; | |
347 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
348 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); | |
349 } | |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
350 |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
351 /* Extract palette from extradata if bpp <= 8 */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
352 /* This code assumes that extradata contains only palette */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
353 /* This is true for all paletted codecs implemented in ffmpeg */ |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3759
diff
changeset
|
354 if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
355 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
356 #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
|
357 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
|
358 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
|
359 #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
|
360 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
|
361 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
362 #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
|
363 st->codec->palctrl->palette_changed = 1; |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
364 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
365 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
366 st->codec->codec_tag = tag1; |
887 | 367 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); |
573 | 368 if(tag1 == MKTAG('D', 'V', 'R', ' ')) |
2023 | 369 st->need_parsing = AVSTREAM_PARSE_FULL; |
0 | 370 } |
371 pos2 = url_ftell(pb); | |
372 url_fskip(pb, gsize - (pos2 - pos1 + 24)); | |
373 } else if (!memcmp(&g, &comment_header, sizeof(GUID))) { | |
374 int len1, len2, len3, len4, len5; | |
375 | |
376 len1 = get_le16(pb); | |
377 len2 = get_le16(pb); | |
378 len3 = get_le16(pb); | |
379 len4 = get_le16(pb); | |
380 len5 = get_le16(pb); | |
4368 | 381 get_tag(s, "title" , 0, len1); |
382 get_tag(s, "author" , 0, len2); | |
383 get_tag(s, "copyright", 0, len3); | |
384 get_tag(s, "comment" , 0, len4); | |
887 | 385 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
|
386 } 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
|
387 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
|
388 int j; |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
389 |
4508 | 390 // av_log(s, AV_LOG_ERROR, "stream bitrate properties\n"); |
391 // av_log(s, AV_LOG_ERROR, "streams %d\n", streams); | |
1806
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
392 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
|
393 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
|
394 |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
395 flags= get_le16(pb); |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
396 bitrate= get_le32(pb); |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
397 stream_id= (flags & 0x7f); |
4508 | 398 // av_log(s, AV_LOG_ERROR, "flags: 0x%x stream id %d, bitrate %d\n", flags, stream_id, bitrate); |
2392 | 399 asf->stream_bitrates[stream_id]= bitrate; |
1806
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
400 } |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
401 } 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
|
402 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
|
403 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
404 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
|
405 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
|
406 { |
1264
3d00cb7b7426
value_num should also be 64bit (1 hunk from the asf seeking patch by DrDivx/Steve Lhomme)
michael
parents:
1263
diff
changeset
|
407 int name_len,value_type,value_len; |
1703 | 408 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
|
409 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
410 name_len = get_le16(pb); |
1703 | 411 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
|
412 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
|
413 value_len = get_le16(pb); |
4368 | 414 get_tag(s, name, value_type, value_len); |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
415 } |
1750 | 416 } else if (!memcmp(&g, &metadata_header, sizeof(GUID))) { |
417 int n, stream_num, name_len, value_len, value_type, value_num; | |
418 n = get_le16(pb); | |
419 | |
420 for(i=0;i<n;i++) { | |
421 char name[1024]; | |
422 | |
423 get_le16(pb); //lang_list_index | |
424 stream_num= get_le16(pb); | |
425 name_len= get_le16(pb); | |
426 value_type= get_le16(pb); | |
427 value_len= get_le32(pb); | |
428 | |
429 get_str16_nolen(pb, name_len, name, sizeof(name)); | |
4508 | 430 //av_log(s, AV_LOG_ERROR, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name); |
2164 | 431 value_num= get_le16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere |
1750 | 432 url_fskip(pb, value_len - 2); |
433 | |
434 if(stream_num<128){ | |
435 if (!strcmp(name, "AspectRatioX")) dar[stream_num].num= value_num; | |
436 else if(!strcmp(name, "AspectRatioY")) dar[stream_num].den= value_num; | |
437 } | |
438 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
439 } 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
|
440 int ext_len, payload_ext_ct, stream_ct; |
2064 | 441 uint32_t ext_d, leak_rate, stream_num; |
972 | 442 int64_t pos_ex_st; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
443 pos_ex_st = url_ftell(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
444 |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
445 get_le64(pb); // starttime |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
446 get_le64(pb); // endtime |
2064 | 447 leak_rate = get_le32(pb); // leak-datarate |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
448 get_le32(pb); // bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
449 get_le32(pb); // init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
450 get_le32(pb); // alt-leak-datarate |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
451 get_le32(pb); // alt-bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
452 get_le32(pb); // alt-init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
453 get_le32(pb); // max-object-size |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
454 get_le32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved) |
2064 | 455 stream_num = get_le16(pb); // stream-num |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
456 get_le16(pb); // stream-language-id-index |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
457 get_le64(pb); // avg frametime in 100ns units |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
458 stream_ct = get_le16(pb); //stream-name-count |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
459 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
|
460 |
2064 | 461 if (stream_num < 128) |
462 bitrate[stream_num] = leak_rate; | |
463 | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
464 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
|
465 get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
466 ext_len = get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
467 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
|
468 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
469 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
470 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
|
471 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
472 ext_d=get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
473 ext_len=get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
474 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
|
475 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
476 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
477 // 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
|
478 // if so the next iteration will pick it up |
0 | 479 } else if (!memcmp(&g, &head1_guid, sizeof(GUID))) { |
480 int v1, v2; | |
481 get_guid(pb, &g); | |
482 v1 = get_le32(pb); | |
483 v2 = get_le16(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
484 #if 0 |
0 | 485 } else if (!memcmp(&g, &codec_comment_header, sizeof(GUID))) { |
486 int len, v1, n, num; | |
487 char str[256], *q; | |
488 char tag[16]; | |
489 | |
490 get_guid(pb, &g); | |
491 print_guid(&g); | |
492 | |
493 n = get_le32(pb); | |
494 for(i=0;i<n;i++) { | |
495 num = get_le16(pb); /* stream number */ | |
496 get_str16(pb, str, sizeof(str)); | |
497 get_str16(pb, str, sizeof(str)); | |
498 len = get_le16(pb); | |
499 q = tag; | |
500 while (len > 0) { | |
501 v1 = get_byte(pb); | |
502 if ((q - tag) < sizeof(tag) - 1) | |
503 *q++ = v1; | |
504 len--; | |
505 } | |
506 *q = '\0'; | |
507 } | |
508 #endif | |
509 } else if (url_feof(pb)) { | |
3486 | 510 return -1; |
0 | 511 } else { |
512 url_fseek(pb, gsize - 24, SEEK_CUR); | |
513 } | |
514 } | |
515 get_guid(pb, &g); | |
516 get_le64(pb); | |
517 get_byte(pb); | |
518 get_byte(pb); | |
519 if (url_feof(pb)) | |
3486 | 520 return -1; |
0 | 521 asf->data_offset = url_ftell(pb); |
522 asf->packet_size_left = 0; | |
523 | |
1750 | 524 |
525 for(i=0; i<128; i++){ | |
526 int stream_num= asf->asfid2avid[i]; | |
2064 | 527 if(stream_num>=0){ |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
528 AVStream *st = s->streams[stream_num]; |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
529 if (!st->codec->bit_rate) |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
530 st->codec->bit_rate = bitrate[i]; |
2064 | 531 if (dar[i].num > 0 && dar[i].den > 0) |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
532 av_reduce(&st->sample_aspect_ratio.num, |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
533 &st->sample_aspect_ratio.den, |
2069
42d459116315
cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
diego
parents:
2064
diff
changeset
|
534 dar[i].num, dar[i].den, INT_MAX); |
4508 | 535 //av_log(s, AV_LOG_ERROR, "dar %d:%d sar=%d:%d\n", dar[i].num, dar[i].den, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); |
1750 | 536 } |
537 } | |
538 | |
0 | 539 return 0; |
540 } | |
541 | |
542 #define DO_2BITS(bits, var, defval) \ | |
543 switch (bits & 3) \ | |
544 { \ | |
545 case 3: var = get_le32(pb); rsize += 4; break; \ | |
546 case 2: var = get_le16(pb); rsize += 2; break; \ | |
547 case 1: var = get_byte(pb); rsize++; break; \ | |
548 default: var = defval; break; \ | |
549 } | |
550 | |
4121
55e94f2a8ac1
Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents:
4120
diff
changeset
|
551 int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb) |
0 | 552 { |
553 ASFContext *asf = s->priv_data; | |
554 uint32_t packet_length, padsize; | |
1967 | 555 int rsize = 8; |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
556 int c, d, e, off; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
557 |
4066
10f7232a3545
Do not access s->gb directly in functions that have a local copy of that
rbultje
parents:
4058
diff
changeset
|
558 off= (url_ftell(pb) - s->data_offset) % asf->packet_size + 3; |
885 | 559 |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
560 c=d=e=-1; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
561 while(off-- > 0){ |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
562 c=d; d=e; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
563 e= get_byte(pb); |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
564 if(c == 0x82 && !d && !e) |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
565 break; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
566 } |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
567 |
0 | 568 if (c != 0x82) { |
569 if (!url_feof(pb)) | |
887 | 570 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb)); |
0 | 571 } |
1967 | 572 if ((c & 0x8f) == 0x82) { |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
573 if (d || e) { |
0 | 574 if (!url_feof(pb)) |
887 | 575 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); |
1716 | 576 return -1; |
887 | 577 } |
1967 | 578 c= get_byte(pb); |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
579 d= get_byte(pb); |
1967 | 580 rsize+=3; |
581 }else{ | |
582 url_fseek(pb, -1, SEEK_CUR); //FIXME | |
0 | 583 } |
584 | |
1967 | 585 asf->packet_flags = c; |
586 asf->packet_property = d; | |
0 | 587 |
588 DO_2BITS(asf->packet_flags >> 5, packet_length, asf->packet_size); | |
589 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored | |
590 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length | |
591 | |
1333 | 592 //the following checks prevent overflows and infinite loops |
593 if(packet_length >= (1U<<29)){ | |
594 av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, url_ftell(pb)); | |
1713 | 595 return -1; |
1333 | 596 } |
1715 | 597 if(padsize >= packet_length){ |
1333 | 598 av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, url_ftell(pb)); |
1713 | 599 return -1; |
1333 | 600 } |
601 | |
0 | 602 asf->packet_timestamp = get_le32(pb); |
603 get_le16(pb); /* duration */ | |
604 // rsize has at least 11 bytes which have to be present | |
605 | |
606 if (asf->packet_flags & 0x01) { | |
887 | 607 asf->packet_segsizetype = get_byte(pb); rsize++; |
0 | 608 asf->packet_segments = asf->packet_segsizetype & 0x3f; |
609 } else { | |
887 | 610 asf->packet_segments = 1; |
0 | 611 asf->packet_segsizetype = 0x80; |
612 } | |
613 asf->packet_size_left = packet_length - padsize - rsize; | |
614 if (packet_length < asf->hdr.min_pktsize) | |
615 padsize += asf->hdr.min_pktsize - packet_length; | |
616 asf->packet_padsize = padsize; | |
3578 | 617 dprintf(s, "packet: size=%d padsize=%d left=%d\n", asf->packet_size, asf->packet_padsize, asf->packet_size_left); |
0 | 618 return 0; |
619 } | |
620 | |
1708 | 621 /** |
622 * | |
623 * @return <0 if error | |
624 */ | |
4120
a22587bda6cf
Add a ByteIOContext argument to ASF functions that will be shared with the
rbultje
parents:
4095
diff
changeset
|
625 static int asf_read_frame_header(AVFormatContext *s, ByteIOContext *pb){ |
1708 | 626 ASFContext *asf = s->priv_data; |
627 int rsize = 1; | |
628 int num = get_byte(pb); | |
1776 | 629 int64_t ts0, ts1; |
1708 | 630 |
631 asf->packet_segments--; | |
632 asf->packet_key_frame = num >> 7; | |
633 asf->stream_index = asf->asfid2avid[num & 0x7f]; | |
634 // sequence should be ignored! | |
635 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); | |
636 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); | |
637 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); | |
638 //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); | |
639 if (asf->packet_replic_size >= 8) { | |
640 asf->packet_obj_size = get_le32(pb); | |
641 if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ | |
642 av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); | |
643 return -1; | |
644 } | |
645 asf->packet_frag_timestamp = get_le32(pb); // timestamp | |
1776 | 646 if(asf->packet_replic_size >= 8+38+4){ |
647 // for(i=0; i<asf->packet_replic_size-8; i++) | |
648 // av_log(s, AV_LOG_DEBUG, "%02X ",get_byte(pb)); | |
649 // av_log(s, AV_LOG_DEBUG, "\n"); | |
650 url_fskip(pb, 10); | |
651 ts0= get_le64(pb); | |
652 ts1= get_le64(pb); | |
653 url_fskip(pb, 12); | |
654 get_le32(pb); | |
655 url_fskip(pb, asf->packet_replic_size - 8 - 38 - 4); | |
656 if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000; | |
657 else asf->packet_frag_timestamp= AV_NOPTS_VALUE; | |
658 }else | |
659 url_fskip(pb, asf->packet_replic_size - 8); | |
1708 | 660 rsize += asf->packet_replic_size; // FIXME - check validity |
661 } else if (asf->packet_replic_size==1){ | |
2855 | 662 // multipacket - frag_offset is beginning timestamp |
1708 | 663 asf->packet_time_start = asf->packet_frag_offset; |
664 asf->packet_frag_offset = 0; | |
665 asf->packet_frag_timestamp = asf->packet_timestamp; | |
666 | |
667 asf->packet_time_delta = get_byte(pb); | |
668 rsize++; | |
669 }else if(asf->packet_replic_size!=0){ | |
670 av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); | |
671 return -1; | |
672 } | |
673 if (asf->packet_flags & 0x01) { | |
674 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal | |
1712 | 675 if(asf->packet_frag_size > asf->packet_size_left - rsize){ |
676 av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid\n"); | |
677 return -1; | |
678 } | |
1708 | 679 //printf("Fragsize %d\n", asf->packet_frag_size); |
680 } else { | |
681 asf->packet_frag_size = asf->packet_size_left - rsize; | |
682 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize); | |
683 } | |
684 if (asf->packet_replic_size == 1) { | |
685 asf->packet_multi_size = asf->packet_frag_size; | |
686 if (asf->packet_multi_size > asf->packet_size_left) | |
687 return -1; | |
688 } | |
689 asf->packet_size_left -= rsize; | |
690 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); | |
691 | |
692 return 0; | |
693 } | |
694 | |
4121
55e94f2a8ac1
Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents:
4120
diff
changeset
|
695 int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt) |
0 | 696 { |
697 ASFContext *asf = s->priv_data; | |
698 ASFStream *asf_st = 0; | |
699 for (;;) { | |
1713 | 700 if(url_feof(pb)) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2169
diff
changeset
|
701 return AVERROR(EIO); |
887 | 702 if (asf->packet_size_left < FRAME_HEADER_SIZE |
703 || asf->packet_segments < 1) { | |
704 //asf->packet_size_left <= asf->packet_padsize) { | |
705 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
|
706 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); |
1333 | 707 assert(ret>=0); |
887 | 708 /* fail safe */ |
709 url_fskip(pb, ret); | |
1707
7e12a19c140f
more correct packet alignment check and correction
michael
parents:
1706
diff
changeset
|
710 |
4066
10f7232a3545
Do not access s->gb directly in functions that have a local copy of that
rbultje
parents:
4058
diff
changeset
|
711 asf->packet_pos= url_ftell(pb); |
1206
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
712 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
|
713 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2169
diff
changeset
|
714 return AVERROR(EIO); /* Do not exceed the size of the data object */ |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
715 return 1; |
887 | 716 } |
717 if (asf->packet_time_start == 0) { | |
4167
81f64d590675
Don't use s->pb if a local ByteIOContext was already provided by the calling
rbultje
parents:
4121
diff
changeset
|
718 if(asf_read_frame_header(s, pb) < 0){ |
1708 | 719 asf->packet_segments= 0; |
1696 | 720 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
|
721 } |
887 | 722 if (asf->stream_index < 0 |
708 | 723 || s->streams[asf->stream_index]->discard >= AVDISCARD_ALL |
724 || (!asf->packet_key_frame && s->streams[asf->stream_index]->discard >= AVDISCARD_NONKEY) | |
725 ) { | |
0 | 726 asf->packet_time_start = 0; |
887 | 727 /* unhandled packet (should not happen) */ |
728 url_fskip(pb, asf->packet_frag_size); | |
729 asf->packet_size_left -= asf->packet_frag_size; | |
652 | 730 if(asf->stream_index < 0) |
1708 | 731 av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size); |
0 | 732 continue; |
887 | 733 } |
734 asf->asf_st = s->streams[asf->stream_index]->priv_data; | |
735 } | |
736 asf_st = asf->asf_st; | |
0 | 737 |
887 | 738 if (asf->packet_replic_size == 1) { |
2855 | 739 // frag_offset is here used as the beginning timestamp |
887 | 740 asf->packet_frag_timestamp = asf->packet_time_start; |
741 asf->packet_time_start += asf->packet_time_delta; | |
742 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb); | |
743 asf->packet_size_left--; | |
0 | 744 asf->packet_multi_size--; |
887 | 745 if (asf->packet_multi_size < asf->packet_obj_size) |
746 { | |
747 asf->packet_time_start = 0; | |
748 url_fskip(pb, asf->packet_multi_size); | |
749 asf->packet_size_left -= asf->packet_multi_size; | |
0 | 750 continue; |
887 | 751 } |
752 asf->packet_multi_size -= asf->packet_obj_size; | |
753 //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); | |
754 } | |
2285 | 755 if( /*asf->packet_frag_size == asf->packet_obj_size*/ |
756 asf_st->frag_offset + asf->packet_frag_size <= asf_st->pkt.size | |
757 && asf_st->frag_offset + asf->packet_frag_size > asf->packet_obj_size){ | |
758 av_log(s, AV_LOG_INFO, "ignoring invalid packet_obj_size (%d %d %d %d)\n", | |
759 asf_st->frag_offset, asf->packet_frag_size, | |
760 asf->packet_obj_size, asf_st->pkt.size); | |
761 asf->packet_obj_size= asf_st->pkt.size; | |
762 } | |
763 | |
1744 | 764 if ( asf_st->pkt.size != asf->packet_obj_size |
765 || 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
|
766 if(asf_st->pkt.data){ |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
767 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
|
768 asf_st->frag_offset = 0; |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
769 av_free_packet(&asf_st->pkt); |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
770 } |
887 | 771 /* new packet */ |
772 av_new_packet(&asf_st->pkt, asf->packet_obj_size); | |
773 asf_st->seq = asf->packet_seq; | |
4022 | 774 asf_st->pkt.dts = asf->packet_frag_timestamp; |
887 | 775 asf_st->pkt.stream_index = asf->stream_index; |
885 | 776 asf_st->pkt.pos = |
777 asf_st->packet_pos= asf->packet_pos; | |
778 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", | |
349 | 779 //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
|
780 //s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size); |
887 | 781 if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO) |
782 asf->packet_key_frame = 1; | |
783 if (asf->packet_key_frame) | |
784 asf_st->pkt.flags |= PKT_FLAG_KEY; | |
785 } | |
0 | 786 |
887 | 787 /* read data */ |
788 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", | |
789 // asf->packet_size, asf_st->pkt.size, asf->packet_frag_offset, | |
790 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data); | |
791 asf->packet_size_left -= asf->packet_frag_size; | |
792 if (asf->packet_size_left < 0) | |
0 | 793 continue; |
1709 | 794 |
795 if( asf->packet_frag_offset >= asf_st->pkt.size | |
796 || asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset){ | |
797 av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n", | |
798 asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size); | |
799 continue; | |
800 } | |
801 | |
887 | 802 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, |
803 asf->packet_frag_size); | |
2652 | 804 if (s->key && s->keylen == 20) |
805 ff_asfcrypt_dec(s->key, asf_st->pkt.data + asf->packet_frag_offset, | |
806 asf->packet_frag_size); | |
887 | 807 asf_st->frag_offset += asf->packet_frag_size; |
808 /* test if whole packet is read */ | |
809 if (asf_st->frag_offset == asf_st->pkt.size) { | |
2416
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
810 //workaround for macroshit radio DVR-MS files |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
811 if( s->streams[asf->stream_index]->codec->codec_id == CODEC_ID_MPEG2VIDEO |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
812 && asf_st->pkt.size > 100){ |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
813 int i; |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
814 for(i=0; i<asf_st->pkt.size && !asf_st->pkt.data[i]; i++); |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
815 if(i == asf_st->pkt.size){ |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
816 av_log(s, AV_LOG_DEBUG, "discarding ms fart\n"); |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
817 asf_st->frag_offset = 0; |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
818 av_free_packet(&asf_st->pkt); |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
819 continue; |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
820 } |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
821 } |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
822 |
887 | 823 /* return packet */ |
824 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
|
825 if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span){ |
2319 | 826 av_log(s, AV_LOG_ERROR, "pkt.size != ds_packet_size * ds_span (%d %d %d)\n", asf_st->pkt.size, asf_st->ds_packet_size, asf_st->ds_span); |
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
|
827 }else{ |
887 | 828 /* packet descrambling */ |
1332 | 829 uint8_t *newdata = av_malloc(asf_st->pkt.size); |
887 | 830 if (newdata) { |
831 int offset = 0; | |
832 while (offset < asf_st->pkt.size) { | |
833 int off = offset / asf_st->ds_chunk_size; | |
834 int row = off / asf_st->ds_span; | |
835 int col = off % asf_st->ds_span; | |
836 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; | |
837 //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
|
838 |
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
|
839 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
|
840 assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size); |
887 | 841 memcpy(newdata + offset, |
842 asf_st->pkt.data + idx * asf_st->ds_chunk_size, | |
843 asf_st->ds_chunk_size); | |
844 offset += asf_st->ds_chunk_size; | |
845 } | |
846 av_free(asf_st->pkt.data); | |
847 asf_st->pkt.data = newdata; | |
848 } | |
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
|
849 } |
887 | 850 } |
851 asf_st->frag_offset = 0; | |
1699 | 852 *pkt= asf_st->pkt; |
887 | 853 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size); |
854 asf_st->pkt.size = 0; | |
855 asf_st->pkt.data = 0; | |
856 break; // packet completed | |
857 } | |
0 | 858 } |
859 return 0; | |
860 } | |
861 | |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
862 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
863 { |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
864 ASFContext *asf = s->priv_data; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
865 |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
866 for (;;) { |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
867 int ret; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
868 |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
869 /* parse cached packets, if any */ |
4121
55e94f2a8ac1
Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents:
4120
diff
changeset
|
870 if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0) |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
871 return ret; |
4121
55e94f2a8ac1
Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents:
4120
diff
changeset
|
872 if ((ret = ff_asf_get_packet(s, s->pb)) < 0) |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
873 assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
874 asf->packet_time_start = 0; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
875 } |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
876 |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
877 return 0; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
878 } |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
879 |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
880 // 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
|
881 // 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
|
882 // 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
|
883 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
|
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; |
349 | 886 ASFStream *asf_st; |
887 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
|
888 |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
889 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
|
890 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
|
891 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
|
892 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
|
893 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
|
894 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
|
895 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
|
896 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
|
897 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
|
898 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
|
899 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
|
900 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
|
901 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
|
902 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
|
903 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
|
904 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
|
905 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
|
906 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
|
907 asf->packet_time_start = 0; |
885 | 908 |
349 | 909 for(i=0; i<s->nb_streams; i++){ |
910 asf_st= s->streams[i]->priv_data; | |
911 av_free_packet(&asf_st->pkt); | |
912 asf_st->frag_offset=0; | |
913 asf_st->seq=0; | |
914 } | |
915 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
|
916 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
917 |
2603
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
918 static int asf_read_close(AVFormatContext *s) |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
919 { |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
920 int i; |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
921 |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
922 asf_reset_header(s); |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
923 for(i=0;i<s->nb_streams;i++) { |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
924 AVStream *st = s->streams[i]; |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
925 av_free(st->codec->palctrl); |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
926 } |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
927 return 0; |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
928 } |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
929 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
930 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
|
931 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
932 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
|
933 AVPacket pkt1, *pkt = &pkt1; |
349 | 934 ASFStream *asf_st; |
935 int64_t pts; | |
348 | 936 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
|
937 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
|
938 int64_t start_pos[s->nb_streams]; |
885 | 939 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
940 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
|
941 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
|
942 } |
885 | 943 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
944 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
|
945 *ppos= pos; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
946 url_fseek(s->pb, pos, SEEK_SET); |
885 | 947 |
349 | 948 //printf("asf_read_pts\n"); |
949 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
|
950 for(;;){ |
349 | 951 if (av_read_frame(s, pkt) < 0){ |
1714 | 952 av_log(s, AV_LOG_INFO, "asf_read_pts failed\n"); |
887 | 953 return AV_NOPTS_VALUE; |
349 | 954 } |
885 | 955 |
991 | 956 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
|
957 |
348 | 958 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
|
959 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
|
960 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
|
961 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
962 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
|
963 |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
964 // 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
|
965 pos= asf_st->packet_pos; |
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
966 |
1266 | 967 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
|
968 start_pos[i]= asf_st->packet_pos + 1; |
885 | 969 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
970 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
|
971 break; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
972 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
973 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
974 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
975 *ppos= pos; |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
976 //printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts); |
348 | 977 |
978 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
|
979 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
980 |
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 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
|
982 { |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
983 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
|
984 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
|
985 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
|
986 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
|
987 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
|
988 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
|
989 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
990 current_pos = url_ftell(s->pb); |
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
|
991 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
992 url_fseek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
993 get_guid(s->pb, &g); |
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
|
994 if (!memcmp(&g, &index_guid, sizeof(GUID))) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
995 gsize = get_le64(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
996 get_guid(s->pb, &g); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
997 itime=get_le64(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
998 pct=get_le32(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
999 ict=get_le32(s->pb); |
4508 | 1000 av_log(s, 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
|
1001 |
613fdf995af0
read and use index (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 for (i=0;i<ict;i++){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1003 int pktnum=get_le32(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1004 int pktct =get_le16(s->pb); |
4508 | 1005 av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d\n", pktnum, pktct); |
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
|
1006 |
613fdf995af0
read and use index (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 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
|
1008 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
|
1009 |
613fdf995af0
read and use index (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 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
|
1011 } |
1266 | 1012 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
|
1013 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1014 url_fseek(s->pb, current_pos, SEEK_SET); |
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
|
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 |
555 | 1017 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) |
0 | 1018 { |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
1019 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
|
1020 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
|
1021 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
|
1022 int index; |
885 | 1023 |
350 | 1024 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
|
1025 return -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1026 |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1027 /* Try using the protocol's read_seek if available */ |
2842 | 1028 if(s->pb) { |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1029 int ret = av_url_read_fseek(s->pb, stream_index, pts, flags); |
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1030 if(ret >= 0) |
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1031 asf_reset_header(s); |
2842 | 1032 if (ret != AVERROR(ENOSYS)) |
2843 | 1033 return ret; |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1034 } |
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1035 |
1266 | 1036 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
|
1037 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
|
1038 |
1266 | 1039 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
|
1040 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
|
1041 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
|
1042 }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
|
1043 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
|
1044 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
|
1045 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
|
1046 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1047 /* 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
|
1048 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
|
1049 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
|
1050 |
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
|
1051 // 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
|
1052 // asf_reset_header(s); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1053 // url_fseek(s->pb, pos, SEEK_SET); |
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
|
1054 // 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
|
1055 // for(i=0;i<16;i++){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1056 // pos = url_ftell(s->pb); |
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
|
1057 // 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
|
1058 // 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
|
1059 // 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
|
1060 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1061 // 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
|
1062 // 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
|
1063 // |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1064 // 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
|
1065 // 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
|
1066 // 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
|
1067 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1068 // |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1069 // 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
|
1070 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1071 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1072 /* do the seek */ |
4508 | 1073 av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1074 url_fseek(s->pb, pos, SEEK_SET); |
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
|
1075 } |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1076 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
|
1077 return 0; |
0 | 1078 } |
1079 | |
1169 | 1080 AVInputFormat asf_demuxer = { |
0 | 1081 "asf", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
1082 NULL_IF_CONFIG_SMALL("ASF format"), |
0 | 1083 sizeof(ASFContext), |
1084 asf_probe, | |
1085 asf_read_header, | |
1086 asf_read_packet, | |
1087 asf_read_close, | |
1088 asf_read_seek, | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
1089 asf_read_pts, |
0 | 1090 }; |