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