annotate asf.c @ 651:6a5ba24b2c6b libavformat

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