Mercurial > libavformat.hg
annotate asf.c @ 2081:040bdd013062 libavformat
dmb1 fourcc, mjpeg_opendml.mov
author | bcoudurier |
---|---|
date | Thu, 10 May 2007 23:42:28 +0000 |
parents | 42d459116315 |
children | 3804e39efbfd |
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; |
65 | 199 int64_t pos1, pos2; |
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; | |
743 | 212 st->start_time = asf->hdr.preroll; |
1552 | 213 if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming... |
214 st->duration = asf->hdr.send_time / | |
215 (10000000 / 1000) - st->start_time; | |
216 } | |
0 | 217 get_guid(pb, &g); |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
218 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
219 test_for_ext_stream_audio = 0; |
0 | 220 if (!memcmp(&g, &audio_stream, sizeof(GUID))) { |
221 type = CODEC_TYPE_AUDIO; | |
222 } else if (!memcmp(&g, &video_stream, sizeof(GUID))) { | |
223 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
|
224 } 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
|
225 type = CODEC_TYPE_UNKNOWN; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
226 } 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
|
227 test_for_ext_stream_audio = 1; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
228 type = CODEC_TYPE_UNKNOWN; |
0 | 229 } else { |
230 goto fail; | |
231 } | |
232 get_guid(pb, &g); | |
233 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
|
234 type_specific_size = get_le32(pb); |
0 | 235 get_le32(pb); |
887 | 236 st->id = get_le16(pb) & 0x7f; /* stream id */ |
0 | 237 // 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
|
238 asf->asfid2avid[st->id] = s->nb_streams - 1; |
0 | 239 |
240 get_le32(pb); | |
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 if (test_for_ext_stream_audio) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
243 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
244 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
|
245 type = CODEC_TYPE_AUDIO; |
2018 | 246 is_dvr_ms_audio=1; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
247 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
248 get_le32(pb); |
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_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
252 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
253 } |
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 |
887 | 256 st->codec->codec_type = type; |
0 | 257 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
|
258 get_wav_header(pb, st->codec, type_specific_size); |
2018 | 259 if (is_dvr_ms_audio) { |
260 // codec_id and codec_tag are unreliable in dvr_ms | |
261 // files. Set them later by probing stream. | |
262 st->codec->codec_id = CODEC_ID_NONE; | |
263 st->codec->codec_tag = 0; | |
264 } | |
2023 | 265 st->need_parsing = AVSTREAM_PARSE_FULL; |
887 | 266 /* We have to init the frame size at some point .... */ |
267 pos2 = url_ftell(pb); | |
1859 | 268 if (gsize >= (pos2 + 8 - pos1 + 24)) { |
887 | 269 asf_st->ds_span = get_byte(pb); |
270 asf_st->ds_packet_size = get_le16(pb); | |
271 asf_st->ds_chunk_size = get_le16(pb); | |
1701 | 272 get_le16(pb); //ds_data_size |
273 get_byte(pb); //ds_silence_data | |
887 | 274 } |
275 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", | |
276 // asf_st->ds_packet_size, asf_st->ds_chunk_size, | |
277 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); | |
278 if (asf_st->ds_span > 1) { | |
279 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
|
280 || (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
|
281 || asf_st->ds_packet_size % asf_st->ds_chunk_size) |
887 | 282 asf_st->ds_span = 0; // disable descrambling |
283 } | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
284 switch (st->codec->codec_id) { |
232 | 285 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
|
286 st->codec->frame_size = MPA_FRAME_SIZE; |
0 | 287 break; |
288 case CODEC_ID_PCM_S16LE: | |
289 case CODEC_ID_PCM_S16BE: | |
290 case CODEC_ID_PCM_U16LE: | |
291 case CODEC_ID_PCM_U16BE: | |
292 case CODEC_ID_PCM_S8: | |
293 case CODEC_ID_PCM_U8: | |
294 case CODEC_ID_PCM_ALAW: | |
295 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
|
296 st->codec->frame_size = 1; |
0 | 297 break; |
298 default: | |
299 /* 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
|
300 st->codec->frame_size = 1; |
0 | 301 break; |
302 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
303 } else if (type == CODEC_TYPE_VIDEO) { |
887 | 304 get_le32(pb); |
0 | 305 get_le32(pb); |
306 get_byte(pb); | |
307 size = get_le16(pb); /* size */ | |
732 | 308 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
|
309 st->codec->width = get_le32(pb); |
887 | 310 st->codec->height = get_le32(pb); |
0 | 311 /* not available for asf */ |
312 get_le16(pb); /* panes */ | |
887 | 313 st->codec->bits_per_sample = get_le16(pb); /* depth */ |
0 | 314 tag1 = get_le32(pb); |
887 | 315 url_fskip(pb, 20); |
732 | 316 // av_log(NULL, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX); |
317 size= sizeX; | |
887 | 318 if (size > 40) { |
319 st->codec->extradata_size = size - 40; | |
320 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
321 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); | |
322 } | |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
323 |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
324 /* Extract palette from extradata if bpp <= 8 */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
325 /* This code assumes that extradata contains only palette */ |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
326 /* 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
|
327 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
|
328 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
329 #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
|
330 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
|
331 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
|
332 #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
|
333 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
|
334 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
335 #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
|
336 st->codec->palctrl->palette_changed = 1; |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
337 } |
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
338 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
339 st->codec->codec_tag = tag1; |
887 | 340 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); |
573 | 341 if(tag1 == MKTAG('D', 'V', 'R', ' ')) |
2023 | 342 st->need_parsing = AVSTREAM_PARSE_FULL; |
0 | 343 } |
344 pos2 = url_ftell(pb); | |
345 url_fskip(pb, gsize - (pos2 - pos1 + 24)); | |
346 } else if (!memcmp(&g, &comment_header, sizeof(GUID))) { | |
347 int len1, len2, len3, len4, len5; | |
348 | |
349 len1 = get_le16(pb); | |
350 len2 = get_le16(pb); | |
351 len3 = get_le16(pb); | |
352 len4 = get_le16(pb); | |
353 len5 = get_le16(pb); | |
1704 | 354 get_str16_nolen(pb, len1, s->title , sizeof(s->title)); |
355 get_str16_nolen(pb, len2, s->author , sizeof(s->author)); | |
0 | 356 get_str16_nolen(pb, len3, s->copyright, sizeof(s->copyright)); |
1704 | 357 get_str16_nolen(pb, len4, s->comment , sizeof(s->comment)); |
887 | 358 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
|
359 } 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
|
360 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
|
361 int j; |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
362 |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
363 // 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
|
364 // 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
|
365 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
|
366 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
|
367 |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
368 flags= get_le16(pb); |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
369 bitrate= get_le32(pb); |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
370 stream_id= (flags & 0x7f); |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
371 // 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
|
372 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
|
373 } |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
374 } 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
|
375 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
|
376 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
377 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
|
378 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
|
379 { |
1264
3d00cb7b7426
value_num should also be 64bit (1 hunk from the asf seeking patch by DrDivx/Steve Lhomme)
michael
parents:
1263
diff
changeset
|
380 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
|
381 uint64_t value_num = 0; |
1703 | 382 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
|
383 |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
384 name_len = get_le16(pb); |
1703 | 385 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
|
386 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
|
387 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
|
388 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
|
389 { |
1706 | 390 if (!strcmp(name,"WM/AlbumTitle")) get_str16_nolen(pb, value_len, s->album, sizeof(s->album)); |
391 else if(!strcmp(name,"WM/Genre" )) get_str16_nolen(pb, value_len, s->genre, sizeof(s->genre)); | |
392 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
|
393 } |
792 | 394 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
|
395 { |
1750 | 396 value_num= get_value(pb, value_type); |
1704 | 397 if (!strcmp(name,"WM/Track" )) s->track = value_num + 1; |
398 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
|
399 } |
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
400 } |
1750 | 401 } else if (!memcmp(&g, &metadata_header, sizeof(GUID))) { |
402 int n, stream_num, name_len, value_len, value_type, value_num; | |
403 n = get_le16(pb); | |
404 | |
405 for(i=0;i<n;i++) { | |
406 char name[1024]; | |
407 | |
408 get_le16(pb); //lang_list_index | |
409 stream_num= get_le16(pb); | |
410 name_len= get_le16(pb); | |
411 value_type= get_le16(pb); | |
412 value_len= get_le32(pb); | |
413 | |
414 get_str16_nolen(pb, name_len, name, sizeof(name)); | |
415 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name); | |
416 value_num= get_le16(pb);//we should use get_value() here but it doesnt work 2 is le16 here but le32 elsewhere | |
417 url_fskip(pb, value_len - 2); | |
418 | |
419 if(stream_num<128){ | |
420 if (!strcmp(name, "AspectRatioX")) dar[stream_num].num= value_num; | |
421 else if(!strcmp(name, "AspectRatioY")) dar[stream_num].den= value_num; | |
422 } | |
423 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
424 } 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
|
425 int ext_len, payload_ext_ct, stream_ct; |
2064 | 426 uint32_t ext_d, leak_rate, stream_num; |
972 | 427 int64_t pos_ex_st; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
428 pos_ex_st = url_ftell(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
429 |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
430 get_le64(pb); // starttime |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
431 get_le64(pb); // endtime |
2064 | 432 leak_rate = get_le32(pb); // leak-datarate |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
433 get_le32(pb); // bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
434 get_le32(pb); // init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
435 get_le32(pb); // alt-leak-datarate |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
436 get_le32(pb); // alt-bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
437 get_le32(pb); // alt-init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
438 get_le32(pb); // max-object-size |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
439 get_le32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved) |
2064 | 440 stream_num = get_le16(pb); // stream-num |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
441 get_le16(pb); // stream-language-id-index |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
442 get_le64(pb); // avg frametime in 100ns units |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
443 stream_ct = get_le16(pb); //stream-name-count |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
444 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
|
445 |
2064 | 446 if (stream_num < 128) |
447 bitrate[stream_num] = leak_rate; | |
448 | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
449 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
|
450 get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
451 ext_len = get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
452 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
|
453 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
454 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
455 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
|
456 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
457 ext_d=get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
458 ext_len=get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
459 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
|
460 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
461 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
462 // 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
|
463 // if so the next iteration will pick it up |
0 | 464 } else if (!memcmp(&g, &head1_guid, sizeof(GUID))) { |
465 int v1, v2; | |
466 get_guid(pb, &g); | |
467 v1 = get_le32(pb); | |
468 v2 = get_le16(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
469 #if 0 |
0 | 470 } else if (!memcmp(&g, &codec_comment_header, sizeof(GUID))) { |
471 int len, v1, n, num; | |
472 char str[256], *q; | |
473 char tag[16]; | |
474 | |
475 get_guid(pb, &g); | |
476 print_guid(&g); | |
477 | |
478 n = get_le32(pb); | |
479 for(i=0;i<n;i++) { | |
480 num = get_le16(pb); /* stream number */ | |
481 get_str16(pb, str, sizeof(str)); | |
482 get_str16(pb, str, sizeof(str)); | |
483 len = get_le16(pb); | |
484 q = tag; | |
485 while (len > 0) { | |
486 v1 = get_byte(pb); | |
487 if ((q - tag) < sizeof(tag) - 1) | |
488 *q++ = v1; | |
489 len--; | |
490 } | |
491 *q = '\0'; | |
492 } | |
493 #endif | |
494 } else if (url_feof(pb)) { | |
495 goto fail; | |
496 } else { | |
497 url_fseek(pb, gsize - 24, SEEK_CUR); | |
498 } | |
499 } | |
500 get_guid(pb, &g); | |
501 get_le64(pb); | |
502 get_byte(pb); | |
503 get_byte(pb); | |
504 if (url_feof(pb)) | |
505 goto fail; | |
506 asf->data_offset = url_ftell(pb); | |
507 asf->packet_size_left = 0; | |
508 | |
1750 | 509 |
510 for(i=0; i<128; i++){ | |
511 int stream_num= asf->asfid2avid[i]; | |
2064 | 512 if(stream_num>=0){ |
1750 | 513 AVCodecContext *codec= s->streams[stream_num]->codec; |
2064 | 514 if (!codec->bit_rate) |
515 codec->bit_rate = bitrate[i]; | |
516 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
|
517 av_reduce(&codec->sample_aspect_ratio.num, |
42d459116315
cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
diego
parents:
2064
diff
changeset
|
518 &codec->sample_aspect_ratio.den, |
42d459116315
cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
diego
parents:
2064
diff
changeset
|
519 dar[i].num, dar[i].den, INT_MAX); |
1750 | 520 //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); |
521 } | |
522 } | |
523 | |
0 | 524 return 0; |
525 | |
526 fail: | |
527 for(i=0;i<s->nb_streams;i++) { | |
528 AVStream *st = s->streams[i]; | |
887 | 529 if (st) { |
530 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
|
531 av_free(st->codec->extradata); |
887 | 532 } |
0 | 533 av_free(st); |
534 } | |
535 return -1; | |
536 } | |
537 | |
538 #define DO_2BITS(bits, var, defval) \ | |
539 switch (bits & 3) \ | |
540 { \ | |
541 case 3: var = get_le32(pb); rsize += 4; break; \ | |
542 case 2: var = get_le16(pb); rsize += 2; break; \ | |
543 case 1: var = get_byte(pb); rsize++; break; \ | |
544 default: var = defval; break; \ | |
545 } | |
546 | |
1716 | 547 /** |
548 * | |
549 * @return <0 in case of an error | |
550 */ | |
0 | 551 static int asf_get_packet(AVFormatContext *s) |
552 { | |
553 ASFContext *asf = s->priv_data; | |
554 ByteIOContext *pb = &s->pb; | |
555 uint32_t packet_length, padsize; | |
1967 | 556 int rsize = 8; |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
557 int c, d, e, off; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
558 |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
559 off= (url_ftell(&s->pb) - s->data_offset) % asf->packet_size + 3; |
885 | 560 |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
561 c=d=e=-1; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
562 while(off-- > 0){ |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
563 c=d; d=e; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
564 e= get_byte(pb); |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
565 if(c == 0x82 && !d && !e) |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
566 break; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
567 } |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
568 |
0 | 569 if (c != 0x82) { |
570 if (!url_feof(pb)) | |
887 | 571 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb)); |
0 | 572 } |
1967 | 573 if ((c & 0x8f) == 0x82) { |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
574 if (d || e) { |
0 | 575 if (!url_feof(pb)) |
887 | 576 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); |
1716 | 577 return -1; |
887 | 578 } |
1967 | 579 c= get_byte(pb); |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
580 d= get_byte(pb); |
1967 | 581 rsize+=3; |
582 }else{ | |
583 url_fseek(pb, -1, SEEK_CUR); //FIXME | |
0 | 584 } |
585 | |
1967 | 586 asf->packet_flags = c; |
587 asf->packet_property = d; | |
0 | 588 |
589 DO_2BITS(asf->packet_flags >> 5, packet_length, asf->packet_size); | |
590 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored | |
591 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length | |
592 | |
1333 | 593 //the following checks prevent overflows and infinite loops |
594 if(packet_length >= (1U<<29)){ | |
595 av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, url_ftell(pb)); | |
1713 | 596 return -1; |
1333 | 597 } |
1715 | 598 if(padsize >= packet_length){ |
1333 | 599 av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, url_ftell(pb)); |
1713 | 600 return -1; |
1333 | 601 } |
602 | |
0 | 603 asf->packet_timestamp = get_le32(pb); |
604 get_le16(pb); /* duration */ | |
605 // rsize has at least 11 bytes which have to be present | |
606 | |
607 if (asf->packet_flags & 0x01) { | |
887 | 608 asf->packet_segsizetype = get_byte(pb); rsize++; |
0 | 609 asf->packet_segments = asf->packet_segsizetype & 0x3f; |
610 } else { | |
887 | 611 asf->packet_segments = 1; |
0 | 612 asf->packet_segsizetype = 0x80; |
613 } | |
614 asf->packet_size_left = packet_length - padsize - rsize; | |
615 if (packet_length < asf->hdr.min_pktsize) | |
616 padsize += asf->hdr.min_pktsize - packet_length; | |
617 asf->packet_padsize = padsize; | |
618 #ifdef DEBUG | |
619 printf("packet: size=%d padsize=%d left=%d\n", asf->packet_size, asf->packet_padsize, asf->packet_size_left); | |
620 #endif | |
621 return 0; | |
622 } | |
623 | |
1708 | 624 /** |
625 * | |
626 * @return <0 if error | |
627 */ | |
628 static int asf_read_frame_header(AVFormatContext *s){ | |
629 ASFContext *asf = s->priv_data; | |
630 ByteIOContext *pb = &s->pb; | |
631 int rsize = 1; | |
632 int num = get_byte(pb); | |
1776 | 633 int64_t ts0, ts1; |
1708 | 634 |
635 asf->packet_segments--; | |
636 asf->packet_key_frame = num >> 7; | |
637 asf->stream_index = asf->asfid2avid[num & 0x7f]; | |
638 // sequence should be ignored! | |
639 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); | |
640 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); | |
641 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); | |
642 //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); | |
643 if (asf->packet_replic_size >= 8) { | |
644 asf->packet_obj_size = get_le32(pb); | |
645 if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ | |
646 av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); | |
647 return -1; | |
648 } | |
649 asf->packet_frag_timestamp = get_le32(pb); // timestamp | |
1776 | 650 if(asf->packet_replic_size >= 8+38+4){ |
651 // for(i=0; i<asf->packet_replic_size-8; i++) | |
652 // av_log(s, AV_LOG_DEBUG, "%02X ",get_byte(pb)); | |
653 // av_log(s, AV_LOG_DEBUG, "\n"); | |
654 url_fskip(pb, 10); | |
655 ts0= get_le64(pb); | |
656 ts1= get_le64(pb); | |
657 url_fskip(pb, 12); | |
658 get_le32(pb); | |
659 url_fskip(pb, asf->packet_replic_size - 8 - 38 - 4); | |
660 if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000; | |
661 else asf->packet_frag_timestamp= AV_NOPTS_VALUE; | |
662 }else | |
663 url_fskip(pb, asf->packet_replic_size - 8); | |
1708 | 664 rsize += asf->packet_replic_size; // FIXME - check validity |
665 } else if (asf->packet_replic_size==1){ | |
666 // multipacket - frag_offset is begining timestamp | |
667 asf->packet_time_start = asf->packet_frag_offset; | |
668 asf->packet_frag_offset = 0; | |
669 asf->packet_frag_timestamp = asf->packet_timestamp; | |
670 | |
671 asf->packet_time_delta = get_byte(pb); | |
672 rsize++; | |
673 }else if(asf->packet_replic_size!=0){ | |
674 av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); | |
675 return -1; | |
676 } | |
677 if (asf->packet_flags & 0x01) { | |
678 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal | |
1712 | 679 if(asf->packet_frag_size > asf->packet_size_left - rsize){ |
680 av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid\n"); | |
681 return -1; | |
682 } | |
1708 | 683 //printf("Fragsize %d\n", asf->packet_frag_size); |
684 } else { | |
685 asf->packet_frag_size = asf->packet_size_left - rsize; | |
686 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize); | |
687 } | |
688 if (asf->packet_replic_size == 1) { | |
689 asf->packet_multi_size = asf->packet_frag_size; | |
690 if (asf->packet_multi_size > asf->packet_size_left) | |
691 return -1; | |
692 } | |
693 asf->packet_size_left -= rsize; | |
694 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); | |
695 | |
696 return 0; | |
697 } | |
698 | |
0 | 699 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) |
700 { | |
701 ASFContext *asf = s->priv_data; | |
702 ASFStream *asf_st = 0; | |
703 ByteIOContext *pb = &s->pb; | |
704 //static int pc = 0; | |
705 for (;;) { | |
1713 | 706 if(url_feof(pb)) |
707 return AVERROR_IO; | |
887 | 708 if (asf->packet_size_left < FRAME_HEADER_SIZE |
709 || asf->packet_segments < 1) { | |
710 //asf->packet_size_left <= asf->packet_padsize) { | |
711 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
|
712 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); |
1333 | 713 assert(ret>=0); |
887 | 714 /* fail safe */ |
715 url_fskip(pb, ret); | |
1707
7e12a19c140f
more correct packet alignment check and correction
michael
parents:
1706
diff
changeset
|
716 |
349 | 717 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
|
718 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
|
719 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) |
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
720 return AVERROR_IO; /* Do not exceed the size of the data object */ |
887 | 721 ret = asf_get_packet(s); |
722 //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++); | |
1713 | 723 if (ret < 0) |
724 assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); | |
0 | 725 asf->packet_time_start = 0; |
726 continue; | |
887 | 727 } |
728 if (asf->packet_time_start == 0) { | |
1708 | 729 if(asf_read_frame_header(s) < 0){ |
730 asf->packet_segments= 0; | |
1696 | 731 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
|
732 } |
887 | 733 if (asf->stream_index < 0 |
708 | 734 || s->streams[asf->stream_index]->discard >= AVDISCARD_ALL |
735 || (!asf->packet_key_frame && s->streams[asf->stream_index]->discard >= AVDISCARD_NONKEY) | |
736 ) { | |
0 | 737 asf->packet_time_start = 0; |
887 | 738 /* unhandled packet (should not happen) */ |
739 url_fskip(pb, asf->packet_frag_size); | |
740 asf->packet_size_left -= asf->packet_frag_size; | |
652 | 741 if(asf->stream_index < 0) |
1708 | 742 av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size); |
0 | 743 continue; |
887 | 744 } |
745 asf->asf_st = s->streams[asf->stream_index]->priv_data; | |
746 } | |
747 asf_st = asf->asf_st; | |
0 | 748 |
887 | 749 if (asf->packet_replic_size == 1) { |
750 // frag_offset is here used as the begining timestamp | |
751 asf->packet_frag_timestamp = asf->packet_time_start; | |
752 asf->packet_time_start += asf->packet_time_delta; | |
753 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb); | |
754 asf->packet_size_left--; | |
0 | 755 asf->packet_multi_size--; |
887 | 756 if (asf->packet_multi_size < asf->packet_obj_size) |
757 { | |
758 asf->packet_time_start = 0; | |
759 url_fskip(pb, asf->packet_multi_size); | |
760 asf->packet_size_left -= asf->packet_multi_size; | |
0 | 761 continue; |
887 | 762 } |
763 asf->packet_multi_size -= asf->packet_obj_size; | |
764 //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); | |
765 } | |
1744 | 766 if ( asf_st->pkt.size != asf->packet_obj_size |
767 || 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
|
768 if(asf_st->pkt.data){ |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
769 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
|
770 asf_st->frag_offset = 0; |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
771 av_free_packet(&asf_st->pkt); |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
772 } |
887 | 773 /* new packet */ |
774 av_new_packet(&asf_st->pkt, asf->packet_obj_size); | |
775 asf_st->seq = asf->packet_seq; | |
776 asf_st->pkt.pts = asf->packet_frag_timestamp; | |
777 asf_st->pkt.stream_index = asf->stream_index; | |
885 | 778 asf_st->pkt.pos = |
779 asf_st->packet_pos= asf->packet_pos; | |
780 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", | |
349 | 781 //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
|
782 //s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size); |
887 | 783 if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO) |
784 asf->packet_key_frame = 1; | |
785 if (asf->packet_key_frame) | |
786 asf_st->pkt.flags |= PKT_FLAG_KEY; | |
787 } | |
0 | 788 |
887 | 789 /* read data */ |
790 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", | |
791 // asf->packet_size, asf_st->pkt.size, asf->packet_frag_offset, | |
792 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data); | |
793 asf->packet_size_left -= asf->packet_frag_size; | |
794 if (asf->packet_size_left < 0) | |
0 | 795 continue; |
1709 | 796 |
797 if( asf->packet_frag_offset >= asf_st->pkt.size | |
798 || asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset){ | |
799 av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n", | |
800 asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size); | |
801 continue; | |
802 } | |
803 | |
887 | 804 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, |
805 asf->packet_frag_size); | |
806 asf_st->frag_offset += asf->packet_frag_size; | |
807 /* test if whole packet is read */ | |
808 if (asf_st->frag_offset == asf_st->pkt.size) { | |
809 /* return packet */ | |
810 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
|
811 if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span){ |
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
812 av_log(s, AV_LOG_ERROR, "pkt.size != ds_packet_size * ds_span\n"); |
77bd711c0aed
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
michael
parents:
1699
diff
changeset
|
813 }else{ |
887 | 814 /* packet descrambling */ |
1332 | 815 uint8_t *newdata = av_malloc(asf_st->pkt.size); |
887 | 816 if (newdata) { |
817 int offset = 0; | |
818 while (offset < asf_st->pkt.size) { | |
819 int off = offset / asf_st->ds_chunk_size; | |
820 int row = off / asf_st->ds_span; | |
821 int col = off % asf_st->ds_span; | |
822 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; | |
823 //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
|
824 |
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 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
|
826 assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size); |
887 | 827 memcpy(newdata + offset, |
828 asf_st->pkt.data + idx * asf_st->ds_chunk_size, | |
829 asf_st->ds_chunk_size); | |
830 offset += asf_st->ds_chunk_size; | |
831 } | |
832 av_free(asf_st->pkt.data); | |
833 asf_st->pkt.data = newdata; | |
834 } | |
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
|
835 } |
887 | 836 } |
837 asf_st->frag_offset = 0; | |
1699 | 838 *pkt= asf_st->pkt; |
887 | 839 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size); |
840 asf_st->pkt.size = 0; | |
841 asf_st->pkt.data = 0; | |
842 break; // packet completed | |
843 } | |
0 | 844 } |
845 return 0; | |
846 } | |
847 | |
848 static int asf_read_close(AVFormatContext *s) | |
849 { | |
850 int i; | |
851 | |
852 for(i=0;i<s->nb_streams;i++) { | |
887 | 853 AVStream *st = s->streams[i]; |
854 av_free(st->priv_data); | |
1711 | 855 av_free(st->codec->palctrl); |
0 | 856 } |
857 return 0; | |
858 } | |
859 | |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
860 // 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
|
861 // 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
|
862 // 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
|
863 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
|
864 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
865 ASFContext *asf = s->priv_data; |
349 | 866 ASFStream *asf_st; |
867 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
|
868 |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
869 asf->packet_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
|
870 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
|
871 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
|
872 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
|
873 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
|
874 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
|
875 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
|
876 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
|
877 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
|
878 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
|
879 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
|
880 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
|
881 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
|
882 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
|
883 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
|
884 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
|
885 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
|
886 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
|
887 asf->packet_time_start = 0; |
885 | 888 |
349 | 889 for(i=0; i<s->nb_streams; i++){ |
890 asf_st= s->streams[i]->priv_data; | |
891 av_free_packet(&asf_st->pkt); | |
892 asf_st->frag_offset=0; | |
893 asf_st->seq=0; | |
894 } | |
895 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
|
896 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
897 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
898 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
|
899 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
900 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
|
901 AVPacket pkt1, *pkt = &pkt1; |
349 | 902 ASFStream *asf_st; |
903 int64_t pts; | |
348 | 904 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
|
905 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
|
906 int64_t start_pos[s->nb_streams]; |
885 | 907 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
908 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
|
909 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
|
910 } |
885 | 911 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
912 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
|
913 *ppos= pos; |
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
914 url_fseek(&s->pb, pos, SEEK_SET); |
885 | 915 |
349 | 916 //printf("asf_read_pts\n"); |
917 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
|
918 for(;;){ |
349 | 919 if (av_read_frame(s, pkt) < 0){ |
1714 | 920 av_log(s, AV_LOG_INFO, "asf_read_pts failed\n"); |
887 | 921 return AV_NOPTS_VALUE; |
349 | 922 } |
885 | 923 |
991 | 924 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
|
925 |
348 | 926 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
|
927 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
|
928 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
|
929 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
930 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
|
931 |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
932 // 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
|
933 pos= asf_st->packet_pos; |
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
934 |
1266 | 935 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
|
936 start_pos[i]= asf_st->packet_pos + 1; |
885 | 937 |
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 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
|
939 break; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
940 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
941 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
942 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
943 *ppos= pos; |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
944 //printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts); |
348 | 945 |
946 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
|
947 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
948 |
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
|
949 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
|
950 { |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
951 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
|
952 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
|
953 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
|
954 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
|
955 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
|
956 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
|
957 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
958 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
|
959 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
960 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
|
961 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
|
962 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
|
963 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
|
964 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
|
965 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
|
966 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
|
967 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
|
968 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
|
969 |
613fdf995af0
read and use index (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 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
|
971 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
|
972 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
|
973 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
|
974 |
613fdf995af0
read and use index (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 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
|
976 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
|
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 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
|
979 } |
1266 | 980 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
|
981 } |
613fdf995af0
read and use index (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 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
|
983 } |
613fdf995af0
read and use index (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 |
555 | 985 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) |
0 | 986 { |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
987 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
|
988 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
|
989 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
|
990 int index; |
885 | 991 |
350 | 992 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
|
993 return -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
994 |
1266 | 995 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
|
996 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
|
997 |
1266 | 998 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
|
999 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
|
1000 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
|
1001 }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
|
1002 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
|
1003 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
|
1004 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
|
1005 |
613fdf995af0
read and use index (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 /* 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
|
1007 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
|
1008 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
|
1009 |
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
|
1010 // 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
|
1011 // 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
|
1012 // 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
|
1013 // 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
|
1014 // 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
|
1015 // 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
|
1016 // 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
|
1017 // 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
|
1018 // 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
|
1019 // } |
613fdf995af0
read and use index (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 // 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
|
1021 // 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
|
1022 // |
613fdf995af0
read and use index (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 (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
|
1024 // 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
|
1025 // 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
|
1026 // } |
613fdf995af0
read and use index (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 // |
613fdf995af0
read and use index (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 // 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
|
1029 // } |
613fdf995af0
read and use index (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 |
613fdf995af0
read and use index (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 /* do the seek */ |
1388
3172bf94c066
Use proper PRI?64 macros for %ll? format to fix printf format warnings:
rathann
parents:
1358
diff
changeset
|
1032 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
|
1033 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
|
1034 } |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1035 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
|
1036 return 0; |
0 | 1037 } |
1038 | |
1169 | 1039 AVInputFormat asf_demuxer = { |
0 | 1040 "asf", |
1041 "asf format", | |
1042 sizeof(ASFContext), | |
1043 asf_probe, | |
1044 asf_read_header, | |
1045 asf_read_packet, | |
1046 asf_read_close, | |
1047 asf_read_seek, | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
1048 asf_read_pts, |
0 | 1049 }; |