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