Skip to content

Fix compatibility with FFmpeg 8 #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hannesbraun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compatibility with FFmpeg 8 #338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions src/spek-fft.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#define __STDC_CONSTANT_MACROS
extern "C" {
#include <libavcodec/avfft.h>
#include <libavutil/tx.h>
}

#include "spek-fft.h"
Expand All @@ -16,35 +16,42 @@ class FFTPlanImpl : public FFTPlan
void execute() override;

private:
struct RDFTContext *cx;
struct AVTXContext *cx;
av_tx_fn tx;
float* tmp;
const int len;
};

std::unique_ptr<FFTPlan> FFT::create(int nbits)
{
return std::unique_ptr<FFTPlan>(new FFTPlanImpl(nbits));
}

FFTPlanImpl::FFTPlanImpl(int nbits) : FFTPlan(nbits), cx(av_rdft_init(nbits, DFT_R2C))
FFTPlanImpl::FFTPlanImpl(int nbits) : FFTPlan(nbits), len(1 << nbits)
{
const float scale = 1.0;
av_tx_init(&this->cx, &this->tx, AV_TX_FLOAT_RDFT, 0, this->len, &scale, 0);
this->tmp = (float*) av_malloc((this->len + 2) * sizeof(float));
}

FFTPlanImpl::~FFTPlanImpl()
{
av_rdft_end(this->cx);
av_tx_uninit(&this->cx);
av_freep(&this->tmp);
}

void FFTPlanImpl::execute()
{
av_rdft_calc(this->cx, this->get_input());
this->tx(this->cx, this->tmp, this->get_input(), sizeof(AVComplexFloat));

// Calculate magnitudes.
int n = this->get_input_size();
float n2 = n * n;
this->set_output(0, 10.0f * log10f(this->get_input(0) * this->get_input(0) / n2));
this->set_output(n / 2, 10.0f * log10f(this->get_input(1) * this->get_input(1) / n2));
this->set_output(0, 10.0f * log10f(this->tmp[0] * this->tmp[0] / n2));
for (int i = 1; i < n / 2; i++) {
float re = this->get_input(i * 2);
float im = this->get_input(i * 2 + 1);
float re = this->tmp[i * 2];
float im = this->tmp[i * 2 + 1];
this->set_output(i, 10.0f * log10f((re * re + im * im) / n2));
}
this->set_output(n / 2, 10.0f * log10f(this->tmp[this->len] * this->tmp[this->len] / n2));
}