Support any sample rate, not only 44100 Hz.

diff --git a/audioreader.cpp b/audioreader.cpp
index b95dbf410c07df6b7786673df0c4875d13744d11..f0d07d8c08741acde3d13197f50503128a5bcdc9 100644 (file)
--- a/audioreader.cpp
+++ b/audioreader.cpp
@@ -88,7 +88,7 @@ int decode_packet(const char *filename, AVCodecContext *codec_ctx, SwrContext *s
 
 }  // namespace
 
-bool read_audio_file(const char *filename, std::vector<int16_t> *samples)
+bool read_audio_file(const char *filename, std::vector<int16_t> *samples, int *sample_rate)
 {
        av_register_all();
 
@@ -190,5 +190,7 @@ bool read_audio_file(const char *filename, std::vector<int16_t> *samples)
        // Convert any leftover samples from the converter.
        convert_samples(swr, codec_ctx->sample_rate, nullptr, 0, samples);
 
+       *sample_rate = codec_ctx->sample_rate;
+
        return true;
 }

diff --git a/audioreader.h b/audioreader.h
index 273ebd2b6ef934cd2f05a119086cce1988149ffc..47bb8f50b02a5db702e0fa1b474e8a8e136a53fa 100644 (file)
--- a/audioreader.h
+++ b/audioreader.h
@@ -5,6 +5,6 @@
 
 #include <stdint.h>
 
-bool read_audio_file(const char *filename, std::vector<int16_t> *samples);
+bool read_audio_file(const char *filename, std::vector<int16_t> *samples, int *sample_rate);
 
 #endif  // !defined(_AUDIOREADER_H)

diff --git a/decode.cpp b/decode.cpp
index e85f57934e685f214f4cda1cf02fc247a9a332fa..c5aa9669d0c473e8fe92911cc9cd348da3839159 100644 (file)
--- a/decode.cpp
+++ b/decode.cpp
@@ -12,7 +12,6 @@
 
 #define BUFSIZE 4096
 #define HYSTERESIS_LIMIT 3000
-#define SAMPLE_RATE 44100
 #define C64_FREQUENCY 985248
 
 #define SYNC_PULSE_START 1000
@@ -56,7 +55,8 @@ int main(int argc, char **argv)
 {
        make_lanczos_weight_table();
        std::vector<short> pcm;
-       if (!read_audio_file(argv[1], &pcm)) {
+       int sample_rate;
+       if (!read_audio_file(argv[1], &pcm, &sample_rate)) {
                exit(1);
        }
 
@@ -96,14 +96,14 @@ int main(int argc, char **argv)
                        if (!true_pulse) {
 #if 0
                                fprintf(stderr, "Ignored down-flank at %.6f seconds due to hysteresis (%d < %d).\n",
-                                       double(i) / SAMPLE_RATE, -min_level_after, HYSTERESIS_LIMIT);
+                                       double(i) / sample_rate, -min_level_after, HYSTERESIS_LIMIT);
 #endif
                                i = j;
                                continue;
                        } 
 
                        // down-flank!
-                       double t = find_zerocrossing(pcm, i - 1) * (1.0 / SAMPLE_RATE);
+                       double t = find_zerocrossing(pcm, i - 1) * (1.0 / sample_rate);
                        if (last_downflank > 0) {
                                pulse p;
                                p.time = t;
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
        short zero = 0;
        unsigned pulsenum = 0;
        for (unsigned i = 0; i < pcm.size(); ++i) {
-               unsigned next_pulse = (pulsenum >= pulses.size()) ? INT_MAX : int(pulses[pulsenum].time * SAMPLE_RATE);
+               unsigned next_pulse = (pulsenum >= pulses.size()) ? INT_MAX : int(pulses[pulsenum].time * sample_rate);
                if (i >= next_pulse) {
                        fwrite(&one, sizeof(one), 1, fp);
                        ++pulsenum;