From 15a830bdba2589de8b24f2aebe4ab9797da53b32 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 30 Oct 2005 15:07:40 +0000 Subject: Skip ID3v2 tags at the start of a FLAC file. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7689 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/flac.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'apps/codecs/flac.c') diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c index d975c1f..bbd45ec 100644 --- a/apps/codecs/flac.c +++ b/apps/codecs/flac.c @@ -73,7 +73,7 @@ struct FLACseekpoints { struct FLACseekpoints seekpoints[MAX_SUPPORTED_SEEKTABLE_SIZE]; int nseekpoints; -static bool flac_init(FLACContext* fc) +static bool flac_init(FLACContext* fc, int first_frame_offset) { unsigned char buf[255]; bool found_streaminfo=false; @@ -87,6 +87,11 @@ static bool flac_init(FLACContext* fc) ci->memset(fc,0,sizeof(FLACContext)); nseekpoints=0; + /* Skip any foreign tags at start of file */ + ci->seek_buffer(first_frame_offset); + + fc->metadatalength = first_frame_offset; + if (ci->read_filebuf(buf, 4) < 4) { return false; @@ -96,7 +101,7 @@ static bool flac_init(FLACContext* fc) { return false; } - fc->metadatalength = 4; + fc->metadatalength += 4; while (!endofmetadata) { if (ci->read_filebuf(buf, 4) < 4) @@ -199,8 +204,7 @@ bool flac_seek(FLACContext* fc, uint32_t newsample) { offset+=fc->metadatalength; - if ((off_t)offset < ci->filesize) { - ci->seek_buffer(offset); + if (ci->seek_buffer(offset)) { return true; } else { return false; @@ -240,7 +244,12 @@ enum codec_status codec_start(struct codec_api* api) next_track: - if (!flac_init(&fc)) { + if (codec_init(api)) { + LOGF("FLAC: Error initialising codec\n"); + return CODEC_ERROR; + } + + if (!flac_init(&fc,ci->id3->first_frame_offset)) { LOGF("FLAC: Error initialising codec\n"); return CODEC_ERROR; } -- cgit v1.1 kbox/log/apps/codecs/libffmpegFLAC/arm.S'>
path: root/apps/codecs/libffmpegFLAC/arm.S
blob: 8adca77ce5024bebbceec2bf0919a57a6b4d4205 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271