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