Mercurial > libavformat.hg
annotate asf.c @ 372:2e12cd1b68ed libavformat
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
| author | michael |
|---|---|
| date | Fri, 05 Mar 2004 21:34:30 +0000 |
| parents | 845f9de2c883 |
| children | e47d9c8e2054 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
2 * ASF compatible decoder. |
| 0 | 3 * Copyright (c) 2000, 2001 Fabrice Bellard. |
| 4 * | |
| 5 * This library is free software; you can redistribute it and/or | |
| 6 * modify it under the terms of the GNU Lesser General Public | |
| 7 * License as published by the Free Software Foundation; either | |
| 8 * version 2 of the License, or (at your option) any later version. | |
| 9 * | |
| 10 * This library is distributed in the hope that it will be useful, | |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 * Lesser General Public License for more details. | |
| 14 * | |
| 15 * You should have received a copy of the GNU Lesser General Public | |
| 16 * License along with this library; if not, write to the Free Software | |
| 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 */ | |
| 19 #include "avformat.h" | |
| 20 #include "avi.h" | |
| 21 #include "mpegaudio.h" | |
|
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
22 #include "asf.h" |
| 0 | 23 |
| 348 | 24 #undef NDEBUG |
| 25 #include <assert.h> | |
| 26 | |
| 0 | 27 static const GUID index_guid = { |
| 28 0x33000890, 0xe5b1, 0x11cf, { 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb }, | |
| 29 }; | |
| 30 | |
| 31 /**********************************/ | |
| 32 /* decoding */ | |
| 33 | |
| 34 //#define DEBUG | |
| 35 | |
| 36 #ifdef DEBUG | |
| 69 | 37 #define PRINT_IF_GUID(g,cmp) \ |
| 38 if (!memcmp(g, &cmp, sizeof(GUID))) \ | |
| 39 printf("(GUID: %s) ", #cmp) | |
| 40 | |
| 0 | 41 static void print_guid(const GUID *g) |
| 42 { | |
| 43 int i; | |
| 69 | 44 PRINT_IF_GUID(g, asf_header); |
| 45 else PRINT_IF_GUID(g, file_header); | |
| 46 else PRINT_IF_GUID(g, stream_header); | |
| 47 else PRINT_IF_GUID(g, audio_stream); | |
| 48 else PRINT_IF_GUID(g, audio_conceal_none); | |
| 49 else PRINT_IF_GUID(g, video_stream); | |
| 50 else PRINT_IF_GUID(g, video_conceal_none); | |
| 51 else PRINT_IF_GUID(g, comment_header); | |
| 52 else PRINT_IF_GUID(g, codec_comment_header); | |
| 53 else PRINT_IF_GUID(g, codec_comment1_header); | |
| 54 else PRINT_IF_GUID(g, data_header); | |
| 55 else PRINT_IF_GUID(g, index_guid); | |
| 56 else PRINT_IF_GUID(g, head1_guid); | |
| 57 else PRINT_IF_GUID(g, head2_guid); | |
| 58 else PRINT_IF_GUID(g, my_guid); | |
| 59 else | |
| 60 printf("(GUID: unknown) "); | |
| 0 | 61 printf("0x%08x, 0x%04x, 0x%04x, {", g->v1, g->v2, g->v3); |
| 62 for(i=0;i<8;i++) | |
| 63 printf(" 0x%02x,", g->v4[i]); | |
| 64 printf("}\n"); | |
| 65 } | |
| 69 | 66 #undef PRINT_IF_GUID(g,cmp) |
| 0 | 67 #endif |
| 68 | |
| 69 static void get_guid(ByteIOContext *s, GUID *g) | |
| 70 { | |
| 71 int i; | |
| 72 | |
| 73 g->v1 = get_le32(s); | |
| 74 g->v2 = get_le16(s); | |
| 75 g->v3 = get_le16(s); | |
| 76 for(i=0;i<8;i++) | |
| 77 g->v4[i] = get_byte(s); | |
| 78 } | |
| 79 | |
| 80 #if 0 | |
| 81 static void get_str16(ByteIOContext *pb, char *buf, int buf_size) | |
| 82 { | |
| 83 int len, c; | |
| 84 char *q; | |
| 85 | |
| 86 len = get_le16(pb); | |
| 87 q = buf; | |
| 88 while (len > 0) { | |
| 89 c = get_le16(pb); | |
| 90 if ((q - buf) < buf_size - 1) | |
| 91 *q++ = c; | |
| 92 len--; | |
| 93 } | |
| 94 *q = '\0'; | |
| 95 } | |
| 96 #endif | |
| 97 | |
| 98 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) | |
| 99 { | |
| 100 int c; | |
| 101 char *q; | |
| 102 | |
| 103 q = buf; | |
| 104 while (len > 0) { | |
| 105 c = get_le16(pb); | |
| 106 if ((q - buf) < buf_size - 1) | |
| 107 *q++ = c; | |
| 108 len-=2; | |
| 109 } | |
| 110 *q = '\0'; | |
| 111 } | |
| 112 | |
| 113 static int asf_probe(AVProbeData *pd) | |
| 114 { | |
| 115 GUID g; | |
| 116 const unsigned char *p; | |
| 117 int i; | |
| 118 | |
| 119 /* check file header */ | |
| 120 if (pd->buf_size <= 32) | |
| 121 return 0; | |
| 122 p = pd->buf; | |
| 123 g.v1 = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); | |
| 124 p += 4; | |
| 125 g.v2 = p[0] | (p[1] << 8); | |
| 126 p += 2; | |
| 127 g.v3 = p[0] | (p[1] << 8); | |
| 128 p += 2; | |
| 129 for(i=0;i<8;i++) | |
| 130 g.v4[i] = *p++; | |
| 131 | |
| 132 if (!memcmp(&g, &asf_header, sizeof(GUID))) | |
| 133 return AVPROBE_SCORE_MAX; | |
| 134 else | |
| 135 return 0; | |
| 136 } | |
| 137 | |
| 138 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) | |
| 139 { | |
| 140 ASFContext *asf = s->priv_data; | |
| 141 GUID g; | |
| 142 ByteIOContext *pb = &s->pb; | |
| 143 AVStream *st; | |
| 144 ASFStream *asf_st; | |
| 145 int size, i; | |
| 65 | 146 int64_t gsize; |
| 0 | 147 |
| 148 av_set_pts_info(s, 32, 1, 1000); /* 32 bit pts in ms */ | |
| 149 | |
| 150 get_guid(pb, &g); | |
| 151 if (memcmp(&g, &asf_header, sizeof(GUID))) | |
| 152 goto fail; | |
| 153 get_le64(pb); | |
| 154 get_le32(pb); | |
| 155 get_byte(pb); | |
| 156 get_byte(pb); | |
| 157 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); | |
| 158 for(;;) { | |
| 159 get_guid(pb, &g); | |
| 160 gsize = get_le64(pb); | |
| 161 #ifdef DEBUG | |
| 162 printf("%08Lx: ", url_ftell(pb) - 24); | |
| 163 print_guid(&g); | |
| 164 printf(" size=0x%Lx\n", gsize); | |
| 165 #endif | |
| 166 if (gsize < 24) | |
| 167 goto fail; | |
| 168 if (!memcmp(&g, &file_header, sizeof(GUID))) { | |
| 169 get_guid(pb, &asf->hdr.guid); | |
| 170 asf->hdr.file_size = get_le64(pb); | |
| 171 asf->hdr.create_time = get_le64(pb); | |
| 172 asf->hdr.packets_count = get_le64(pb); | |
| 173 asf->hdr.play_time = get_le64(pb); | |
| 174 asf->hdr.send_time = get_le64(pb); | |
| 175 asf->hdr.preroll = get_le32(pb); | |
| 176 asf->hdr.ignore = get_le32(pb); | |
| 177 asf->hdr.flags = get_le32(pb); | |
| 178 asf->hdr.min_pktsize = get_le32(pb); | |
| 179 asf->hdr.max_pktsize = get_le32(pb); | |
| 180 asf->hdr.max_bitrate = get_le32(pb); | |
| 181 asf->packet_size = asf->hdr.max_pktsize; | |
| 182 asf->nb_packets = asf->hdr.packets_count; | |
| 183 } else if (!memcmp(&g, &stream_header, sizeof(GUID))) { | |
|
84
0068a6902911
correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
74
diff
changeset
|
184 int type, total_size, type_specific_size; |
| 0 | 185 unsigned int tag1; |
| 65 | 186 int64_t pos1, pos2; |
| 0 | 187 |
| 188 pos1 = url_ftell(pb); | |
| 189 | |
|
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
190 st = av_new_stream(s, 0); |
| 0 | 191 if (!st) |
| 192 goto fail; | |
| 193 asf_st = av_mallocz(sizeof(ASFStream)); | |
| 194 if (!asf_st) | |
| 195 goto fail; | |
| 196 st->priv_data = asf_st; | |
|
188
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
197 st->start_time = asf->hdr.preroll / (10000000 / AV_TIME_BASE); |
|
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
198 st->duration = (asf->hdr.send_time - asf->hdr.preroll) / |
|
6c9d6422a2f6
update duration and start_time - add av_new_stream() usage
bellard
parents:
136
diff
changeset
|
199 (10000000 / AV_TIME_BASE); |
| 0 | 200 get_guid(pb, &g); |
| 201 if (!memcmp(&g, &audio_stream, sizeof(GUID))) { | |
| 202 type = CODEC_TYPE_AUDIO; | |
| 203 } else if (!memcmp(&g, &video_stream, sizeof(GUID))) { | |
| 204 type = CODEC_TYPE_VIDEO; | |
| 205 } else { | |
| 206 goto fail; | |
| 207 } | |
| 208 get_guid(pb, &g); | |
| 209 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
|
210 type_specific_size = get_le32(pb); |
| 0 | 211 get_le32(pb); |
| 212 st->id = get_le16(pb) & 0x7f; /* stream id */ | |
| 213 // 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
|
214 asf->asfid2avid[st->id] = s->nb_streams - 1; |
| 0 | 215 |
| 216 get_le32(pb); | |
| 217 st->codec.codec_type = type; | |
|
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
218 /* 1 fps default (XXX: put 0 fps instead) */ |
|
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
219 st->codec.frame_rate = 1; |
|
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
220 st->codec.frame_rate_base = 1; |
| 0 | 221 if (type == CODEC_TYPE_AUDIO) { |
|
84
0068a6902911
correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents:
74
diff
changeset
|
222 get_wav_header(pb, &st->codec, type_specific_size); |
|
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
223 st->need_parsing = 1; |
| 0 | 224 /* We have to init the frame size at some point .... */ |
| 225 pos2 = url_ftell(pb); | |
| 226 if (gsize > (pos2 + 8 - pos1 + 24)) { | |
| 227 asf_st->ds_span = get_byte(pb); | |
| 228 asf_st->ds_packet_size = get_le16(pb); | |
| 229 asf_st->ds_chunk_size = get_le16(pb); | |
| 230 asf_st->ds_data_size = get_le16(pb); | |
| 231 asf_st->ds_silence_data = get_byte(pb); | |
| 232 } | |
| 233 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", | |
| 234 // asf_st->ds_packet_size, asf_st->ds_chunk_size, | |
| 235 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); | |
| 236 if (asf_st->ds_span > 1) { | |
| 237 if (!asf_st->ds_chunk_size | |
| 238 || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1)) | |
| 239 asf_st->ds_span = 0; // disable descrambling | |
| 240 } | |
| 241 switch (st->codec.codec_id) { | |
| 232 | 242 case CODEC_ID_MP3: |
| 0 | 243 st->codec.frame_size = MPA_FRAME_SIZE; |
| 244 break; | |
| 245 case CODEC_ID_PCM_S16LE: | |
| 246 case CODEC_ID_PCM_S16BE: | |
| 247 case CODEC_ID_PCM_U16LE: | |
| 248 case CODEC_ID_PCM_U16BE: | |
| 249 case CODEC_ID_PCM_S8: | |
| 250 case CODEC_ID_PCM_U8: | |
| 251 case CODEC_ID_PCM_ALAW: | |
| 252 case CODEC_ID_PCM_MULAW: | |
| 253 st->codec.frame_size = 1; | |
| 254 break; | |
| 255 default: | |
| 256 /* This is probably wrong, but it prevents a crash later */ | |
| 257 st->codec.frame_size = 1; | |
| 258 break; | |
| 259 } | |
| 260 } else { | |
| 261 get_le32(pb); | |
| 262 get_le32(pb); | |
| 263 get_byte(pb); | |
| 264 size = get_le16(pb); /* size */ | |
| 265 get_le32(pb); /* size */ | |
| 266 st->codec.width = get_le32(pb); | |
| 267 st->codec.height = get_le32(pb); | |
| 268 /* not available for asf */ | |
| 269 get_le16(pb); /* panes */ | |
| 117 | 270 st->codec.bits_per_sample = get_le16(pb); /* depth */ |
| 0 | 271 tag1 = get_le32(pb); |
| 272 url_fskip(pb, 20); | |
| 273 if (size > 40) { | |
| 274 st->codec.extradata_size = size - 40; | |
| 275 st->codec.extradata = av_mallocz(st->codec.extradata_size); | |
| 276 get_buffer(pb, st->codec.extradata, st->codec.extradata_size); | |
| 277 } | |
|
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
278 |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
279 /* Extract palette from extradata if bpp <= 8 */ |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
280 /* This code assumes that extradata contains only palette */ |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
281 /* This is true for all paletted codecs implemented in ffmpeg */ |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
282 if (st->codec.extradata_size && (st->codec.bits_per_sample <= 8)) { |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
283 st->codec.palctrl = av_mallocz(sizeof(AVPaletteControl)); |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
284 #ifdef WORDS_BIGENDIAN |
|
300
6ee1b02f9b2a
* fixes for broken builds on Solaris, OS2 and all bingendian
romansh
parents:
297
diff
changeset
|
285 for (i = 0; i < FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)/4; i++) |
|
6ee1b02f9b2a
* fixes for broken builds on Solaris, OS2 and all bingendian
romansh
parents:
297
diff
changeset
|
286 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
|
287 #else |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
288 memcpy(st->codec.palctrl->palette, st->codec.extradata, |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
289 FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)); |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
290 #endif |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
291 st->codec.palctrl->palette_changed = 1; |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
292 } |
|
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
293 |
| 74 | 294 st->codec.codec_tag = tag1; |
| 0 | 295 st->codec.codec_id = codec_get_id(codec_bmp_tags, tag1); |
| 296 } | |
| 297 pos2 = url_ftell(pb); | |
| 298 url_fskip(pb, gsize - (pos2 - pos1 + 24)); | |
| 299 } else if (!memcmp(&g, &data_header, sizeof(GUID))) { | |
| 300 break; | |
| 301 } else if (!memcmp(&g, &comment_header, sizeof(GUID))) { | |
| 302 int len1, len2, len3, len4, len5; | |
| 303 | |
| 304 len1 = get_le16(pb); | |
| 305 len2 = get_le16(pb); | |
| 306 len3 = get_le16(pb); | |
| 307 len4 = get_le16(pb); | |
| 308 len5 = get_le16(pb); | |
| 309 get_str16_nolen(pb, len1, s->title, sizeof(s->title)); | |
| 310 get_str16_nolen(pb, len2, s->author, sizeof(s->author)); | |
| 311 get_str16_nolen(pb, len3, s->copyright, sizeof(s->copyright)); | |
| 312 get_str16_nolen(pb, len4, s->comment, sizeof(s->comment)); | |
| 313 url_fskip(pb, len5); | |
|
341
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
314 } else if (!memcmp(&g, &extended_content_header, sizeof(GUID))) { |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
315 int desc_count, i; |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
316 |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
317 desc_count = get_le16(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
318 for(i=0;i<desc_count;i++) |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
319 { |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
320 int name_len,value_type,value_len,value_num = 0; |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
321 char *name, *value; |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
322 |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
323 name_len = get_le16(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
324 name = (char *)av_mallocz(name_len); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
325 get_str16_nolen(pb, name_len, name, name_len); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
326 value_type = get_le16(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
327 value_len = get_le16(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
328 if ((value_type == 0) || (value_type == 1)) // unicode or byte |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
329 { |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
330 value = (char *)av_mallocz(value_len); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
331 get_str16_nolen(pb, value_len, value, value_len); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
332 if (strcmp(name,"WM/AlbumTitle")==0) { strcpy(s->album, value); } |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
333 av_free(value); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
334 } |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
335 if ((value_type >= 2) || (value_type <= 5)) // boolean or DWORD or QWORD or WORD |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
336 { |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
337 if (value_type==2) value_num = get_le32(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
338 if (value_type==3) value_num = get_le32(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
339 if (value_type==4) value_num = get_le64(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
340 if (value_type==5) value_num = get_le16(pb); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
341 if (strcmp(name,"WM/Track")==0) s->track = value_num + 1; |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
342 if (strcmp(name,"WM/TrackNumber")==0) s->track = value_num; |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
343 } |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
344 av_free(name); |
|
ad2a57c5467a
ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
312
diff
changeset
|
345 } |
| 0 | 346 #if 0 |
| 347 } else if (!memcmp(&g, &head1_guid, sizeof(GUID))) { | |
| 348 int v1, v2; | |
| 349 get_guid(pb, &g); | |
| 350 v1 = get_le32(pb); | |
| 351 v2 = get_le16(pb); | |
| 352 } else if (!memcmp(&g, &codec_comment_header, sizeof(GUID))) { | |
| 353 int len, v1, n, num; | |
| 354 char str[256], *q; | |
| 355 char tag[16]; | |
| 356 | |
| 357 get_guid(pb, &g); | |
| 358 print_guid(&g); | |
| 359 | |
| 360 n = get_le32(pb); | |
| 361 for(i=0;i<n;i++) { | |
| 362 num = get_le16(pb); /* stream number */ | |
| 363 get_str16(pb, str, sizeof(str)); | |
| 364 get_str16(pb, str, sizeof(str)); | |
| 365 len = get_le16(pb); | |
| 366 q = tag; | |
| 367 while (len > 0) { | |
| 368 v1 = get_byte(pb); | |
| 369 if ((q - tag) < sizeof(tag) - 1) | |
| 370 *q++ = v1; | |
| 371 len--; | |
| 372 } | |
| 373 *q = '\0'; | |
| 374 } | |
| 375 #endif | |
| 376 } else if (url_feof(pb)) { | |
| 377 goto fail; | |
| 378 } else { | |
| 379 url_fseek(pb, gsize - 24, SEEK_CUR); | |
| 380 } | |
| 381 } | |
| 382 get_guid(pb, &g); | |
| 383 get_le64(pb); | |
| 384 get_byte(pb); | |
| 385 get_byte(pb); | |
| 386 if (url_feof(pb)) | |
| 387 goto fail; | |
| 388 asf->data_offset = url_ftell(pb); | |
| 389 asf->packet_size_left = 0; | |
| 390 | |
| 391 return 0; | |
| 392 | |
| 393 fail: | |
| 394 for(i=0;i<s->nb_streams;i++) { | |
| 395 AVStream *st = s->streams[i]; | |
| 396 if (st) { | |
| 397 av_free(st->priv_data); | |
| 398 av_free(st->codec.extradata); | |
| 399 } | |
| 400 av_free(st); | |
| 401 } | |
| 402 return -1; | |
| 403 } | |
| 404 | |
| 405 #define DO_2BITS(bits, var, defval) \ | |
| 406 switch (bits & 3) \ | |
| 407 { \ | |
| 408 case 3: var = get_le32(pb); rsize += 4; break; \ | |
| 409 case 2: var = get_le16(pb); rsize += 2; break; \ | |
| 410 case 1: var = get_byte(pb); rsize++; break; \ | |
| 411 default: var = defval; break; \ | |
| 412 } | |
| 413 | |
| 414 static int asf_get_packet(AVFormatContext *s) | |
| 415 { | |
| 416 ASFContext *asf = s->priv_data; | |
| 417 ByteIOContext *pb = &s->pb; | |
| 418 uint32_t packet_length, padsize; | |
| 353 | 419 int rsize = 9; |
| 420 int c; | |
| 421 | |
| 422 assert((url_ftell(&s->pb) - s->data_offset) % asf->packet_size == 0); | |
| 423 | |
| 424 c = get_byte(pb); | |
| 0 | 425 if (c != 0x82) { |
| 426 if (!url_feof(pb)) | |
|
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
427 av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%lld\n", c, url_ftell(pb)); |
| 0 | 428 } |
| 429 if ((c & 0x0f) == 2) { // always true for now | |
| 430 if (get_le16(pb) != 0) { | |
| 431 if (!url_feof(pb)) | |
|
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
432 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); |
| 0 | 433 return -EIO; |
| 434 } | |
| 353 | 435 rsize+=2; |
| 436 /* }else{ | |
| 437 if (!url_feof(pb)) | |
| 438 printf("ff asf bad header %x at:%lld\n", c, url_ftell(pb)); | |
| 439 return -EIO;*/ | |
| 0 | 440 } |
| 441 | |
| 442 asf->packet_flags = get_byte(pb); | |
| 443 asf->packet_property = get_byte(pb); | |
| 444 | |
| 445 DO_2BITS(asf->packet_flags >> 5, packet_length, asf->packet_size); | |
| 446 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored | |
| 447 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length | |
| 448 | |
| 449 asf->packet_timestamp = get_le32(pb); | |
| 450 get_le16(pb); /* duration */ | |
| 451 // rsize has at least 11 bytes which have to be present | |
| 452 | |
| 453 if (asf->packet_flags & 0x01) { | |
| 454 asf->packet_segsizetype = get_byte(pb); rsize++; | |
| 455 asf->packet_segments = asf->packet_segsizetype & 0x3f; | |
| 456 } else { | |
| 457 asf->packet_segments = 1; | |
| 458 asf->packet_segsizetype = 0x80; | |
| 459 } | |
| 460 asf->packet_size_left = packet_length - padsize - rsize; | |
| 461 if (packet_length < asf->hdr.min_pktsize) | |
| 462 padsize += asf->hdr.min_pktsize - packet_length; | |
| 463 asf->packet_padsize = padsize; | |
| 464 #ifdef DEBUG | |
| 465 printf("packet: size=%d padsize=%d left=%d\n", asf->packet_size, asf->packet_padsize, asf->packet_size_left); | |
| 466 #endif | |
| 467 return 0; | |
| 468 } | |
| 469 | |
| 470 static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) | |
| 471 { | |
| 472 ASFContext *asf = s->priv_data; | |
| 473 ASFStream *asf_st = 0; | |
| 474 ByteIOContext *pb = &s->pb; | |
| 475 //static int pc = 0; | |
| 476 for (;;) { | |
| 477 int rsize = 0; | |
| 478 if (asf->packet_size_left < FRAME_HEADER_SIZE | |
| 479 || asf->packet_segments < 1) { | |
| 480 //asf->packet_size_left <= asf->packet_padsize) { | |
| 481 int ret = asf->packet_size_left + asf->packet_padsize; | |
| 482 //printf("PacketLeftSize:%d Pad:%d Pos:%Ld\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb)); | |
| 483 /* fail safe */ | |
| 484 url_fskip(pb, ret); | |
| 349 | 485 asf->packet_pos= url_ftell(&s->pb); |
| 0 | 486 ret = asf_get_packet(s); |
| 487 //printf("READ ASF PACKET %d r:%d c:%d\n", ret, asf->packet_size_left, pc++); | |
| 488 if (ret < 0 || url_feof(pb)) | |
| 489 return -EIO; | |
| 490 asf->packet_time_start = 0; | |
| 491 continue; | |
| 492 } | |
| 493 if (asf->packet_time_start == 0) { | |
| 494 /* read frame header */ | |
| 495 int num = get_byte(pb); | |
| 496 asf->packet_segments--; | |
| 497 rsize++; | |
| 498 asf->packet_key_frame = (num & 0x80) >> 7; | |
| 499 asf->stream_index = asf->asfid2avid[num & 0x7f]; | |
| 500 // sequence should be ignored! | |
| 501 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); | |
| 502 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); | |
| 503 DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); | |
| 349 | 504 //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); |
| 0 | 505 if (asf->packet_replic_size > 1) { |
|
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
|
506 assert(asf->packet_replic_size >= 8); |
| 0 | 507 // it should be always at least 8 bytes - FIXME validate |
| 508 asf->packet_obj_size = get_le32(pb); | |
| 509 asf->packet_frag_timestamp = get_le32(pb); // timestamp | |
| 510 if (asf->packet_replic_size > 8) | |
| 511 url_fskip(pb, asf->packet_replic_size - 8); | |
| 512 rsize += asf->packet_replic_size; // FIXME - check validity | |
|
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
|
513 } else if (asf->packet_replic_size==1){ |
| 0 | 514 // multipacket - frag_offset is begining timestamp |
| 515 asf->packet_time_start = asf->packet_frag_offset; | |
| 516 asf->packet_frag_offset = 0; | |
| 517 asf->packet_frag_timestamp = asf->packet_timestamp; | |
| 518 | |
|
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
|
519 asf->packet_time_delta = get_byte(pb); |
|
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
|
520 rsize++; |
|
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
|
521 }else{ |
|
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
|
522 assert(asf->packet_replic_size==0); |
|
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
|
523 } |
| 0 | 524 if (asf->packet_flags & 0x01) { |
| 525 DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal | |
| 526 #undef DO_2BITS | |
| 527 //printf("Fragsize %d\n", asf->packet_frag_size); | |
| 528 } else { | |
| 529 asf->packet_frag_size = asf->packet_size_left - rsize; | |
| 530 //printf("Using rest %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize); | |
| 531 } | |
| 532 if (asf->packet_replic_size == 1) { | |
| 533 asf->packet_multi_size = asf->packet_frag_size; | |
| 534 if (asf->packet_multi_size > asf->packet_size_left) { | |
| 535 asf->packet_segments = 0; | |
| 536 continue; | |
| 537 } | |
| 538 } | |
| 539 asf->packet_size_left -= rsize; | |
| 540 //printf("___objsize____ %d %d rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize); | |
| 541 | |
| 542 if (asf->stream_index < 0) { | |
| 543 asf->packet_time_start = 0; | |
| 544 /* unhandled packet (should not happen) */ | |
| 545 url_fskip(pb, asf->packet_frag_size); | |
| 546 asf->packet_size_left -= asf->packet_frag_size; | |
|
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
547 av_log(s, AV_LOG_ERROR, "ff asf skip %d %d\n", asf->packet_frag_size, num & 0x7f); |
| 0 | 548 continue; |
| 549 } | |
| 550 asf->asf_st = s->streams[asf->stream_index]->priv_data; | |
| 551 } | |
| 552 asf_st = asf->asf_st; | |
| 553 | |
| 554 if ((asf->packet_frag_offset != asf_st->frag_offset | |
| 555 || (asf->packet_frag_offset | |
| 556 && asf->packet_seq != asf_st->seq)) // seq should be ignored | |
| 557 ) { | |
| 558 /* cannot continue current packet: free it */ | |
| 559 // FIXME better check if packet was already allocated | |
|
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
560 av_log(s, AV_LOG_INFO, "ff asf parser skips: %d - %d o:%d - %d %d %d fl:%d\n", |
| 0 | 561 asf_st->pkt.size, |
| 562 asf->packet_obj_size, | |
| 563 asf->packet_frag_offset, asf_st->frag_offset, | |
| 564 asf->packet_seq, asf_st->seq, asf->packet_frag_size); | |
| 565 if (asf_st->pkt.size) | |
| 566 av_free_packet(&asf_st->pkt); | |
| 567 asf_st->frag_offset = 0; | |
| 568 if (asf->packet_frag_offset != 0) { | |
| 569 url_fskip(pb, asf->packet_frag_size); | |
|
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
570 av_log(s, AV_LOG_INFO, "ff asf parser skiping %db\n", asf->packet_frag_size); |
| 0 | 571 asf->packet_size_left -= asf->packet_frag_size; |
| 572 continue; | |
| 573 } | |
| 574 } | |
| 575 if (asf->packet_replic_size == 1) { | |
| 576 // frag_offset is here used as the begining timestamp | |
| 577 asf->packet_frag_timestamp = asf->packet_time_start; | |
| 578 asf->packet_time_start += asf->packet_time_delta; | |
| 579 asf->packet_obj_size = asf->packet_frag_size = get_byte(pb); | |
| 580 asf->packet_size_left--; | |
| 581 asf->packet_multi_size--; | |
| 582 if (asf->packet_multi_size < asf->packet_obj_size) | |
| 583 { | |
| 584 asf->packet_time_start = 0; | |
| 585 url_fskip(pb, asf->packet_multi_size); | |
| 586 asf->packet_size_left -= asf->packet_multi_size; | |
| 587 continue; | |
| 588 } | |
| 589 asf->packet_multi_size -= asf->packet_obj_size; | |
| 590 //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); | |
| 591 } | |
| 592 if (asf_st->frag_offset == 0) { | |
| 593 /* new packet */ | |
| 594 av_new_packet(&asf_st->pkt, asf->packet_obj_size); | |
| 595 asf_st->seq = asf->packet_seq; | |
| 596 asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll; | |
| 597 asf_st->pkt.stream_index = asf->stream_index; | |
|
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
|
598 asf_st->packet_pos= asf->packet_pos; |
|
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
|
599 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", |
| 349 | 600 //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & PKT_FLAG_KEY, |
|
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
|
601 //s->streams[asf->stream_index]->codec.codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size); |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
602 if (s->streams[asf->stream_index]->codec.codec_type == CODEC_TYPE_AUDIO) |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
603 asf->packet_key_frame = 1; |
| 0 | 604 if (asf->packet_key_frame) |
| 605 asf_st->pkt.flags |= PKT_FLAG_KEY; | |
| 606 } | |
| 607 | |
| 608 /* read data */ | |
| 609 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", | |
| 610 // asf->packet_size, asf_st->pkt.size, asf->packet_frag_offset, | |
| 611 // asf_st->frag_offset, asf->packet_frag_size, asf_st->pkt.data); | |
| 612 asf->packet_size_left -= asf->packet_frag_size; | |
| 613 if (asf->packet_size_left < 0) | |
| 614 continue; | |
| 615 get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset, | |
| 616 asf->packet_frag_size); | |
| 617 asf_st->frag_offset += asf->packet_frag_size; | |
| 618 /* test if whole packet is read */ | |
| 619 if (asf_st->frag_offset == asf_st->pkt.size) { | |
| 620 /* return packet */ | |
| 621 if (asf_st->ds_span > 1) { | |
| 622 /* packet descrambling */ | |
| 623 char* newdata = av_malloc(asf_st->pkt.size); | |
| 624 if (newdata) { | |
| 625 int offset = 0; | |
| 626 while (offset < asf_st->pkt.size) { | |
| 627 int off = offset / asf_st->ds_chunk_size; | |
| 628 int row = off / asf_st->ds_span; | |
| 629 int col = off % asf_st->ds_span; | |
| 630 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; | |
| 631 //printf("off:%d row:%d col:%d idx:%d\n", off, row, col, idx); | |
| 632 memcpy(newdata + offset, | |
| 633 asf_st->pkt.data + idx * asf_st->ds_chunk_size, | |
| 634 asf_st->ds_chunk_size); | |
| 635 offset += asf_st->ds_chunk_size; | |
| 636 } | |
| 637 av_free(asf_st->pkt.data); | |
| 638 asf_st->pkt.data = newdata; | |
| 639 } | |
| 640 } | |
| 641 asf_st->frag_offset = 0; | |
| 642 memcpy(pkt, &asf_st->pkt, sizeof(AVPacket)); | |
| 643 //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size); | |
| 644 asf_st->pkt.size = 0; | |
| 645 asf_st->pkt.data = 0; | |
| 646 break; // packet completed | |
| 647 } | |
| 648 } | |
| 649 return 0; | |
| 650 } | |
| 651 | |
| 652 static int asf_read_close(AVFormatContext *s) | |
| 653 { | |
| 654 int i; | |
| 655 | |
| 656 for(i=0;i<s->nb_streams;i++) { | |
| 657 AVStream *st = s->streams[i]; | |
| 658 av_free(st->priv_data); | |
| 659 av_free(st->codec.extradata); | |
|
297
85d558a18134
Make avi and asf demuxer export palette in palctrl
rtognimp
parents:
277
diff
changeset
|
660 av_free(st->codec.palctrl); |
| 0 | 661 } |
| 662 return 0; | |
| 663 } | |
| 664 | |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
665 // 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
|
666 // 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
|
667 // 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
|
668 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
|
669 { |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
670 ASFContext *asf = s->priv_data; |
| 349 | 671 ASFStream *asf_st; |
| 672 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
|
673 |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
674 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
|
675 asf->packet_timestamp_start = -1; |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
676 asf->packet_timestamp_end = -1; |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
677 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
|
678 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
|
679 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
|
680 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
|
681 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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 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
|
692 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
|
693 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
|
694 asf->packet_time_start = 0; |
| 349 | 695 |
| 696 for(i=0; i<s->nb_streams; i++){ | |
| 697 asf_st= s->streams[i]->priv_data; | |
| 698 av_free_packet(&asf_st->pkt); | |
| 699 asf_st->frag_offset=0; | |
| 700 asf_st->seq=0; | |
| 701 } | |
| 702 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
|
703 } |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
704 |
| 348 | 705 static int64_t asf_read_pts(AVFormatContext *s, int64_t *ppos, int stream_index) |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
706 { |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
707 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
|
708 AVPacket pkt1, *pkt = &pkt1; |
| 349 | 709 ASFStream *asf_st; |
| 710 int64_t pts; | |
| 348 | 711 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
|
712 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
|
713 int64_t start_pos[s->nb_streams]; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
714 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
715 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
|
716 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
|
717 } |
| 348 | 718 |
| 349 | 719 //printf("asf_read_pts\n"); |
|
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
720 url_fseek(&s->pb, pos*asf->packet_size + s->data_offset, SEEK_SET); |
| 349 | 721 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
|
722 for(;;){ |
| 349 | 723 if (av_read_frame(s, pkt) < 0){ |
|
370
845f9de2c883
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
355
diff
changeset
|
724 av_log(s, AV_LOG_INFO, "seek failed\n"); |
| 348 | 725 return AV_NOPTS_VALUE; |
| 349 | 726 } |
| 348 | 727 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
|
728 |
| 348 | 729 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
|
730 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
|
731 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
|
732 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
733 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
|
734 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
735 assert((asf_st->packet_pos - s->data_offset) % asf->packet_size == 0); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
736 pos= (asf_st->packet_pos - s->data_offset) / asf->packet_size; |
|
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
737 |
|
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
738 av_add_index_entry(s->streams[i], pos, pts, pos - start_pos[i] + 1, AVINDEX_KEYFRAME); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
739 start_pos[i]= pos + 1; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
740 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
741 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
|
742 break; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
743 } |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
744 } |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
745 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
746 *ppos= pos; |
| 349 | 747 //printf("found keyframe at %Ld stream %d stamp:%Ld\n", *ppos, stream_index, pts); |
| 348 | 748 |
| 749 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
|
750 } |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
751 |
|
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
752 static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts) |
| 0 | 753 { |
|
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
754 ASFContext *asf = s->priv_data; |
|
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
755 AVStream *st; |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
756 int64_t pos; |
| 349 | 757 int64_t pos_min, pos_max, pts_min, pts_max, cur_pts, pos_limit; |
| 355 | 758 int no_change; |
|
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
759 |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
760 if (stream_index == -1) |
| 348 | 761 stream_index= av_find_default_stream_index(s); |
| 762 | |
| 350 | 763 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
|
764 return -1; |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
765 |
|
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
766 pts_max= |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
767 pts_min= AV_NOPTS_VALUE; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
768 pos_max= pos_limit= -1; // gcc thinks its uninitalized |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
769 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
770 st= s->streams[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
|
771 if(st->index_entries){ |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
772 AVIndexEntry *e; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
773 int index; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
774 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
775 index= av_index_search_timestamp(st, pts); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
776 e= &st->index_entries[index]; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
777 if(e->timestamp <= pts){ |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
778 pos_min= e->pos; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
779 pts_min= e->timestamp; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
780 #ifdef DEBUG_SEEK |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
781 printf("unsing cached pos_min=0x%llx dts_min=%0.3f\n", |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
782 pos_min,pts_min / 90000.0); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
783 #endif |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
784 }else{ |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
785 assert(index==0); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
786 } |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
787 index++; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
788 if(index < st->nb_index_entries){ |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
789 e= &st->index_entries[index]; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
790 assert(e->timestamp >= pts); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
791 pos_max= e->pos; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
792 pts_max= e->timestamp; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
793 pos_limit= pos_max - e->min_distance; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
794 #ifdef DEBUG_SEEK |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
795 printf("unsing cached pos_max=0x%llx dts_max=%0.3f\n", |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
796 pos_max,pts_max / 90000.0); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
797 #endif |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
798 } |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
799 } |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
800 |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
801 if(pts_min == AV_NOPTS_VALUE){ |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
802 pos_min = 0; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
803 pts_min = asf_read_pts(s, &pos_min, 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
|
804 if (pts_min == AV_NOPTS_VALUE) return -1; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
805 } |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
806 if(pts_max == AV_NOPTS_VALUE){ |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
807 pos_max = (url_filesize(url_fileno(&s->pb)) - 1 - s->data_offset) / asf->packet_size; //FIXME wrong |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
808 pts_max = s->duration; //FIXME wrong |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
809 pos_limit= pos_max; |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
810 } |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
811 |
| 355 | 812 no_change=0; |
| 349 | 813 while (pos_min < pos_limit) { |
| 814 int64_t start_pos; | |
| 815 assert(pos_limit <= pos_max); | |
|
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
816 |
| 355 | 817 if(no_change==0){ |
| 818 int64_t approximate_keyframe_distance= pos_max - pos_limit; | |
| 819 // interpolate position (better than dichotomy) | |
| 820 pos = (int64_t)((double)(pos_max - pos_min) * | |
| 821 (double)(pts - pts_min) / | |
| 822 (double)(pts_max - pts_min)) + pos_min - approximate_keyframe_distance; | |
| 823 }else if(no_change==1){ | |
| 824 // bisection, if interpolation failed to change min or max pos last time | |
| 825 pos = (pos_min + pos_limit)>>1; | |
| 826 }else{ | |
| 827 // linear search if bisection failed, can only happen if there are very few or no keyframes between min/max | |
| 828 pos=pos_min; | |
| 829 } | |
| 349 | 830 if(pos <= pos_min) |
|
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
831 pos= pos_min + 1; |
| 349 | 832 else if(pos > pos_limit) |
| 833 pos= pos_limit; | |
| 834 start_pos= pos; | |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
835 |
|
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
836 // read the next timestamp |
| 348 | 837 cur_pts = asf_read_pts(s, &pos, stream_index); |
| 355 | 838 if(pos == pos_max) |
| 839 no_change++; | |
| 840 else | |
| 841 no_change=0; | |
| 842 | |
|
354
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
843 #ifdef DEBUG_SEEK |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
844 printf("%Ld %Ld %Ld / %Ld %Ld %Ld target:%Ld limit:%Ld start:%Ld\n", pos_min, pos, pos_max, pts_min, cur_pts, pts_max, pts, pos_limit, start_pos); |
|
6770ca07abe2
store searched distance in index, so we dont waste time searching for keyframes where we already searched
michael
parents:
353
diff
changeset
|
845 #endif |
| 355 | 846 assert (cur_pts != AV_NOPTS_VALUE); |
| 847 if (pts < cur_pts) { | |
|
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
848 pos_limit = start_pos - 1; |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
849 pos_max = pos; |
| 349 | 850 pts_max = cur_pts; |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
851 } else { |
| 349 | 852 pos_min = pos; |
| 853 pts_min = cur_pts; | |
| 854 /* check if we are lucky */ | |
| 855 if (pts == cur_pts) | |
| 856 break; | |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
857 } |
|
312
8a04d2e1be2f
frame rate should be completely disabled in asf (closer now) - disabled seek
bellard
parents:
300
diff
changeset
|
858 } |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
859 pos = pos_min; |
|
351
c072833fe7f4
use packet number instead of byte number internally for seeking
michael
parents:
350
diff
changeset
|
860 url_fseek(&s->pb, pos*asf->packet_size + s->data_offset, SEEK_SET); |
|
347
2b485a3c5cfb
seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
michael
parents:
341
diff
changeset
|
861 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
|
862 return 0; |
| 0 | 863 } |
| 864 | |
| 865 static AVInputFormat asf_iformat = { | |
| 866 "asf", | |
| 867 "asf format", | |
| 868 sizeof(ASFContext), | |
| 869 asf_probe, | |
| 870 asf_read_header, | |
| 871 asf_read_packet, | |
| 872 asf_read_close, | |
| 873 asf_read_seek, | |
| 874 }; | |
| 875 | |
|
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
876 #ifdef CONFIG_ENCODERS |
|
372
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
877 extern AVOutputFormat asf_oformat; |
|
2e12cd1b68ed
split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
michael
parents:
370
diff
changeset
|
878 extern AVOutputFormat asf_stream_oformat; |
|
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
879 #endif //CONFIG_ENCODERS |
| 0 | 880 |
| 881 int asf_init(void) | |
| 882 { | |
| 883 av_register_input_format(&asf_iformat); | |
|
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
884 #ifdef CONFIG_ENCODERS |
| 0 | 885 av_register_output_format(&asf_oformat); |
| 886 av_register_output_format(&asf_stream_oformat); | |
|
277
a313e1080322
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
241
diff
changeset
|
887 #endif //CONFIG_ENCODERS |
| 0 | 888 return 0; |
| 889 } |
