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.
87 lines
2.2 KiB
C++
87 lines
2.2 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 FFMPEGENCODER_H
|
|
#define FFMPEGENCODER_H
|
|
|
|
#include <ffmpeg_bridge/ffmpeg_bridge.h>
|
|
|
|
#include "codec/encoder.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
/**
|
|
* @brief An Encoder derivative that uses the ffmpeg_bridge library for encoding
|
|
*
|
|
* All encoding work happens inside the ffmpeg_bridge shared library through
|
|
* its pure C API; this class only translates EncodingParams into a bridge
|
|
* configuration and forwards calls.
|
|
*/
|
|
class FFmpegEncoder : public Encoder {
|
|
Q_OBJECT
|
|
public:
|
|
FFmpegEncoder(const EncodingParams ¶ms);
|
|
|
|
virtual QStringList
|
|
GetPixelFormatsForCodec(ExportCodec::Codec c) const override;
|
|
|
|
virtual std::vector<SampleFormat>
|
|
GetSampleFormatsForCodec(ExportCodec::Codec c) const override;
|
|
|
|
virtual bool Open() override;
|
|
|
|
virtual bool WriteFrame(olive::FramePtr frame,
|
|
olive::core::rational time) override;
|
|
|
|
virtual bool WriteAudio(const olive::SampleBuffer &audio) override;
|
|
|
|
bool WriteAudioData(const AudioParams &audio_params, const uint8_t **data,
|
|
int input_sample_count);
|
|
|
|
virtual bool WriteSubtitle(const SubtitleBlock *sub_block) override;
|
|
|
|
virtual void Close() override;
|
|
|
|
virtual PixelFormat GetDesiredPixelFormat() const override
|
|
{
|
|
return video_conversion_fmt_;
|
|
}
|
|
|
|
private:
|
|
/**
|
|
* @brief Copy the last error message from the bridge into the encoder error state
|
|
*/
|
|
void SetErrorFromBridge();
|
|
|
|
static int ExportCodecToBridge(ExportCodec::Codec c);
|
|
|
|
FBEncoder *encoder_;
|
|
|
|
PixelFormat video_conversion_fmt_;
|
|
|
|
bool open_;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // FFMPEGENCODER_H
|