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