Mike-Solar
3a3ead6fc0
Replace every direct FFmpeg call in the editor and the render worker with the pure C ffmpeg_bridge API, wrapped in thin C++ adapters that preserve the original interfaces: - avframeptr.h: olive::AVFrame adapter around FBFrame handles - ffmpegutils: format conversion helpers on FB_* constants; the int overload is renamed GetCompatibleBridgePixelFormat to avoid a silent overload-resolution trap with the PixelFormat enum - ffmpegdecoder/ffmpegencoder: rewritten as handle-based adapters over FBDecoder/FBProbe/FBEncoder/FBScaler/FBResampler - audioprocessor: FBAudioGraph push/pull adapter - pluginrenderer/OliveClip: sws/pixdesc usage converted to FBScaler and fb_pix_fmt_* queries - AudioParams/channel layouts are plain uint64_t masks everywhere Build integration: the root project no longer links FFMPEG directly; only ffmpeg_bridge does. Binaries resolve the bridge library at runtime via @loader_path inside the macOS app bundle (copied there post-build) and via $ORIGIN/../ffmpeg_bridge/bin on Linux; on Windows the DLL is installed next to the executables, so packages on all three platforms ship the bridge library. ffmpeg_bridge gains the extra API the adapters need: fb_frame_make_writable, fb_decoder_get_format_duration, fb_resampler_convert_frame, FB_PIX_FMT_YUV440P, SRT validation in fb_probe_read_subtitle_stream, packed/planar fixes in fb_encoder_write_audio, and a component-size fix in fb_pix_fmt_component_size.
83 lines
1.6 KiB
C++
83 lines
1.6 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#ifndef AUDIOPROCESSOR_H
|
|
#define AUDIOPROCESSOR_H
|
|
|
|
#include <inttypes.h>
|
|
#include <olive/core/core.h>
|
|
#include <QByteArray>
|
|
|
|
#include <ffmpeg_bridge/ffmpeg_bridge.h>
|
|
|
|
#include "common/define.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
using namespace core;
|
|
|
|
class AudioProcessor {
|
|
public:
|
|
AudioProcessor();
|
|
|
|
~AudioProcessor();
|
|
|
|
DISABLE_COPY_MOVE(AudioProcessor)
|
|
|
|
bool Open(const AudioParams &from, const AudioParams &to,
|
|
double tempo = 1.0);
|
|
|
|
void Close();
|
|
|
|
bool IsOpen() const
|
|
{
|
|
return graph_;
|
|
}
|
|
|
|
using Buffer = QVector<QByteArray>;
|
|
int Convert(float **in, int nb_in_samples, AudioProcessor::Buffer *output);
|
|
|
|
void Flush();
|
|
|
|
const AudioParams &from() const
|
|
{
|
|
return from_;
|
|
}
|
|
const AudioParams &to() const
|
|
{
|
|
return to_;
|
|
}
|
|
|
|
private:
|
|
FBAudioGraph *graph_;
|
|
|
|
AudioParams from_;
|
|
|
|
AudioParams to_;
|
|
|
|
FBFrame *out_frame_;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // AUDIOPROCESSOR_H
|