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