Diffstat (limited to 'noncore/multimedia/opierec/wavFile.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opierec/wavFile.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp index 7e9b50f..fc0130c 100644 --- a/noncore/multimedia/opierec/wavFile.cpp +++ b/noncore/multimedia/opierec/wavFile.cpp | |||
@@ -143,26 +143,27 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) { | |||
143 | 143 | ||
144 | // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels | 144 | // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels |
145 | (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels | 145 | (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels |
146 | 146 | ||
147 | (*hdr).sampleRate = wavSampleRate; //samples per second | 147 | (*hdr).sampleRate = wavSampleRate; //samples per second |
148 | (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second | 148 | (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second |
149 | (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align | 149 | (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align |
150 | (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16 | 150 | (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16 |
151 | 151 | ||
152 | strncpy((*hdr).dataID, "data", 4); | 152 | strncpy((*hdr).dataID, "data", 4); |
153 | 153 | ||
154 | write( fd,hdr, sizeof(*hdr)); | 154 | write( fd,hdr, sizeof(*hdr)); |
155 | qDebug("writing header: bitrate%d, samplerate %d, channels %d", | 155 | odebug << "writing header: bitrate " << wavResolution |
156 | wavResolution, wavSampleRate, wavChannels); | 156 | << ", samplerate " << wavSampleRate |
157 | << ", channels " << wavChannels << oendl; | ||
157 | return true; | 158 | return true; |
158 | } | 159 | } |
159 | 160 | ||
160 | bool WavFile::adjustHeaders(int fd, int total) { | 161 | bool WavFile::adjustHeaders(int fd, int total) { |
161 | lseek(fd, 4, SEEK_SET); | 162 | lseek(fd, 4, SEEK_SET); |
162 | int i = total + 36; | 163 | int i = total + 36; |
163 | write( fd, &i, sizeof(i)); | 164 | write( fd, &i, sizeof(i)); |
164 | lseek( fd, 40, SEEK_SET); | 165 | lseek( fd, 40, SEEK_SET); |
165 | write( fd, &total, sizeof(total)); | 166 | write( fd, &total, sizeof(total)); |
166 | odebug << "adjusting header " << total << "" << oendl; | 167 | odebug << "adjusting header " << total << "" << oendl; |
167 | return true; | 168 | return true; |
168 | } | 169 | } |
@@ -203,26 +204,25 @@ int WavFile::parseWavHeader(int fd) { | |||
203 | if (read(fd, &longdata, 4) < 4) { | 204 | if (read(fd, &longdata, 4) < 4) { |
204 | odebug << "Could not read from sound file.\n" << oendl; | 205 | odebug << "Could not read from sound file.\n" << oendl; |
205 | return -1; | 206 | return -1; |
206 | } | 207 | } |
207 | lseek(fd, longdata, SEEK_CUR); | 208 | lseek(fd, longdata, SEEK_CUR); |
208 | } else { | 209 | } else { |
209 | lseek(fd, 4, SEEK_CUR); | 210 | lseek(fd, 4, SEEK_CUR); |
210 | if (read(fd, &fmt, 2) < 2) { | 211 | if (read(fd, &fmt, 2) < 2) { |
211 | odebug << "Could not read format chunk.\n" << oendl; | 212 | odebug << "Could not read format chunk.\n" << oendl; |
212 | return -1; | 213 | return -1; |
213 | } | 214 | } |
214 | if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { | 215 | if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { |
215 | qDebug("Wave file contains unknown format." | 216 | odebug << "Wave file contains unknown format. Unable to continue.\n" << oendl; |
216 | " Unable to continue.\n"); | ||
217 | return -1; | 217 | return -1; |
218 | } | 218 | } |
219 | wavFormat = fmt; | 219 | wavFormat = fmt; |
220 | // compressionFormat=fmt; | 220 | // compressionFormat=fmt; |
221 | odebug << "compressionFormat is " << fmt << "" << oendl; | 221 | odebug << "compressionFormat is " << fmt << "" << oendl; |
222 | if (read(fd, &ch, 2) < 2) { | 222 | if (read(fd, &ch, 2) < 2) { |
223 | odebug << "Could not read format chunk.\n" << oendl; | 223 | odebug << "Could not read format chunk.\n" << oendl; |
224 | return -1; | 224 | return -1; |
225 | } else { | 225 | } else { |
226 | wavChannels = ch; | 226 | wavChannels = ch; |
227 | odebug << "File has " << ch << " channels" << oendl; | 227 | odebug << "File has " << ch << " channels" << oendl; |
228 | } | 228 | } |
@@ -257,26 +257,28 @@ int WavFile::parseWavHeader(int fd) { | |||
257 | if (read(fd, &longdata, 4)<4) { | 257 | if (read(fd, &longdata, 4)<4) { |
258 | odebug << "Could not read from sound file.\n" << oendl; | 258 | odebug << "Could not read from sound file.\n" << oendl; |
259 | return -1; | 259 | return -1; |
260 | } | 260 | } |
261 | 261 | ||
262 | lseek(fd, longdata, SEEK_CUR); | 262 | lseek(fd, longdata, SEEK_CUR); |
263 | } else { | 263 | } else { |
264 | if (read(fd, &longdata, 4) < 4) { | 264 | if (read(fd, &longdata, 4) < 4) { |
265 | odebug << "Could not read from sound file.\n" << oendl; | 265 | odebug << "Could not read from sound file.\n" << oendl; |
266 | return -1; | 266 | return -1; |
267 | } else { | 267 | } else { |
268 | wavNumberSamples = longdata; | 268 | wavNumberSamples = longdata; |
269 | qDebug("file has length of %d \nlasting %d seconds", (int)longdata, | 269 | odebug << "file hase length of " << (int)longdata << "\n" |
270 | (int)(( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) ); | 270 | << "lasting " |
271 | << (int)(( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) | ||
272 | << " seconds" << oendl; | ||
271 | // wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)); | 273 | // wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)); |
272 | 274 | ||
273 | return longdata; | 275 | return longdata; |
274 | } | 276 | } |
275 | } | 277 | } |
276 | } | 278 | } |
277 | 279 | ||
278 | lseek(fd, 0, SEEK_SET); | 280 | lseek(fd, 0, SEEK_SET); |
279 | 281 | ||
280 | return 0; | 282 | return 0; |
281 | } | 283 | } |
282 | 284 | ||