Mercurial > libavformat.hg
annotate asfdec.c @ 5707:a97d8df3be2b libavformat
asfdec: add a debug message about skipped tags.
Patch from Anton Khirnov wyskas gmail
author | benoit |
---|---|
date | Wed, 24 Feb 2010 07:33:18 +0000 |
parents | 85900cc2695d |
children | f096d96c7e5c |
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 |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4167
diff
changeset
|
3 * Copyright (c) 2000, 2001 Fabrice Bellard |
0 | 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 |
4954
2a4f618b2da3
move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents:
4924
diff
changeset
|
22 //#define DEBUG |
2a4f618b2da3
move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents:
4924
diff
changeset
|
23 |
3286 | 24 #include "libavutil/common.h" |
4924 | 25 #include "libavutil/avstring.h" |
3286 | 26 #include "libavcodec/mpegaudio.h" |
0 | 27 #include "avformat.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
28 #include "riff.h" |
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
29 #include "asf.h" |
2652 | 30 #include "asfcrypt.h" |
4924 | 31 #include "avlanguage.h" |
0 | 32 |
4058 | 33 void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format); |
2708
046577e618bd
Allow propagation of stream selection through the ASF demuxer to the
benoit
parents:
2652
diff
changeset
|
34 |
348 | 35 #undef NDEBUG |
36 #include <assert.h> | |
37 | |
373
e47d9c8e2054
asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
372
diff
changeset
|
38 #define FRAME_HEADER_SIZE 17 |
885 | 39 // 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
|
40 |
4748
86dd0cab30d3
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents:
4747
diff
changeset
|
41 static const ff_asf_guid index_guid = { |
1687 | 42 0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb |
0 | 43 }; |
44 | |
4748
86dd0cab30d3
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents:
4747
diff
changeset
|
45 static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */ |
1806
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
46 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
|
47 }; |
0 | 48 /**********************************/ |
49 /* decoding */ | |
50 | |
4954
2a4f618b2da3
move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents:
4924
diff
changeset
|
51 static int guidcmp(const void *g1, const void *g2) |
2a4f618b2da3
move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents:
4924
diff
changeset
|
52 { |
2a4f618b2da3
move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents:
4924
diff
changeset
|
53 return memcmp(g1, g2, sizeof(ff_asf_guid)); |
2a4f618b2da3
move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
bcoudurier
parents:
4924
diff
changeset
|
54 } |
0 | 55 |
56 #ifdef DEBUG | |
69 | 57 #define PRINT_IF_GUID(g,cmp) \ |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
58 if (!guidcmp(g, &cmp)) \ |
3578 | 59 dprintf(NULL, "(GUID: %s) ", #cmp) |
69 | 60 |
4748
86dd0cab30d3
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents:
4747
diff
changeset
|
61 static void print_guid(const ff_asf_guid *g) |
0 | 62 { |
63 int i; | |
4593
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
64 PRINT_IF_GUID(g, ff_asf_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
65 else PRINT_IF_GUID(g, ff_asf_file_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
66 else PRINT_IF_GUID(g, ff_asf_stream_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
67 else PRINT_IF_GUID(g, ff_asf_audio_stream); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
68 else PRINT_IF_GUID(g, ff_asf_audio_conceal_none); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
69 else PRINT_IF_GUID(g, ff_asf_video_stream); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
70 else PRINT_IF_GUID(g, ff_asf_video_conceal_none); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
71 else PRINT_IF_GUID(g, ff_asf_command_stream); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
72 else PRINT_IF_GUID(g, ff_asf_comment_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
73 else PRINT_IF_GUID(g, ff_asf_codec_comment_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
74 else PRINT_IF_GUID(g, ff_asf_codec_comment1_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
75 else PRINT_IF_GUID(g, ff_asf_data_header); |
69 | 76 else PRINT_IF_GUID(g, index_guid); |
4593
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
77 else PRINT_IF_GUID(g, ff_asf_head1_guid); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
78 else PRINT_IF_GUID(g, ff_asf_head2_guid); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
79 else PRINT_IF_GUID(g, ff_asf_my_guid); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
80 else PRINT_IF_GUID(g, ff_asf_ext_stream_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
81 else PRINT_IF_GUID(g, ff_asf_extended_content_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
82 else PRINT_IF_GUID(g, ff_asf_ext_stream_embed_stream_header); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
83 else PRINT_IF_GUID(g, ff_asf_ext_stream_audio_stream); |
0d8b36d98ce2
move static tables from asf.h to non-static tables in asf.c
aurel
parents:
4592
diff
changeset
|
84 else PRINT_IF_GUID(g, ff_asf_metadata_header); |
1806
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
85 else PRINT_IF_GUID(g, stream_bitrate_guid); |
4924 | 86 else PRINT_IF_GUID(g, ff_asf_language_guid); |
69 | 87 else |
3578 | 88 dprintf(NULL, "(GUID: unknown) "); |
1687 | 89 for(i=0;i<16;i++) |
3578 | 90 dprintf(NULL, " 0x%02x,", (*g)[i]); |
91 dprintf(NULL, "}\n"); | |
0 | 92 } |
949 | 93 #undef PRINT_IF_GUID |
3578 | 94 #else |
95 #define print_guid(g) | |
0 | 96 #endif |
97 | |
4748
86dd0cab30d3
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents:
4747
diff
changeset
|
98 static void get_guid(ByteIOContext *s, ff_asf_guid *g) |
0 | 99 { |
1687 | 100 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
|
101 get_buffer(s, *g, sizeof(*g)); |
0 | 102 } |
103 | |
104 #if 0 | |
105 static void get_str16(ByteIOContext *pb, char *buf, int buf_size) | |
106 { | |
107 int len, c; | |
108 char *q; | |
109 | |
110 len = get_le16(pb); | |
111 q = buf; | |
112 while (len > 0) { | |
113 c = get_le16(pb); | |
114 if ((q - buf) < buf_size - 1) | |
115 *q++ = c; | |
116 len--; | |
117 } | |
118 *q = '\0'; | |
119 } | |
120 #endif | |
121 | |
122 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) | |
123 { | |
1503 | 124 char* q = buf; |
4955 | 125 for (; len > 1; len -= 2) { |
1503 | 126 uint8_t tmp; |
127 PUT_UTF8(get_le16(pb), tmp, if (q - buf < buf_size - 1) *q++ = tmp;) | |
0 | 128 } |
4955 | 129 if (len > 0) |
130 url_fskip(pb, len); | |
0 | 131 *q = '\0'; |
132 } | |
133 | |
134 static int asf_probe(AVProbeData *pd) | |
135 { | |
136 /* check file header */ | |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
137 if (!guidcmp(pd->buf, &ff_asf_header)) |
0 | 138 return AVPROBE_SCORE_MAX; |
139 else | |
140 return 0; | |
141 } | |
142 | |
1750 | 143 static int get_value(ByteIOContext *pb, int type){ |
144 switch(type){ | |
145 case 2: return get_le32(pb); | |
146 case 3: return get_le32(pb); | |
147 case 4: return get_le64(pb); | |
148 case 5: return get_le16(pb); | |
149 default:return INT_MIN; | |
150 } | |
151 } | |
152 | |
4368 | 153 static void get_tag(AVFormatContext *s, const char *key, int type, int len) |
154 { | |
5446
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
155 char *value; |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
156 |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
157 if ((unsigned)len >= UINT_MAX) |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
158 return; |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
159 |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
160 value = av_malloc(len+1); |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
161 if (!value) |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
162 return; |
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
163 |
4368 | 164 if (type <= 1) { // unicode or byte |
5446
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
165 get_str16_nolen(s->pb, len, value, len); |
4368 | 166 } else if (type <= 5) { // boolean or DWORD or QWORD or WORD |
167 uint64_t num = get_value(s->pb, type); | |
5446
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
168 snprintf(value, len, "%"PRIu64, num); |
4368 | 169 } else { |
170 url_fskip(s->pb, len); | |
5706 | 171 av_freep(&value); |
5707 | 172 av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key); |
4368 | 173 return; |
174 } | |
4797
9145790397e6
Don't strip the first three characters off of any metadata in ASF file.
rbultje
parents:
4748
diff
changeset
|
175 if (!strncmp(key, "WM/", 3)) |
4368 | 176 key += 3; |
5446
4211f91f69b1
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents:
5273
diff
changeset
|
177 av_metadata_set2(&s->metadata, key, value, AV_METADATA_DONT_STRDUP_VAL); |
4368 | 178 } |
179 | |
0 | 180 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) |
181 { | |
182 ASFContext *asf = s->priv_data; | |
4748
86dd0cab30d3
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents:
4747
diff
changeset
|
183 ff_asf_guid g; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
184 ByteIOContext *pb = s->pb; |
0 | 185 AVStream *st; |
186 ASFStream *asf_st; | |
187 int size, i; | |
65 | 188 int64_t gsize; |
1750 | 189 AVRational dar[128]; |
2064 | 190 uint32_t bitrate[128]; |
1750 | 191 |
192 memset(dar, 0, sizeof(dar)); | |
2064 | 193 memset(bitrate, 0, sizeof(bitrate)); |
0 | 194 |
195 get_guid(pb, &g); | |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
196 if (guidcmp(&g, &ff_asf_header)) |
3486 | 197 return -1; |
0 | 198 get_le64(pb); |
199 get_le32(pb); | |
200 get_byte(pb); | |
201 get_byte(pb); | |
202 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); | |
203 for(;;) { | |
204 get_guid(pb, &g); | |
205 gsize = get_le64(pb); | |
3578 | 206 dprintf(s, "%08"PRIx64": ", url_ftell(pb) - 24); |
0 | 207 print_guid(&g); |
3578 | 208 dprintf(s, " size=0x%"PRIx64"\n", gsize); |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
209 if (!guidcmp(&g, &ff_asf_data_header)) { |
1896
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
210 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
|
211 // 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
|
212 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
|
213 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
|
214 } else { |
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
215 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
|
216 } |
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
217 break; |
6d2157d1fc93
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
michael
parents:
1859
diff
changeset
|
218 } |
0 | 219 if (gsize < 24) |
3486 | 220 return -1; |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
221 if (!guidcmp(&g, &ff_asf_file_header)) { |
0 | 222 get_guid(pb, &asf->hdr.guid); |
887 | 223 asf->hdr.file_size = get_le64(pb); |
224 asf->hdr.create_time = get_le64(pb); | |
1701 | 225 asf->nb_packets = get_le64(pb); |
3239 | 226 asf->hdr.play_time = get_le64(pb); |
887 | 227 asf->hdr.send_time = get_le64(pb); |
228 asf->hdr.preroll = get_le32(pb); | |
229 asf->hdr.ignore = get_le32(pb); | |
230 asf->hdr.flags = get_le32(pb); | |
231 asf->hdr.min_pktsize = get_le32(pb); | |
232 asf->hdr.max_pktsize = get_le32(pb); | |
233 asf->hdr.max_bitrate = get_le32(pb); | |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
234 s->packet_size = asf->hdr.max_pktsize; |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
235 } else if (!guidcmp(&g, &ff_asf_stream_header)) { |
3967 | 236 enum CodecType type; |
237 int type_specific_size, sizeX; | |
1263
cf88f6719743
total_size should be 64bit (1 hunk of the asf seeking patch from DrDivx / Steve Lhomme)
michael
parents:
1206
diff
changeset
|
238 uint64_t total_size; |
0 | 239 unsigned int tag1; |
2318
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
240 int64_t pos1, pos2, start_time; |
2018 | 241 int test_for_ext_stream_audio, is_dvr_ms_audio=0; |
0 | 242 |
243 pos1 = url_ftell(pb); | |
244 | |
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
245 st = av_new_stream(s, 0); |
0 | 246 if (!st) |
3486 | 247 return AVERROR(ENOMEM); |
462
b69898ffc92a
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents:
437
diff
changeset
|
248 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ |
0 | 249 asf_st = av_mallocz(sizeof(ASFStream)); |
250 if (!asf_st) | |
3486 | 251 return AVERROR(ENOMEM); |
0 | 252 st->priv_data = asf_st; |
2318
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
253 start_time = asf->hdr.preroll; |
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
254 |
4924 | 255 asf_st->stream_language_index = 128; // invalid stream index means no language info |
256 | |
1552 | 257 if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming... |
5153
3fe89226cacf
Fix incorrect display of ASF/WMV duration after r12926.
cehoyos
parents:
5109
diff
changeset
|
258 st->duration = asf->hdr.play_time / |
2318
e5c3b6e7b6ef
ignore preroll, it is generally not what AVStream.start_time should contain
michael
parents:
2285
diff
changeset
|
259 (10000000 / 1000) - start_time; |
1552 | 260 } |
0 | 261 get_guid(pb, &g); |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
262 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
263 test_for_ext_stream_audio = 0; |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
264 if (!guidcmp(&g, &ff_asf_audio_stream)) { |
0 | 265 type = CODEC_TYPE_AUDIO; |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
266 } else if (!guidcmp(&g, &ff_asf_video_stream)) { |
0 | 267 type = CODEC_TYPE_VIDEO; |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
268 } else if (!guidcmp(&g, &ff_asf_command_stream)) { |
3567 | 269 type = CODEC_TYPE_DATA; |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
270 } else if (!guidcmp(&g, &ff_asf_ext_stream_embed_stream_header)) { |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
271 test_for_ext_stream_audio = 1; |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
272 type = CODEC_TYPE_UNKNOWN; |
0 | 273 } else { |
3486 | 274 return -1; |
0 | 275 } |
276 get_guid(pb, &g); | |
277 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
|
278 type_specific_size = get_le32(pb); |
0 | 279 get_le32(pb); |
887 | 280 st->id = get_le16(pb) & 0x7f; /* stream id */ |
0 | 281 // 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
|
282 asf->asfid2avid[st->id] = s->nb_streams - 1; |
0 | 283 |
284 get_le32(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
285 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
286 if (test_for_ext_stream_audio) { |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
287 get_guid(pb, &g); |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
288 if (!guidcmp(&g, &ff_asf_ext_stream_audio_stream)) { |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
289 type = CODEC_TYPE_AUDIO; |
2018 | 290 is_dvr_ms_audio=1; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
291 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
292 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
293 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
294 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
295 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
296 get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
297 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
298 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
299 |
887 | 300 st->codec->codec_type = type; |
0 | 301 if (type == CODEC_TYPE_AUDIO) { |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5011
diff
changeset
|
302 ff_get_wav_header(pb, st->codec, type_specific_size); |
2018 | 303 if (is_dvr_ms_audio) { |
304 // codec_id and codec_tag are unreliable in dvr_ms | |
305 // files. Set them later by probing stream. | |
3568 | 306 st->codec->codec_id = CODEC_ID_PROBE; |
2018 | 307 st->codec->codec_tag = 0; |
308 } | |
4545 | 309 if (st->codec->codec_id == CODEC_ID_AAC) { |
310 st->need_parsing = AVSTREAM_PARSE_NONE; | |
311 } else { | |
4546 | 312 st->need_parsing = AVSTREAM_PARSE_FULL; |
4545 | 313 } |
887 | 314 /* We have to init the frame size at some point .... */ |
315 pos2 = url_ftell(pb); | |
1859 | 316 if (gsize >= (pos2 + 8 - pos1 + 24)) { |
887 | 317 asf_st->ds_span = get_byte(pb); |
318 asf_st->ds_packet_size = get_le16(pb); | |
319 asf_st->ds_chunk_size = get_le16(pb); | |
1701 | 320 get_le16(pb); //ds_data_size |
321 get_byte(pb); //ds_silence_data | |
887 | 322 } |
323 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", | |
324 // asf_st->ds_packet_size, asf_st->ds_chunk_size, | |
325 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); | |
326 if (asf_st->ds_span > 1) { | |
327 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
|
328 || (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
|
329 || asf_st->ds_packet_size % asf_st->ds_chunk_size) |
887 | 330 asf_st->ds_span = 0; // disable descrambling |
331 } | |
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 switch (st->codec->codec_id) { |
232 | 333 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
|
334 st->codec->frame_size = MPA_FRAME_SIZE; |
0 | 335 break; |
336 case CODEC_ID_PCM_S16LE: | |
337 case CODEC_ID_PCM_S16BE: | |
338 case CODEC_ID_PCM_U16LE: | |
339 case CODEC_ID_PCM_U16BE: | |
340 case CODEC_ID_PCM_S8: | |
341 case CODEC_ID_PCM_U8: | |
342 case CODEC_ID_PCM_ALAW: | |
343 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
|
344 st->codec->frame_size = 1; |
0 | 345 break; |
346 default: | |
347 /* 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
|
348 st->codec->frame_size = 1; |
0 | 349 break; |
350 } | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
351 } else if (type == CODEC_TYPE_VIDEO) { |
887 | 352 get_le32(pb); |
0 | 353 get_le32(pb); |
354 get_byte(pb); | |
355 size = get_le16(pb); /* size */ | |
732 | 356 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
|
357 st->codec->width = get_le32(pb); |
887 | 358 st->codec->height = get_le32(pb); |
0 | 359 /* not available for asf */ |
360 get_le16(pb); /* panes */ | |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3759
diff
changeset
|
361 st->codec->bits_per_coded_sample = get_le16(pb); /* depth */ |
0 | 362 tag1 = get_le32(pb); |
887 | 363 url_fskip(pb, 20); |
4508 | 364 // av_log(s, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX); |
732 | 365 size= sizeX; |
887 | 366 if (size > 40) { |
367 st->codec->extradata_size = size - 40; | |
368 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
369 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); | |
370 } | |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
371 |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
372 /* Extract palette from extradata if bpp <= 8 */ |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
373 /* This code assumes that extradata contains only palette */ |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
374 /* This is true for all paletted codecs implemented in ffmpeg */ |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
375 if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
376 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); |
5108 | 377 #if HAVE_BIGENDIAN |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
378 for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
379 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
|
380 #else |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
381 memcpy(st->codec->palctrl->palette, st->codec->extradata, |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
382 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
383 #endif |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
384 st->codec->palctrl->palette_changed = 1; |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
385 } |
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
386 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
792
diff
changeset
|
387 st->codec->codec_tag = tag1; |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5011
diff
changeset
|
388 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); |
573 | 389 if(tag1 == MKTAG('D', 'V', 'R', ' ')) |
2023 | 390 st->need_parsing = AVSTREAM_PARSE_FULL; |
0 | 391 } |
392 pos2 = url_ftell(pb); | |
393 url_fskip(pb, gsize - (pos2 - pos1 + 24)); | |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
394 } else if (!guidcmp(&g, &ff_asf_comment_header)) { |
0 | 395 int len1, len2, len3, len4, len5; |
396 | |
397 len1 = get_le16(pb); | |
398 len2 = get_le16(pb); | |
399 len3 = get_le16(pb); | |
400 len4 = get_le16(pb); | |
401 len5 = get_le16(pb); | |
4368 | 402 get_tag(s, "title" , 0, len1); |
403 get_tag(s, "author" , 0, len2); | |
404 get_tag(s, "copyright", 0, len3); | |
405 get_tag(s, "comment" , 0, len4); | |
887 | 406 url_fskip(pb, len5); |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
407 } else if (!guidcmp(&g, &stream_bitrate_guid)) { |
1806
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
408 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
|
409 int j; |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
410 |
4508 | 411 // av_log(s, AV_LOG_ERROR, "stream bitrate properties\n"); |
412 // av_log(s, AV_LOG_ERROR, "streams %d\n", streams); | |
1806
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
413 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
|
414 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
|
415 |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
416 flags= get_le16(pb); |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
417 bitrate= get_le32(pb); |
bf6a0dd6d7be
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
takis
parents:
1776
diff
changeset
|
418 stream_id= (flags & 0x7f); |
4508 | 419 // av_log(s, AV_LOG_ERROR, "flags: 0x%x stream id %d, bitrate %d\n", flags, stream_id, bitrate); |
2392 | 420 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
|
421 } |
4924 | 422 } else if (!guidcmp(&g, &ff_asf_language_guid)) { |
423 int j; | |
424 int stream_count = get_le16(pb); | |
425 for(j = 0; j < stream_count; j++) { | |
426 char lang[6]; | |
427 unsigned int lang_len = get_byte(pb); | |
428 get_str16_nolen(pb, lang_len, lang, sizeof(lang)); | |
429 if (j < 128) | |
430 av_strlcpy(asf->stream_languages[j], lang, sizeof(*asf->stream_languages)); | |
431 } | |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
432 } else if (!guidcmp(&g, &ff_asf_extended_content_header)) { |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
433 int desc_count, i; |
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
434 |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
435 desc_count = get_le16(pb); |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
436 for(i=0;i<desc_count;i++) { |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
437 int name_len,value_type,value_len; |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
438 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
|
439 |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
440 name_len = get_le16(pb); |
5658
9e6fd33adfb4
workaround for broken files created by previous versions of asfenc.
cehoyos
parents:
5467
diff
changeset
|
441 if (name_len%2) // must be even, broken lavf versions wrote len-1 |
9e6fd33adfb4
workaround for broken files created by previous versions of asfenc.
cehoyos
parents:
5467
diff
changeset
|
442 name_len += 1; |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
443 get_str16_nolen(pb, name_len, name, sizeof(name)); |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
444 value_type = get_le16(pb); |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
445 value_len = get_le16(pb); |
5705 | 446 if (!value_type && value_len%2) |
5658
9e6fd33adfb4
workaround for broken files created by previous versions of asfenc.
cehoyos
parents:
5467
diff
changeset
|
447 value_len += 1; |
4743
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
448 get_tag(s, name, value_type, value_len); |
5c65daa1c678
cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
diego
parents:
4618
diff
changeset
|
449 } |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
450 } else if (!guidcmp(&g, &ff_asf_metadata_header)) { |
1750 | 451 int n, stream_num, name_len, value_len, value_type, value_num; |
452 n = get_le16(pb); | |
453 | |
454 for(i=0;i<n;i++) { | |
455 char name[1024]; | |
456 | |
457 get_le16(pb); //lang_list_index | |
458 stream_num= get_le16(pb); | |
459 name_len= get_le16(pb); | |
460 value_type= get_le16(pb); | |
461 value_len= get_le32(pb); | |
462 | |
463 get_str16_nolen(pb, name_len, name, sizeof(name)); | |
4508 | 464 //av_log(s, AV_LOG_ERROR, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name); |
2164 | 465 value_num= get_le16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere |
1750 | 466 url_fskip(pb, value_len - 2); |
467 | |
468 if(stream_num<128){ | |
469 if (!strcmp(name, "AspectRatioX")) dar[stream_num].num= value_num; | |
470 else if(!strcmp(name, "AspectRatioY")) dar[stream_num].den= value_num; | |
471 } | |
472 } | |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
473 } else if (!guidcmp(&g, &ff_asf_ext_stream_header)) { |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
474 int ext_len, payload_ext_ct, stream_ct; |
2064 | 475 uint32_t ext_d, leak_rate, stream_num; |
4924 | 476 unsigned int stream_languageid_index; |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
477 |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
478 get_le64(pb); // starttime |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
479 get_le64(pb); // endtime |
2064 | 480 leak_rate = get_le32(pb); // leak-datarate |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
481 get_le32(pb); // bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
482 get_le32(pb); // init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
483 get_le32(pb); // alt-leak-datarate |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
484 get_le32(pb); // alt-bucket-datasize |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
485 get_le32(pb); // alt-init-bucket-fullness |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
486 get_le32(pb); // max-object-size |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
487 get_le32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved) |
2064 | 488 stream_num = get_le16(pb); // stream-num |
4924 | 489 |
490 stream_languageid_index = get_le16(pb); // stream-language-id-index | |
491 if (stream_num < 128) | |
492 asf->streams[stream_num].stream_language_index = stream_languageid_index; | |
493 | |
1740
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
494 get_le64(pb); // avg frametime in 100ns units |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
495 stream_ct = get_le16(pb); //stream-name-count |
5ebac013d792
stealing a few field names from mplayers asf demuxer
michael
parents:
1722
diff
changeset
|
496 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
|
497 |
2064 | 498 if (stream_num < 128) |
499 bitrate[stream_num] = leak_rate; | |
500 | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
501 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
|
502 get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
503 ext_len = get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
504 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
|
505 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
506 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
507 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
|
508 get_guid(pb, &g); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
509 ext_d=get_le16(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
510 ext_len=get_le32(pb); |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
511 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
|
512 } |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
513 |
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
514 // 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
|
515 // if so the next iteration will pick it up |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
516 } else if (!guidcmp(&g, &ff_asf_head1_guid)) { |
0 | 517 int v1, v2; |
518 get_guid(pb, &g); | |
519 v1 = get_le32(pb); | |
520 v2 = get_le16(pb); | |
904
5d3dc3a6bbe7
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
michael
parents:
896
diff
changeset
|
521 #if 0 |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
522 } else if (!guidcmp(&g, &ff_asf_codec_comment_header)) { |
0 | 523 int len, v1, n, num; |
524 char str[256], *q; | |
525 char tag[16]; | |
526 | |
527 get_guid(pb, &g); | |
528 print_guid(&g); | |
529 | |
530 n = get_le32(pb); | |
531 for(i=0;i<n;i++) { | |
532 num = get_le16(pb); /* stream number */ | |
533 get_str16(pb, str, sizeof(str)); | |
534 get_str16(pb, str, sizeof(str)); | |
535 len = get_le16(pb); | |
536 q = tag; | |
537 while (len > 0) { | |
538 v1 = get_byte(pb); | |
539 if ((q - tag) < sizeof(tag) - 1) | |
540 *q++ = v1; | |
541 len--; | |
542 } | |
543 *q = '\0'; | |
544 } | |
545 #endif | |
546 } else if (url_feof(pb)) { | |
3486 | 547 return -1; |
0 | 548 } else { |
5273
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
549 if (!s->keylen) { |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
550 if (!guidcmp(&g, &ff_asf_content_encryption)) { |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
551 av_log(s, AV_LOG_WARNING, "DRM protected stream detected, decoding will likely fail!\n"); |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
552 } else if (!guidcmp(&g, &ff_asf_ext_content_encryption)) { |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
553 av_log(s, AV_LOG_WARNING, "Ext DRM protected stream detected, decoding will likely fail!\n"); |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
554 } else if (!guidcmp(&g, &ff_asf_digital_signature)) { |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
555 av_log(s, AV_LOG_WARNING, "Digital signature detected, decoding will likely fail!\n"); |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
556 } |
f292b3e34823
Detect Windows Media DRM protected files and display warning if no key
cehoyos
parents:
5153
diff
changeset
|
557 } |
0 | 558 url_fseek(pb, gsize - 24, SEEK_CUR); |
559 } | |
560 } | |
561 get_guid(pb, &g); | |
562 get_le64(pb); | |
563 get_byte(pb); | |
564 get_byte(pb); | |
565 if (url_feof(pb)) | |
3486 | 566 return -1; |
0 | 567 asf->data_offset = url_ftell(pb); |
568 asf->packet_size_left = 0; | |
569 | |
1750 | 570 |
571 for(i=0; i<128; i++){ | |
572 int stream_num= asf->asfid2avid[i]; | |
2064 | 573 if(stream_num>=0){ |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
574 AVStream *st = s->streams[stream_num]; |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
575 if (!st->codec->bit_rate) |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
576 st->codec->bit_rate = bitrate[i]; |
2064 | 577 if (dar[i].num > 0 && dar[i].den > 0) |
3759
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
578 av_reduce(&st->sample_aspect_ratio.num, |
27537074f2a9
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents:
3578
diff
changeset
|
579 &st->sample_aspect_ratio.den, |
2069
42d459116315
cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
diego
parents:
2064
diff
changeset
|
580 dar[i].num, dar[i].den, INT_MAX); |
4508 | 581 //av_log(s, AV_LOG_ERROR, "dar %d:%d sar=%d:%d\n", dar[i].num, dar[i].den, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); |
4924 | 582 |
583 // copy and convert language codes to the frontend | |
584 if (asf->streams[i].stream_language_index < 128) { | |
585 const char *rfc1766 = asf->stream_languages[asf->streams[i].stream_language_index]; | |
586 if (rfc1766 && strlen(rfc1766) > 1) { | |
587 const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any | |
588 const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL); | |
589 if (iso6392) | |
590 av_metadata_set(&st->metadata, "language", iso6392); | |
591 } | |
592 } | |
1750 | 593 } |
594 } | |
595 | |
0 | 596 return 0; |
597 } | |
598 | |
599 #define DO_2BITS(bits, var, defval) \ | |
600 switch (bits & 3) \ | |
601 { \ | |
602 case 3: var = get_le32(pb); rsize += 4; break; \ | |
603 case 2: var = get_le16(pb); rsize += 2; break; \ | |
604 case 1: var = get_byte(pb); rsize++; break; \ | |
605 default: var = defval; break; \ | |
606 } | |
607 | |
5011
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
608 /** |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
609 * Load a single ASF packet into the demuxer. |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
610 * @param s demux context |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
611 * @param pb context to read data from |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
612 * @returns 0 on success, <0 on error |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
613 */ |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
614 static int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb) |
0 | 615 { |
616 ASFContext *asf = s->priv_data; | |
617 uint32_t packet_length, padsize; | |
1967 | 618 int rsize = 8; |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
619 int c, d, e, off; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
620 |
5085
878651429ae5
Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents:
5067
diff
changeset
|
621 // if we do not know packet size, allow skipping up to 32 kB |
878651429ae5
Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents:
5067
diff
changeset
|
622 off= 32768; |
878651429ae5
Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents:
5067
diff
changeset
|
623 if (s->packet_size > 0) |
5086 | 624 off= (url_ftell(pb) - s->data_offset) % s->packet_size + 3; |
885 | 625 |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
626 c=d=e=-1; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
627 while(off-- > 0){ |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
628 c=d; d=e; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
629 e= get_byte(pb); |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
630 if(c == 0x82 && !d && !e) |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
631 break; |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
632 } |
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
633 |
0 | 634 if (c != 0x82) { |
5109
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
635 /** |
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
636 * This code allows handling of -EAGAIN at packet boundaries (i.e. |
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
637 * if the packet sync code above triggers -EAGAIN). This does not |
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
638 * imply complete -EAGAIN handling support at random positions in |
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
639 * the stream. |
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
640 */ |
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
641 if (url_ferror(pb) == AVERROR(EAGAIN)) |
293c03f0d47f
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
rbultje
parents:
5108
diff
changeset
|
642 return AVERROR(EAGAIN); |
0 | 643 if (!url_feof(pb)) |
887 | 644 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, url_ftell(pb)); |
0 | 645 } |
1967 | 646 if ((c & 0x8f) == 0x82) { |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
647 if (d || e) { |
0 | 648 if (!url_feof(pb)) |
887 | 649 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); |
1716 | 650 return -1; |
887 | 651 } |
1967 | 652 c= get_byte(pb); |
1722
cb0dc6abf4d1
make the asf demuxer resistant against insertion/deletion errors
michael
parents:
1716
diff
changeset
|
653 d= get_byte(pb); |
1967 | 654 rsize+=3; |
655 }else{ | |
656 url_fseek(pb, -1, SEEK_CUR); //FIXME | |
0 | 657 } |
658 | |
1967 | 659 asf->packet_flags = c; |
660 asf->packet_property = d; | |
0 | 661 |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
662 DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size); |
0 | 663 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored |
664 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length | |
665 | |
1333 | 666 //the following checks prevent overflows and infinite loops |
5094
7d589bcd9b1f
Check for packet_length 0, it is already treated as invalid by the padding check,
reimar
parents:
5086
diff
changeset
|
667 if(!packet_length || packet_length >= (1U<<29)){ |
1333 | 668 av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, url_ftell(pb)); |
1713 | 669 return -1; |
1333 | 670 } |
1715 | 671 if(padsize >= packet_length){ |
1333 | 672 av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, url_ftell(pb)); |
1713 | 673 return -1; |
1333 | 674 } |
675 | |
0 | 676 asf->packet_timestamp = get_le32(pb); |
677 get_le16(pb); /* duration */ | |
678 // rsize has at least 11 bytes which have to be present | |
679 | |
680 if (asf->packet_flags & 0x01) { | |
887 | 681 asf->packet_segsizetype = get_byte(pb); rsize++; |
0 | 682 asf->packet_segments = asf->packet_segsizetype & 0x3f; |
683 } else { | |
887 | 684 asf->packet_segments = 1; |
0 | 685 asf->packet_segsizetype = 0x80; |
686 } | |
687 asf->packet_size_left = packet_length - padsize - rsize; | |
688 if (packet_length < asf->hdr.min_pktsize) | |
689 padsize += asf->hdr.min_pktsize - packet_length; | |
690 asf->packet_padsize = padsize; | |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
691 dprintf(s, "packet: size=%d padsize=%d left=%d\n", s->packet_size, asf->packet_padsize, asf->packet_size_left); |
0 | 692 return 0; |
693 } | |
694 | |
1708 | 695 /** |
696 * | |
697 * @return <0 if error | |
698 */ | |
4120
a22587bda6cf
Add a ByteIOContext argument to ASF functions that will be shared with the
rbultje
parents:
4095
diff
changeset
|
699 static int asf_read_frame_header(AVFormatContext *s, ByteIOContext *pb){ |
1708 | 700 ASFContext *asf = s->priv_data; |
701 int rsize = 1; | |
702 int num = get_byte(pb); | |
1776 | 703 int64_t ts0, ts1; |
1708 | 704 |
705 asf->packet_segments--; | |
706 asf->packet_key_frame = num >> 7; | |
707 asf->stream_index = asf->asfid2avid[num & 0x7f]; | |
708 // sequence should be ignored! | |
709 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); | |
710 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); | |
711 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); | |
712 //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); | |
713 if (asf->packet_replic_size >= 8) { | |
714 asf->packet_obj_size = get_le32(pb); | |
715 if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ | |
716 av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); | |
717 return -1; | |
718 } | |
719 asf->packet_frag_timestamp = get_le32(pb); // timestamp | |
1776 | 720 if(asf->packet_replic_size >= 8+38+4){ |
721 // for(i=0; i<asf->packet_replic_size-8; i++) | |
722 // av_log(s, AV_LOG_DEBUG, "%02X ",get_byte(pb)); | |
723 // av_log(s, AV_LOG_DEBUG, "\n"); | |
724 url_fskip(pb, 10); | |
725 ts0= get_le64(pb); | |
726 ts1= get_le64(pb); | |
727 url_fskip(pb, 12); | |
728 get_le32(pb); | |
729 url_fskip(pb, asf->packet_replic_size - 8 - 38 - 4); | |
730 if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000; | |
731 else asf->packet_frag_timestamp= AV_NOPTS_VALUE; | |
732 }else | |
733 url_fskip(pb, asf->packet_replic_size - 8); | |
1708 | 734 rsize += asf->packet_replic_size; // FIXME - check validity |
735 } else if (asf->packet_replic_size==1){ | |
2855 | 736 // multipacket - frag_offset is beginning timestamp |
1708 | 737 asf->packet_time_start = asf->packet_frag_offset; |
738 asf->packet_frag_offset = 0; | |
739 asf->packet_frag_timestamp = asf->packet_timestamp; | |
740 | |
741 asf->packet_time_delta = get_byte(pb); | |
742 rsize++; | |
743 }else if(asf->packet_replic_size!=0){ | |
744 av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); | |
745 return -1; | |
746 } | |
747 if (asf->packet_flags & 0x01) { | |
748 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal | |
1712 | 749 if(asf->packet_frag_size > asf->packet_size_left - rsize){ |
750 av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid\n"); | |
751 return -1; | |
752 } | |
1708 | 753 //printf("Fragsize %d\n", asf->packet_frag_size); |
754 } else { | |
755 asf->packet_frag_size = asf->packet_size_left - rsize; | |
756 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize); | |
757 } | |
758 if (asf->packet_replic_size == 1) { | |
759 asf->packet_multi_size = asf->packet_frag_size; | |
760 if (asf->packet_multi_size > asf->packet_size_left) | |
761 return -1; | |
762 } | |
763 asf->packet_size_left -= rsize; | |
764 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); | |
765 | |
766 return 0; | |
767 } | |
768 | |
5011
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
769 /** |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
770 * Parse data from individual ASF packets (which were previously loaded |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
771 * with asf_get_packet()). |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
772 * @param s demux context |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
773 * @param pb context to read data from |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
774 * @param pkt pointer to store packet data into |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
775 * @returns 0 if data was stored in pkt, <0 on error or 1 if more ASF |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
776 * packets need to be loaded (through asf_get_packet()) |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
777 */ |
5cf7e033989d
Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
rbultje
parents:
4955
diff
changeset
|
778 static int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt) |
0 | 779 { |
780 ASFContext *asf = s->priv_data; | |
781 ASFStream *asf_st = 0; | |
782 for (;;) { | |
1713 | 783 if(url_feof(pb)) |
4879
42e183e59515
Replace AVERROR(EIO) by AVERROR_EOF on end-of-file. See mailinglist
rbultje
parents:
4797
diff
changeset
|
784 return AVERROR_EOF; |
887 | 785 if (asf->packet_size_left < FRAME_HEADER_SIZE |
786 || asf->packet_segments < 1) { | |
787 //asf->packet_size_left <= asf->packet_padsize) { | |
788 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
|
789 //printf("PacketLeftSize:%d Pad:%d Pos:%"PRId64"\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); |
1333 | 790 assert(ret>=0); |
887 | 791 /* fail safe */ |
792 url_fskip(pb, ret); | |
1707
7e12a19c140f
more correct packet alignment check and correction
michael
parents:
1706
diff
changeset
|
793 |
4066
10f7232a3545
Do not access s->gb directly in functions that have a local copy of that
rbultje
parents:
4058
diff
changeset
|
794 asf->packet_pos= url_ftell(pb); |
1206
e60bf67d9bf8
The reader ignores the size of the ASF data object and keeps on
gpoirier
parents:
1172
diff
changeset
|
795 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
|
796 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) |
4883
584d9fb31093
Change another AVERROR(EIO) inot AVERROR_EOF, because it really signals EOF,
rbultje
parents:
4882
diff
changeset
|
797 return AVERROR_EOF; /* Do not exceed the size of the data object */ |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
798 return 1; |
887 | 799 } |
800 if (asf->packet_time_start == 0) { | |
4167
81f64d590675
Don't use s->pb if a local ByteIOContext was already provided by the calling
rbultje
parents:
4121
diff
changeset
|
801 if(asf_read_frame_header(s, pb) < 0){ |
1708 | 802 asf->packet_segments= 0; |
1696 | 803 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
|
804 } |
887 | 805 if (asf->stream_index < 0 |
708 | 806 || s->streams[asf->stream_index]->discard >= AVDISCARD_ALL |
807 || (!asf->packet_key_frame && s->streams[asf->stream_index]->discard >= AVDISCARD_NONKEY) | |
808 ) { | |
0 | 809 asf->packet_time_start = 0; |
887 | 810 /* unhandled packet (should not happen) */ |
811 url_fskip(pb, asf->packet_frag_size); | |
812 asf->packet_size_left -= asf->packet_frag_size; | |
652 | 813 if(asf->stream_index < 0) |
1708 | 814 av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size); |
0 | 815 continue; |
887 | 816 } |
817 asf->asf_st = s->streams[asf->stream_index]->priv_data; | |
818 } | |
819 asf_st = asf->asf_st; | |
0 | 820 |
887 | 821 if (asf->packet_replic_size == 1) { |
2855 | 822 // frag_offset is here used as the beginning timestamp |
887 | 823 asf->packet_frag_timestamp = asf->packet_time_start; |
824 asf->packet_time_start += asf->packet_time_delta; | |
825 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb); | |
826 asf->packet_size_left--; | |
0 | 827 asf->packet_multi_size--; |
887 | 828 if (asf->packet_multi_size < asf->packet_obj_size) |
829 { | |
830 asf->packet_time_start = 0; | |
831 url_fskip(pb, asf->packet_multi_size); | |
832 asf->packet_size_left -= asf->packet_multi_size; | |
0 | 833 continue; |
887 | 834 } |
835 asf->packet_multi_size -= asf->packet_obj_size; | |
836 //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); | |
837 } | |
2285 | 838 if( /*asf->packet_frag_size == asf->packet_obj_size*/ |
839 asf_st->frag_offset + asf->packet_frag_size <= asf_st->pkt.size | |
840 && asf_st->frag_offset + asf->packet_frag_size > asf->packet_obj_size){ | |
841 av_log(s, AV_LOG_INFO, "ignoring invalid packet_obj_size (%d %d %d %d)\n", | |
842 asf_st->frag_offset, asf->packet_frag_size, | |
843 asf->packet_obj_size, asf_st->pkt.size); | |
844 asf->packet_obj_size= asf_st->pkt.size; | |
845 } | |
846 | |
1744 | 847 if ( asf_st->pkt.size != asf->packet_obj_size |
848 || 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
|
849 if(asf_st->pkt.data){ |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
850 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
|
851 asf_st->frag_offset = 0; |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
852 av_free_packet(&asf_st->pkt); |
33a16d903dcc
replace nonsense code by something which makes at least some sense
michael
parents:
1709
diff
changeset
|
853 } |
887 | 854 /* new packet */ |
855 av_new_packet(&asf_st->pkt, asf->packet_obj_size); | |
856 asf_st->seq = asf->packet_seq; | |
4022 | 857 asf_st->pkt.dts = asf->packet_frag_timestamp; |
887 | 858 asf_st->pkt.stream_index = asf->stream_index; |
885 | 859 asf_st->pkt.pos = |
860 asf_st->packet_pos= asf->packet_pos; | |
861 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", | |
349 | 862 //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
|
863 //s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size); |
887 | 864 if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO) |
865 asf->packet_key_frame = 1; | |
866 if (asf->packet_key_frame) | |
867 asf_st->pkt.flags |= PKT_FLAG_KEY; | |
868 } | |
0 | 869 |
887 | 870 /* read data */ |
871 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", | |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
872 // s->packet_size, asf_st->pkt.size, asf->packet_frag_offset, |
887 | 873 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data); |
874 asf->packet_size_left -= asf->packet_frag_size; | |
875 if (asf->packet_size_left < 0) | |
0 | 876 continue; |
1709 | 877 |
878 if( asf->packet_frag_offset >= asf_st->pkt.size | |
879 || asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset){ | |
880 av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n", | |
881 asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size); | |
882 continue; | |
883 } | |
884 | |
887 | 885 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, |
886 asf->packet_frag_size); | |
2652 | 887 if (s->key && s->keylen == 20) |
888 ff_asfcrypt_dec(s->key, asf_st->pkt.data + asf->packet_frag_offset, | |
889 asf->packet_frag_size); | |
887 | 890 asf_st->frag_offset += asf->packet_frag_size; |
891 /* test if whole packet is read */ | |
892 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
|
893 //workaround for macroshit radio DVR-MS files |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
894 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
|
895 && asf_st->pkt.size > 100){ |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
896 int i; |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
897 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
|
898 if(i == asf_st->pkt.size){ |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
899 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
|
900 asf_st->frag_offset = 0; |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
901 av_free_packet(&asf_st->pkt); |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
902 continue; |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
903 } |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
904 } |
1a2f353ac291
workaround ms (lack of) intelligence in their design of dvr-ms
michael
parents:
2392
diff
changeset
|
905 |
887 | 906 /* return packet */ |
907 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
|
908 if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span){ |
2319 | 909 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
|
910 }else{ |
887 | 911 /* packet descrambling */ |
1332 | 912 uint8_t *newdata = av_malloc(asf_st->pkt.size); |
887 | 913 if (newdata) { |
914 int offset = 0; | |
915 while (offset < asf_st->pkt.size) { | |
916 int off = offset / asf_st->ds_chunk_size; | |
917 int row = off / asf_st->ds_span; | |
918 int col = off % asf_st->ds_span; | |
919 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; | |
920 //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
|
921 |
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
|
922 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
|
923 assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size); |
887 | 924 memcpy(newdata + offset, |
925 asf_st->pkt.data + idx * asf_st->ds_chunk_size, | |
926 asf_st->ds_chunk_size); | |
927 offset += asf_st->ds_chunk_size; | |
928 } | |
929 av_free(asf_st->pkt.data); | |
930 asf_st->pkt.data = newdata; | |
931 } | |
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
|
932 } |
887 | 933 } |
934 asf_st->frag_offset = 0; | |
1699 | 935 *pkt= asf_st->pkt; |
887 | 936 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size); |
937 asf_st->pkt.size = 0; | |
938 asf_st->pkt.data = 0; | |
939 break; // packet completed | |
940 } | |
0 | 941 } |
942 return 0; | |
943 } | |
944 | |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
945 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
946 { |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
947 ASFContext *asf = s->priv_data; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
948 |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
949 for (;;) { |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
950 int ret; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
951 |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
952 /* parse cached packets, if any */ |
4121
55e94f2a8ac1
Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents:
4120
diff
changeset
|
953 if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0) |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
954 return ret; |
4121
55e94f2a8ac1
Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
rbultje
parents:
4120
diff
changeset
|
955 if ((ret = ff_asf_get_packet(s, s->pb)) < 0) |
4095
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
956 assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
957 asf->packet_time_start = 0; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
958 } |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
959 |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
960 return 0; |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
961 } |
27f4b31bc790
Separate the packet fetching from the data reading, so that the data reading
rbultje
parents:
4068
diff
changeset
|
962 |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
963 // 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
|
964 // 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
|
965 // 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
|
966 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
|
967 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
968 ASFContext *asf = s->priv_data; |
349 | 969 ASFStream *asf_st; |
970 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
|
971 |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
972 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
|
973 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
|
974 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
|
975 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
|
976 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
|
977 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
|
978 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
|
979 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
|
980 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
|
981 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
|
982 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
|
983 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
|
984 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
|
985 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
|
986 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
|
987 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
|
988 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
|
989 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
|
990 asf->packet_time_start = 0; |
885 | 991 |
349 | 992 for(i=0; i<s->nb_streams; i++){ |
993 asf_st= s->streams[i]->priv_data; | |
994 av_free_packet(&asf_st->pkt); | |
995 asf_st->frag_offset=0; | |
996 asf_st->seq=0; | |
997 } | |
998 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
|
999 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1000 |
2603
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1001 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
|
1002 { |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1003 int i; |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1004 |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1005 asf_reset_header(s); |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1006 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
|
1007 AVStream *st = s->streams[i]; |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1008 av_free(st->codec->palctrl); |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1009 } |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1010 return 0; |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1011 } |
4a3957734e85
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
diego
parents:
2599
diff
changeset
|
1012 |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
1013 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
|
1014 { |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1015 AVPacket pkt1, *pkt = &pkt1; |
349 | 1016 ASFStream *asf_st; |
1017 int64_t pts; | |
348 | 1018 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
|
1019 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
|
1020 int64_t start_pos[s->nb_streams]; |
885 | 1021 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
1022 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
|
1023 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
|
1024 } |
885 | 1025 |
5085
878651429ae5
Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
reimar
parents:
5067
diff
changeset
|
1026 if (s->packet_size > 0) |
5086 | 1027 pos= (pos+s->packet_size-1-s->data_offset)/s->packet_size*s->packet_size+ s->data_offset; |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
1028 *ppos= pos; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1029 url_fseek(s->pb, pos, SEEK_SET); |
885 | 1030 |
349 | 1031 //printf("asf_read_pts\n"); |
1032 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
|
1033 for(;;){ |
349 | 1034 if (av_read_frame(s, pkt) < 0){ |
1714 | 1035 av_log(s, AV_LOG_INFO, "asf_read_pts failed\n"); |
887 | 1036 return AV_NOPTS_VALUE; |
349 | 1037 } |
885 | 1038 |
991 | 1039 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
|
1040 |
348 | 1041 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
|
1042 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
|
1043 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
|
1044 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
1045 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
|
1046 |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
1047 // assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0); |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
1048 pos= asf_st->packet_pos; |
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
1049 |
1266 | 1050 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
|
1051 start_pos[i]= asf_st->packet_pos + 1; |
885 | 1052 |
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
1053 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
|
1054 break; |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
1055 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
1056 } |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
1057 |
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
1058 *ppos= pos; |
1443
404048ea11bc
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents:
1415
diff
changeset
|
1059 //printf("found keyframe at %"PRId64" stream %d stamp:%"PRId64"\n", *ppos, stream_index, pts); |
348 | 1060 |
1061 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
|
1062 } |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1063 |
1265
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1064 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
|
1065 { |
4748
86dd0cab30d3
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
reimar
parents:
4747
diff
changeset
|
1066 ff_asf_guid 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
|
1067 ASFContext *asf = s->priv_data; |
4882
8d9ce632a3e2
Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents:
4879
diff
changeset
|
1068 int64_t 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
|
1069 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
|
1070 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1071 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
|
1072 get_guid(s->pb, &g); |
4747
0ad594176680
Add a special guidcmp function to compare ASF guids, to avoid the many
reimar
parents:
4743
diff
changeset
|
1073 if (!guidcmp(&g, &index_guid)) { |
5467 | 1074 int64_t itime, last_pos=-1; |
4882
8d9ce632a3e2
Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents:
4879
diff
changeset
|
1075 int pct, ict; |
4896
7c3c541b421e
Mark gsize variable as av_unused, fixes the warning:
diego
parents:
4895
diff
changeset
|
1076 int64_t av_unused gsize= get_le64(s->pb); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1077 get_guid(s->pb, &g); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1078 itime=get_le64(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1079 pct=get_le32(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1080 ict=get_le32(s->pb); |
4508 | 1081 av_log(s, 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
|
1082 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1083 for (i=0;i<ict;i++){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1084 int pktnum=get_le32(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1085 int pktct =get_le16(s->pb); |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
1086 int64_t pos = s->data_offset + s->packet_size*(int64_t)pktnum; |
4882
8d9ce632a3e2
Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents:
4879
diff
changeset
|
1087 int64_t index_pts= av_rescale(itime, i, 10000); |
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
|
1088 |
5467 | 1089 if(pos != last_pos){ |
4882
8d9ce632a3e2
Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
michael
parents:
4879
diff
changeset
|
1090 av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d\n", pktnum, pktct); |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
1091 av_add_index_entry(s->streams[stream_index], pos, index_pts, s->packet_size, 0, AVINDEX_KEYFRAME); |
5467 | 1092 last_pos=pos; |
1093 } | |
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
|
1094 } |
1266 | 1095 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
|
1096 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1097 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
|
1098 } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1099 |
555 | 1100 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) |
0 | 1101 { |
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
1102 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
|
1103 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
|
1104 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
|
1105 int index; |
885 | 1106 |
5067
499c21a8e0c2
Remove any reference to ASFContext.packet_size and replace it with
rbultje
parents:
5058
diff
changeset
|
1107 if (s->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
|
1108 return -1; |
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1109 |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1110 /* Try using the protocol's read_seek if available */ |
2842 | 1111 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
|
1112 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
|
1113 if(ret >= 0) |
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1114 asf_reset_header(s); |
2842 | 1115 if (ret != AVERROR(ENOSYS)) |
2843 | 1116 return ret; |
2827
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1117 } |
f717dd23fc23
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
benoit
parents:
2771
diff
changeset
|
1118 |
1266 | 1119 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
|
1120 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
|
1121 |
1266 | 1122 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
|
1123 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
|
1124 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
|
1125 }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
|
1126 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
|
1127 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
|
1128 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
|
1129 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1130 /* 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
|
1131 pos = st->index_entries[index].pos; |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1132 |
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
|
1133 // 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
|
1134 // asf_reset_header(s); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1135 // 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
|
1136 // 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
|
1137 // for(i=0;i<16;i++){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1138 // 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
|
1139 // 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
|
1140 // 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
|
1141 // 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
|
1142 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1143 // 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
|
1144 // 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
|
1145 // |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1146 // 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
|
1147 // 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
|
1148 // 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
|
1149 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1150 // |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1151 // 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
|
1152 // } |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1153 |
613fdf995af0
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
michael
parents:
1264
diff
changeset
|
1154 /* do the seek */ |
4508 | 1155 av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2737
diff
changeset
|
1156 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
|
1157 } |
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
1158 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
|
1159 return 0; |
0 | 1160 } |
1161 | |
1169 | 1162 AVInputFormat asf_demuxer = { |
0 | 1163 "asf", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
1164 NULL_IF_CONFIG_SMALL("ASF format"), |
0 | 1165 sizeof(ASFContext), |
1166 asf_probe, | |
1167 asf_read_header, | |
1168 asf_read_packet, | |
1169 asf_read_close, | |
1170 asf_read_seek, | |
437
50bae308f71e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
michael
parents:
373
diff
changeset
|
1171 asf_read_pts, |
4618
5b9eddbee9c4
Add some basic metadata conversion tables for matroska and asf.
aurel
parents:
4593
diff
changeset
|
1172 .metadata_conv = ff_asf_metadata_conv, |
0 | 1173 }; |