Fix an off-by-two in the filter cutoff.

[c64tapwav] / audioreader.cpp

diff --git a/audioreader.cpp b/audioreader.cpp
index f0d07d8c08741acde3d13197f50503128a5bcdc9..1f95f131e495d6020efc7ecd3a0c391a896d952d 100644 (file)
--- a/audioreader.cpp
+++ b/audioreader.cpp
@@ -2,9 +2,12 @@
 
 extern "C" {
 
+#define __STDC_CONSTANT_MACROS
+
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswresample/swresample.h>
+#include <libavutil/avutil.h>
 
 }
 
@@ -22,7 +25,8 @@ struct AVFormatCloserAndDeleter {
 
 struct AVCodecContextDeleter {
        void operator() (AVCodecContext *ctx) {
-               avcodec_free_context(&ctx);
+               avcodec_close(ctx);
+               av_freep(&ctx);
        }
 };
 
@@ -38,11 +42,13 @@ struct AVPacketDeleter {
        }
 };
 
+#if (LIBAVCODEC_VERSION_MAJOR >= 55)
 struct AVFrameDeleter {
        void operator() (AVFrame *frame) {
                av_frame_free(&frame);
        }
 };
+#endif
 
 struct AVSampleDeleter {
        void operator() (uint8_t *data) {
@@ -50,25 +56,25 @@ struct AVSampleDeleter {
        }
 };
 
-void convert_samples(SwrContext *swr, int sample_rate, const uint8_t **data, int nb_samples, std::vector<int16_t> *samples)
+void convert_samples(SwrContext *swr, int sample_rate, const uint8_t **data, int nb_samples, std::vector<float> *samples)
 {
        int max_out_samples = nb_samples + swr_get_delay(swr, sample_rate);
        if (max_out_samples == 0) {
                return;
        }
        uint8_t *output;
-       av_samples_alloc(&output, nullptr, 1, max_out_samples, AV_SAMPLE_FMT_S16, 0);
+       av_samples_alloc(&output, nullptr, 1, max_out_samples, AV_SAMPLE_FMT_FLT, 0);
        std::unique_ptr<uint8_t, AVSampleDeleter> output_deleter(output);
 
        int out_samples = swr_convert(swr, &output, max_out_samples, data, nb_samples);
        if (out_samples > 0) {
-               const int16_t* start = reinterpret_cast<const int16_t *>(output);
-               const int16_t* end = start + out_samples;
+               const float* start = reinterpret_cast<const float *>(output);
+               const float* end = start + out_samples;
                samples->insert(samples->end(), start, end);
        }
 }
 
-int decode_packet(const char *filename, AVCodecContext *codec_ctx, SwrContext *swr, AVFrame *audio_frame, AVPacket *packet, int *got_frame, std::vector<int16_t> *samples)
+int decode_packet(const char *filename, AVCodecContext *codec_ctx, SwrContext *swr, AVFrame *audio_frame, AVPacket *packet, int *got_frame, std::vector<float> *samples)
 {
        *got_frame = 0;
        int len1 = avcodec_decode_audio4(codec_ctx, audio_frame, got_frame, packet);
@@ -88,7 +94,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, int *sample_rate)
+bool read_audio_file(const char *filename, std::vector<float> *samples, int *sample_rate)
 {
        av_register_all();
 
@@ -141,7 +147,7 @@ bool read_audio_file(const char *filename, std::vector<int16_t> *samples, int *s
        }
        SwrContext *swr = swr_alloc_set_opts(
                nullptr,
-               AV_CH_LAYOUT_MONO, AV_SAMPLE_FMT_S16, codec_ctx->sample_rate,
+               AV_CH_LAYOUT_MONO, AV_SAMPLE_FMT_FLT, codec_ctx->sample_rate,
                codec_ctx->channel_layout, codec_ctx->sample_fmt, codec_ctx->sample_rate,
                0, nullptr);
        std::unique_ptr<SwrContext, SwrContextDeleter> swr_deleter(swr);
@@ -151,8 +157,13 @@ bool read_audio_file(const char *filename, std::vector<int16_t> *samples, int *s
        }
 
        AVPacket packet;
-       AVFrame* audio_frame = av_frame_alloc();
+#if (LIBAVCODEC_VERSION_MAJOR >= 55)
+       AVFrame *audio_frame = av_frame_alloc();
        std::unique_ptr<AVFrame, AVFrameDeleter> audio_frame_deleter(audio_frame);
+#else
+       AVFrame frame_holder {};
+       AVFrame *audio_frame = &frame_holder;
+#endif
        while (av_read_frame(format_ctx, &packet) >= 0) {
                std::unique_ptr<AVPacket, AVPacketDeleter> av_packet_deleter(&packet);