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