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
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
|
diff -aruN quelcom-0.4.0_06/lib/qmp3frameheader.cc quelcom-0.4.0/lib/qmp3frameheader.cc
--- quelcom-0.4.0_06/lib/qmp3frameheader.cc 2001-02-23 04:29:12.000000000 -0800
+++ quelcom-0.4.0/lib/qmp3frameheader.cc 2002-10-27 16:10:10.000000000 -0800
@@ -4,6 +4,7 @@
# include "qmp3frameheader.hh"
# include "qexception.hh"
+# include "endian.hh"
#ifdef NLS
# include <locale.h>
@@ -46,21 +47,20 @@
static u_int32_t samplesPerFrame[4] = { 1152, 1152, 384, 0 };
-string qmp3frameheader::getLayer() { return string(layers[header->layer]);}
-u_int32_t qmp3frameheader::getSamplesPerFrame() { return samplesPerFrame[header->layer]; }
-string qmp3frameheader::getVersion() { return string(versions[header->version]);}
+string qmp3frameheader::getLayer() { return string(layers[header.layer]);}
+u_int32_t qmp3frameheader::getSamplesPerFrame() { return samplesPerFrame[header.layer]; }
+string qmp3frameheader::getVersion() { return string(versions[header.version]);}
-caddr_t qmp3frameheader::getMap() {return (caddr_t)header;}
+caddr_t qmp3frameheader::getMap() {return (caddr_t)mappedheader;}
void qmp3frameheader::remap(caddr_t p) {
-
- header = (struct header*)p;
+ setHeader(p);
}
-u_int32_t qmp3frameheader::getSignature() {return (*(u_int32_t*)header)&MASK;}
+u_int32_t qmp3frameheader::getSignature() {return letohl(*(u_int32_t *)mappedheader)&MASK;}
u_int32_t qmp3frameheader::getSampleRate() {
- return samplerates[header->version][header->samplerate];
+ return samplerates[header.version][header.samplerate];
}
@@ -76,28 +76,32 @@
bool qmp3frameheader::valid (caddr_t p) {
+ struct header header;
+
+ if (p == NULL)
+ return false;
- struct header *header = (struct header*)p;
+ copyHeader(&header, p);
- return ( (header->sync1 == 0xff) &&
- (header->sync2 == 0x7) &&
- (header->version != UNDEFINED_VERSION) &&
- (header->layer != 0) &&
- (header->bitrate != 0x0f) &&
- (header->samplerate != 0x03) &&
- (header->emphasis != 0x02) );
+ return ( (header.sync1 == 0xff) &&
+ (header.sync2 == 0x7) &&
+ (header.version != UNDEFINED_VERSION) &&
+ (header.layer != 0) &&
+ (header.bitrate != 0x0f) &&
+ (header.samplerate != 0x03) &&
+ (header.emphasis != 0x02) );
}
bool qmp3frameheader::valid () {
- return ! ( (header->sync1 != 0xff) ||
- (header->sync2 != 0x7) ||
- (header->version == UNDEFINED_VERSION) ||
- (header->layer == 0) ||
- (header->bitrate == 0x0f) ||
- (header->samplerate == 0x03) ||
- (header->emphasis == 0x02) );
+ return ! ( (header.sync1 != 0xff) ||
+ (header.sync2 != 0x7) ||
+ (header.version == UNDEFINED_VERSION) ||
+ (header.layer == 0) ||
+ (header.bitrate == 0x0f) ||
+ (header.samplerate == 0x03) ||
+ (header.emphasis == 0x02) );
}
@@ -105,26 +109,28 @@
bool qmp3frameheader::compatible(caddr_t p, u_int32_t signature) {
- return ((*(u_int32_t*)p)&(MASK)) == signature;
+ return (letohl(*(u_int32_t *)p)&MASK) == signature;
}
u_int32_t qmp3frameheader::setNext(u_int32_t bufsize) {
+ caddr_t supposed= (char*)mappedheader+getLength();
- caddr_t supposed= (char*)header+getLength();
+ setHeader(seek_header(supposed,bufsize,getSignature()));
- header = (struct header*) seek_header(supposed,bufsize,getSignature());
-
- return (char*)header-(char*)supposed;
+ return (char*)mappedheader-(char*)supposed;
}
u_int32_t qmp3frameheader::setNext(caddr_t endstream) {
- caddr_t previous = (caddr_t) header;
+ caddr_t previous = (caddr_t) mappedheader;
+ caddr_t next;
+
+ next = seek_header((char*)mappedheader+getLength(),(char*)endstream-(char*)mappedheader+1,getSignature());
- header = (struct header*) seek_header((char*)header+getLength(),(char*)endstream-(char*)header+1,getSignature());
+ setHeader(next);
- return (char*)header-(char*)previous-getLength();
+ return (char*)mappedheader-(char*)previous-getLength();
}
@@ -156,7 +162,59 @@
qmp3frameheader::qmp3frameheader(caddr_t p, u_int32_t bufsize, u_int32_t signature) {
- header = (struct header*) seek_header(p,bufsize,signature);
+ setHeader(seek_header(p,bufsize,signature));
+}
+
+
+void qmp3frameheader::setHeader(caddr_t p)
+{
+ mappedheader = (struct header *)p;
+ copyHeader(&header, p);
+}
+
+void qmp3frameheader::copyHeader(struct header *header, caddr_t p)
+{
+ unsigned char b = *(unsigned char *)p;
+
+ header->sync1 = b;
+
+ b = *(++p);
+ header->protection = b & 0x1;
+ header->layer = (b>>1) & 0x3;
+ header->version = (b>>3) & 0x3;
+ header->sync2 = (b>>5) & 0x7;
+
+ b = *(++p);
+ header->privat = b & 0x1;
+ header->padding = (b>>1) & 0x1;
+ header->samplerate = (b>>2) & 0x3;
+ header->bitrate = (b>>4) & 0xf;
+
+ b = *(++p);
+ header->emphasis = b & 0x3;
+ header->original = (b>>2) & 0x1;
+ header->copyright = (b>>3) & 0x1;
+ header->mode_extension = (b>>4) & 0x3;
+ header->channel_mode = (b>>6) & 0x3;
+}
+
+void qmp3frameheader::copyHeader(caddr_t p, struct header &header)
+{
+ *(p++) = header.sync1;
+
+ *(p++) = (header.protection |
+ header.layer << 1 |
+ header.version << 3 |
+ header.sync2 << 5);
+ *(p++) = (header.privat |
+ header.padding << 1 |
+ header.samplerate << 2 |
+ header.bitrate << 4);
+ *(p++) = (header.emphasis |
+ header.original << 2 |
+ header.copyright << 3 |
+ header.mode_extension << 4 |
+ header.channel_mode << 6);
}
@@ -164,20 +222,20 @@
switch (f) {
- case SYNC1: return header->sync1;
- case SYNC2: return header->sync2;
- case _VERSION: return header->version;
- case LAYER: return header->layer;
- case PROTECTION: return header->protection;
- case BITRATE: return header->bitrate;
- case SAMPLERATE: return header->samplerate;
- case PADDING: return header->padding;
- case PRIVAT: return header->privat;
- case CHANNEL_MODE: return header->channel_mode;
- case MODE_EXTENSION: return header->mode_extension;
- case COPYRIGHT: return header->copyright;
- case ORIGINAL: return header->original;
- case EMPHASIS: return header->emphasis;
+ case SYNC1: return header.sync1;
+ case SYNC2: return header.sync2;
+ case _VERSION: return header.version;
+ case LAYER: return header.layer;
+ case PROTECTION: return header.protection;
+ case BITRATE: return header.bitrate;
+ case SAMPLERATE: return header.samplerate;
+ case PADDING: return header.padding;
+ case PRIVAT: return header.privat;
+ case CHANNEL_MODE: return header.channel_mode;
+ case MODE_EXTENSION: return header.mode_extension;
+ case COPYRIGHT: return header.copyright;
+ case ORIGINAL: return header.original;
+ case EMPHASIS: return header.emphasis;
default:
throw qexception(__PRETTY_FUNCTION__,_("invalid field"));
// i pintar el valor...
@@ -189,34 +247,35 @@
switch (f) {
- case SYNC1: header->sync1 = v; break;
- case SYNC2: header->sync2 = v; break;
- case _VERSION: header->version = v; break;
- case LAYER: header->layer = v; break;
- case PROTECTION: header->protection = v; break;
- case BITRATE: header->bitrate = v; break;
- case SAMPLERATE: header->samplerate = v; break;
- case PADDING: header->padding = v; break;
- case PRIVAT: header->privat = v; break;
- case CHANNEL_MODE: header->channel_mode = v; break;
- case MODE_EXTENSION: header->mode_extension = v; break;
- case COPYRIGHT: header->copyright = v; break;
- case ORIGINAL: header->original = v; break;
- case EMPHASIS: header->emphasis = v; break;
+ case SYNC1: header.sync1 = v; break;
+ case SYNC2: header.sync2 = v; break;
+ case _VERSION: header.version = v; break;
+ case LAYER: header.layer = v; break;
+ case PROTECTION: header.protection = v; break;
+ case BITRATE: header.bitrate = v; break;
+ case SAMPLERATE: header.samplerate = v; break;
+ case PADDING: header.padding = v; break;
+ case PRIVAT: header.privat = v; break;
+ case CHANNEL_MODE: header.channel_mode = v; break;
+ case MODE_EXTENSION: header.mode_extension = v; break;
+ case COPYRIGHT: header.copyright = v; break;
+ case ORIGINAL: header.original = v; break;
+ case EMPHASIS: header.emphasis = v; break;
default:
throw qexception(__PRETTY_FUNCTION__,_("invalid field"));
// i pintar el valor...
}
+ copyHeader((caddr_t)mappedheader, header);
}
u_int32_t qmp3frameheader::getLength() {
- if (header->layer!=LAYER3)
+ if (header.layer!=LAYER3)
throw qexception (__PRETTY_FUNCTION__,_("layer not supported"));
// i dir quin valor...
- return (144 * getBitRate() * 1000) / getSampleRate() + header->padding;
+ return (144 * getBitRate() * 1000) / getSampleRate() + header.padding;
}
u_int32_t qmp3frameheader::getMsDuration() {
@@ -236,13 +295,13 @@
u_int32_t qmp3frameheader::getBitRate() {
- if (header->layer!=LAYER3)
+ if (header.layer!=LAYER3)
throw qexception (__PRETTY_FUNCTION__,_("only layer III is supported"));
- if (header->version==UNDEFINED_VERSION)
+ if (header.version==UNDEFINED_VERSION)
throw qexception (__PRETTY_FUNCTION__,_("undefined version"));
- return layer3_bitrates[header->version][header->bitrate];
+ return layer3_bitrates[header.version][header.bitrate];
}
diff -aruN quelcom-0.4.0_06/lib/qmp3frameheader.hh quelcom-0.4.0/lib/qmp3frameheader.hh
--- quelcom-0.4.0_06/lib/qmp3frameheader.hh 2002-10-15 22:15:59.000000000 -0700
+++ quelcom-0.4.0/lib/qmp3frameheader.hh 2002-10-27 16:33:11.000000000 -0800
@@ -42,9 +42,9 @@
mode_extension:2, /*!< type of joint stereo coding */
channel_mode:2; /*!< mono or which type of stereo */
};
-
+
//! pointer to the header (memory location where it is located)
- struct header *header;
+ struct header header, *mappedheader;
public:
@@ -104,6 +104,12 @@
qmp3frameheader();
qmp3frameheader(caddr_t p, u_int32_t bufsize = HEADERSIZE, u_int32_t signature=0);
+ // copy and endian-translate the frame header
+ static void copyHeader(struct header *header, caddr_t p);
+ static void copyHeader(caddr_t p, struct header &header);
+
+ void setHeader(caddr_t p);
+
// direct access to the header
u_int32_t get();
void set(u_int32_t h);
|
