projects
/
wdq2wav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4159: Auto commit for Debian build
[wdq2wav.git]
/
wdq2wav.cpp
diff --git
a/wdq2wav.cpp
b/wdq2wav.cpp
index ddf75843c78813d9047aa4a94b7ddd34b84c84eb..87ab17783014e1954b5d84499abf34099d677f25 100644
(file)
--- a/
wdq2wav.cpp
+++ b/
wdq2wav.cpp
@@
-8,7
+8,7
@@
**
** Copyright (c) 2003 Kevin Rosenberg
**
**
** Copyright (c) 2003 Kevin Rosenberg
**
-** $Id: wdq2wav.cpp,v 1.2
6 2003/02/28 04:12:17
kevin Exp $
+** $Id: wdq2wav.cpp,v 1.2
7 2003/03/03 21:52:09
kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-26,13
+26,13
@@
#include <wdq2wav.h>
#include <wdq2wav.h>
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.2
6 2003/02/28 04:12:17
kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.2
7 2003/03/03 21:52:09
kevin Exp $";
bool g_quiet = false;
bool g_verbose = false;
bool g_debug = false;
bool g_quiet = false;
bool g_verbose = false;
bool g_debug = false;
-bool g_
preserv
e_zero = false;
-bool g_demean = false;
+bool g_
ignor
e_zero = false;
+bool g_d
ont_d
emean = false;
#ifdef WIN32
#ifdef WIN32
@@
-111,9
+111,8
@@
usage (const char* progname)
std::cout << "OPTIONS\n";
std::cout << " -p Play channel through audio system\n";
std::cout << " -q Supress all messages\n";
std::cout << "OPTIONS\n";
std::cout << " -p Play channel through audio system\n";
std::cout << " -q Supress all messages\n";
- std::cout << " -z Scale output with preserving zero point\n";
- std::cout << " -m Demean the data (subtract the mean value from each sample)\n";
- std::cout << " [Selecting this option automatically sets the -z option]\n";
+ std::cout << " -z Scale output without preserving zero point\n";
+ std::cout << " -m Do not demean the data (don't subtract the mean value from each sample)\n";
std::cout << " -v Verbose mode\n";
std::cout << " -d Debug mode\n";
std::cout << " -r Print program version\n";
std::cout << " -v Verbose mode\n";
std::cout << " -d Debug mode\n";
std::cout << " -r Print program version\n";
@@
-138,11
+137,10
@@
main (int argc, char *argv[])
g_quiet = true;
break;
case 'm':
g_quiet = true;
break;
case 'm':
- g_demean = true;
- g_preserve_zero = true; // auto set
+ g_dont_demean = true;
break;
case 'z':
break;
case 'z':
- g_
preserv
e_zero = true;
+ g_
ignor
e_zero = true;
break;
case 'v':
g_verbose = true;
break;
case 'v':
g_verbose = true;
@@
-510,7
+508,7
@@
WindaqChannel::read_channel_data ()
m_max_scaled_data = (m_slope * data_max) + m_intercept;
m_min_scaled_data = (m_slope * data_min) + m_intercept;
m_max_scaled_data = (m_slope * data_max) + m_intercept;
m_min_scaled_data = (m_slope * data_min) + m_intercept;
- if (
g
_demean) {
+ if (
! g_dont
_demean) {
double dmean = total_data / static_cast<double>(r_wdq.m_nSamples);
int mean = nearest<int>(dmean);
std::cout << "Removing mean: " << (dmean * m_slope) + m_intercept <<
double dmean = total_data / static_cast<double>(r_wdq.m_nSamples);
int mean = nearest<int>(dmean);
std::cout << "Removing mean: " << (dmean * m_slope) + m_intercept <<
@@
-536,17
+534,17
@@
WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname)
m_rate = wdq_channel.r_wdq.m_sample_rate;
double data_offset = 0, data_scale = 0;
m_rate = wdq_channel.r_wdq.m_sample_rate;
double data_offset = 0, data_scale = 0;
- if (g_preserve_zero) {
+ if (g_ignore_zero) {
+ data_offset = -wdq_channel.m_min_scaled_data;
+ if (wdq_channel.m_max_scaled_data != wdq_channel.m_min_scaled_data)
+ data_scale = 65535. / (wdq_channel.m_max_scaled_data -
+ wdq_channel.m_min_scaled_data);
+ } else {
double max_value = fabs(wdq_channel.m_max_scaled_data);
if (fabs (wdq_channel.m_min_scaled_data) > max_value)
max_value = fabs (wdq_channel.m_min_scaled_data);
if (max_value != 0.)
data_scale = 32767. / max_value;
double max_value = fabs(wdq_channel.m_max_scaled_data);
if (fabs (wdq_channel.m_min_scaled_data) > max_value)
max_value = fabs (wdq_channel.m_min_scaled_data);
if (max_value != 0.)
data_scale = 32767. / max_value;
- } else {
- data_offset = -wdq_channel.m_min_scaled_data;
- if (wdq_channel.m_max_scaled_data != wdq_channel.m_min_scaled_data)
- data_scale = 65535. / (wdq_channel.m_max_scaled_data -
- wdq_channel.m_min_scaled_data);
}
if (g_debug) {
}
if (g_debug) {
@@
-574,11
+572,11
@@
WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname)
for (i = 0; i < m_nSamples; i++) {
double value = input[i];
value = (slope * value) + intercept;
for (i = 0; i < m_nSamples; i++) {
double value = input[i];
value = (slope * value) + intercept;
- if (g_preserve_zero) {
- value = value * data_scale;
- } else {
+ if (g_ignore_zero) {
value = (value + data_offset) * data_scale;
value += 0.5 - 32768;
value = (value + data_offset) * data_scale;
value += 0.5 - 32768;
+ } else {
+ value = value * data_scale;
}
signed short int v = static_cast<signed short int>(value);
}
signed short int v = static_cast<signed short int>(value);