X-Git-Url: https://git.sesse.net/?p=c64tapwav;a=blobdiff_plain;f=decode.cpp;h=2a27371ac2db191c78c0119e812f8bad01834096;hp=5bb3b2c5edbe58f5b4c4b2bb7df3cc72a91fa101;hb=a730ecdfbf484d73677df2ee9e3635da9750b1bd;hpb=63deff31a441647619080ca046d1aa1c8edcea9e diff --git a/decode.cpp b/decode.cpp index 5bb3b2c..2a27371 100644 --- a/decode.cpp +++ b/decode.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -11,14 +12,22 @@ #include "tap.h" #define BUFSIZE 4096 -#define HYSTERESIS_LIMIT 3000 #define C64_FREQUENCY 985248 - #define SYNC_PULSE_START 1000 #define SYNC_PULSE_END 20000 #define SYNC_PULSE_LENGTH 378.0 #define SYNC_TEST_TOLERANCE 1.10 +#define NUM_FILTER_COEFF 32 + +static float hysteresis_limit = 3000.0 / 32768.0; +static bool do_calibrate = true; +static bool output_cycles_plot = false; +static bool use_filter = false; +static float filter_coeff[NUM_FILTER_COEFF] = { 1.0f }; // The rest is filled with 0. +static bool output_filtered = false; +static bool quiet = false; + // between [x,x+1] double find_zerocrossing(const std::vector &pcm, int x) { @@ -80,8 +89,10 @@ double calibrate(const std::vector &pulses) { sync_pulse_end = try_end; sync_pulse_stddev = stddev; } - fprintf(stderr, "Sync pulse length standard deviation: %.2f cycles\n", - sync_pulse_stddev); + if (!quiet) { + fprintf(stderr, "Sync pulse length standard deviation: %.2f cycles\n", + sync_pulse_stddev); + } double sum = 0.0; for (int i = SYNC_PULSE_START; i < sync_pulse_end; ++i) { @@ -89,8 +100,10 @@ double calibrate(const std::vector &pulses) { } double mean_length = C64_FREQUENCY * sum / (sync_pulse_end - SYNC_PULSE_START); double calibration_factor = SYNC_PULSE_LENGTH / mean_length; - fprintf(stderr, "Calibrated sync pulse length: %.2f -> %.2f (change %+.2f%%)\n", - mean_length, SYNC_PULSE_LENGTH, 100.0 * (calibration_factor - 1.0)); + if (!quiet) { + fprintf(stderr, "Calibrated sync pulse length: %.2f -> %.2f (change %+.2f%%)\n", + mean_length, SYNC_PULSE_LENGTH, 100.0 * (calibration_factor - 1.0)); + } // Check for pulses outside +/- 10% (sign of misdetection). for (int i = SYNC_PULSE_START; i < sync_pulse_end; ++i) { @@ -103,29 +116,136 @@ double calibrate(const std::vector &pulses) { return calibration_factor; } - -int main(int argc, char **argv) + +void output_tap(const std::vector& pulses, double calibration_factor) { - make_lanczos_weight_table(); - std::vector pcm; - int sample_rate; - if (!read_audio_file(argv[1], &pcm, &sample_rate)) { - exit(1); + std::vector tap_data; + for (unsigned i = 0; i < pulses.size(); ++i) { + double cycles = pulses[i].len * calibration_factor * C64_FREQUENCY; + int len = lrintf(cycles / TAP_RESOLUTION); + if (i > SYNC_PULSE_END && (cycles < 100 || cycles > 800)) { + fprintf(stderr, "Cycle with downflank at %.6f was detected at %.0f cycles; misdetect?\n", + pulses[i].time, cycles); + } + if (len <= 255) { + tap_data.push_back(len); + } else { + int overflow_len = lrintf(cycles); + tap_data.push_back(0); + tap_data.push_back(overflow_len & 0xff); + tap_data.push_back((overflow_len >> 8) & 0xff); + tap_data.push_back(overflow_len >> 16); + } } -#if 0 - for (int i = 0; i < LEN; ++i) { - in[i] += rand() % 10000; + tap_header hdr; + memcpy(hdr.identifier, "C64-TAPE-RAW", 12); + hdr.version = 1; + hdr.reserved[0] = hdr.reserved[1] = hdr.reserved[2] = 0; + hdr.data_len = tap_data.size(); + + fwrite(&hdr, sizeof(hdr), 1, stdout); + fwrite(tap_data.data(), tap_data.size(), 1, stdout); +} + +static struct option long_options[] = { + {"no-calibrate", 0, 0, 's' }, + {"plot-cycles", 0, 0, 'p' }, + {"hysteresis-limit", required_argument, 0, 'l' }, + {"filter", required_argument, 0, 'f' }, + {"output-filtered", 0, 0, 'F' }, + {"quiet", 0, 0, 'q' }, + {"help", 0, 0, 'h' }, + {0, 0, 0, 0 } +}; + +void help() +{ + fprintf(stderr, "decode [OPTIONS] AUDIO-FILE > TAP-FILE\n"); + fprintf(stderr, "\n"); + fprintf(stderr, " -s, --no-calibrate do not try to calibrate on sync pulse length\n"); + fprintf(stderr, " -p, --plot-cycles output debugging info to cycles.plot\n"); + fprintf(stderr, " -l, --hysteresis-limit VAL change amplitude threshold for ignoring pulses (0..32768)\n"); + fprintf(stderr, " -f, --filter C1:C2:C3:... specify FIR filter (up to %d coefficients)\n", NUM_FILTER_COEFF); + fprintf(stderr, " -F, --output-filtered output filtered waveform to filtered.raw\n"); + fprintf(stderr, " -q, --quiet suppress some informational messages\n"); + fprintf(stderr, " -h, --help display this help, then exit\n"); + exit(1); +} + +void parse_options(int argc, char **argv) +{ + for ( ;; ) { + int option_index = 0; + int c = getopt_long(argc, argv, "spl:f:Fqh", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 's': + do_calibrate = false; + break; + + case 'p': + output_cycles_plot = true; + break; + + case 'l': + hysteresis_limit = atof(optarg) / 32768.0; + break; + + case 'f': { + const char *coeffstr = strtok(optarg, ":"); + int coeff_index = 0; + while (coeff_index < NUM_FILTER_COEFF && coeffstr != NULL) { + filter_coeff[coeff_index++] = atof(coeffstr); + coeffstr = strtok(NULL, ":"); + } + use_filter = true; + break; + } + + case 'F': + output_filtered = true; + break; + + case 'q': + quiet = true; + break; + + case 'h': + default: + help(); + exit(1); + } } -#endif +} -#if 0 - for (int i = 0; i < LEN; ++i) { - printf("%d\n", in[i]); +// TODO: Support AVX here. +std::vector do_filter(const std::vector& pcm, const float* filter) +{ + std::vector filtered_pcm; + filtered_pcm.reserve(pcm.size()); + for (unsigned i = NUM_FILTER_COEFF; i < pcm.size(); ++i) { + float s = 0.0f; + for (int j = 0; j < NUM_FILTER_COEFF; ++j) { + s += filter[j] * pcm[i - j]; + } + filtered_pcm.push_back(s); } -#endif - std::vector pulses; // in seconds + if (output_filtered) { + FILE *fp = fopen("filtered.raw", "wb"); + fwrite(filtered_pcm.data(), filtered_pcm.size() * sizeof(filtered_pcm[0]), 1, fp); + fclose(fp); + } + + return filtered_pcm; +} + +std::vector detect_pulses(const std::vector &pcm, int sample_rate) +{ + std::vector pulses; // Find the flanks. int last_bit = -1; @@ -133,14 +253,14 @@ int main(int argc, char **argv) for (unsigned i = 0; i < pcm.size(); ++i) { int bit = (pcm[i] > 0) ? 1 : 0; if (bit == 0 && last_bit == 1) { - // Check if we ever go up above HYSTERESIS_LIMIT before we dip down again. + // Check if we ever go up above before we dip down again. bool true_pulse = false; unsigned j; int min_level_after = 32767; for (j = i; j < pcm.size(); ++j) { min_level_after = std::min(min_level_after, pcm[j]); if (pcm[j] > 0) break; - if (pcm[j] < -HYSTERESIS_LIMIT) { + if (pcm[j] < -hysteresis_limit) { true_pulse = true; break; } @@ -149,7 +269,7 @@ 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; @@ -167,53 +287,51 @@ int main(int argc, char **argv) } last_bit = bit; } + return pulses; +} - double calibration_factor = calibrate(pulses); +int main(int argc, char **argv) +{ + parse_options(argc, argv); - FILE *fp = fopen("cycles.plot", "w"); - std::vector tap_data; - for (unsigned i = 0; i < pulses.size(); ++i) { - double cycles = pulses[i].len * calibration_factor * C64_FREQUENCY; - fprintf(fp, "%f %f\n", pulses[i].time, cycles); - int len = lrintf(cycles / TAP_RESOLUTION); - if (i > SYNC_PULSE_END && (cycles < 100 || cycles > 800)) { - fprintf(stderr, "Cycle with downflank at %.6f was detected at %.0f cycles; misdetect?\n", - pulses[i].time, cycles); - } - if (len <= 255) { - tap_data.push_back(len); - } else { - int overflow_len = lrintf(cycles); - tap_data.push_back(0); - tap_data.push_back(overflow_len & 0xff); - tap_data.push_back((overflow_len >> 8) & 0xff); - tap_data.push_back(overflow_len >> 16); - } + make_lanczos_weight_table(); + std::vector pcm; + int sample_rate; + if (!read_audio_file(argv[optind], &pcm, &sample_rate)) { + exit(1); } - fclose(fp); - tap_header hdr; - memcpy(hdr.identifier, "C64-TAPE-RAW", 12); - hdr.version = 1; - hdr.reserved[0] = hdr.reserved[1] = hdr.reserved[2] = 0; - hdr.data_len = tap_data.size(); + if (use_filter) { + pcm = do_filter(pcm, filter_coeff); + } - fwrite(&hdr, sizeof(hdr), 1, stdout); - fwrite(tap_data.data(), tap_data.size(), 1, stdout); +#if 0 + for (int i = 0; i < LEN; ++i) { + in[i] += rand() % 10000; + } +#endif - // Output a debug raw file with pulse detection points. - fp = fopen("debug.raw", "wb"); - short one = 32767; - 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); - if (i >= next_pulse) { - fwrite(&one, sizeof(one), 1, fp); - ++pulsenum; - } else { - fwrite(&zero, sizeof(zero), 1, fp); +#if 0 + for (int i = 0; i < LEN; ++i) { + printf("%d\n", in[i]); + } +#endif + + std::vector pulses = detect_pulses(pcm, sample_rate); + + double calibration_factor = 1.0; + if (do_calibrate) { + calibration_factor = calibrate(pulses); + } + + if (output_cycles_plot) { + FILE *fp = fopen("cycles.plot", "w"); + for (unsigned i = 0; i < pulses.size(); ++i) { + double cycles = pulses[i].len * calibration_factor * C64_FREQUENCY; + fprintf(fp, "%f %f\n", pulses[i].time, cycles); } + fclose(fp); } - fclose(fp); + + output_tap(pulses, calibration_factor); }