Avoid AVX-related crashes in FFmpeg by aligning buffer

This commit is contained in:
sfan5 2017-07-01 15:13:49 +02:00 committed by Alexander Kojevnikov
parent 07c13da27d
commit 766a36afc7

View File

@ -3,6 +3,11 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
extern "C" {
#include <libavutil/mem.h>
}
class FFTPlan; class FFTPlan;
class FFT class FFT
@ -17,8 +22,17 @@ class FFTPlan
public: public:
FFTPlan(int nbits) : FFTPlan(int nbits) :
input_size(1 << nbits), output_size((1 << (nbits - 1)) + 1), input_size(1 << nbits), output_size((1 << (nbits - 1)) + 1),
input(input_size), output(output_size) {} output(output_size)
virtual ~FFTPlan() {} {
// FFmpeg uses various assembly optimizations which expect
// input data to be aligned by up to 32 bytes (e.g. AVX)
this->input = (float*) av_malloc(sizeof(float) * input_size);
}
virtual ~FFTPlan()
{
av_freep(this->input);
}
int get_input_size() const { return this->input_size; } int get_input_size() const { return this->input_size; }
int get_output_size() const { return this->output_size; } int get_output_size() const { return this->output_size; }
@ -30,11 +44,11 @@ public:
virtual void execute() = 0; virtual void execute() = 0;
protected: protected:
float *get_input() { return this->input.data(); } float *get_input() { return this->input; }
private: private:
int input_size; int input_size;
int output_size; int output_size;
std::vector<float> input; float *input;
std::vector<float> output; std::vector<float> output;
}; };