app: route all FFmpeg access through the ffmpeg_bridge C API
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.
This commit is contained in:
+62
-95
@@ -24,135 +24,110 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
AVPixelFormat
|
||||
FFmpegUtils::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt,
|
||||
PixelFormat maximum)
|
||||
int FFmpegUtils::GetCompatibleBridgePixelFormat(int pix_fmt,
|
||||
PixelFormat maximum)
|
||||
{
|
||||
AVPixelFormat possible_pix_fmts[4];
|
||||
int possible_pix_fmts[4];
|
||||
|
||||
possible_pix_fmts[0] = AV_PIX_FMT_RGBA;
|
||||
possible_pix_fmts[0] = FB_PIX_FMT_RGBA;
|
||||
|
||||
if (maximum == PixelFormat::U8) {
|
||||
possible_pix_fmts[1] = AV_PIX_FMT_NONE;
|
||||
possible_pix_fmts[1] = FB_PIX_FMT_NONE;
|
||||
} else {
|
||||
possible_pix_fmts[1] = AV_PIX_FMT_RGBA64;
|
||||
possible_pix_fmts[1] = FB_PIX_FMT_RGBA64LE;
|
||||
if (maximum == PixelFormat::F32) {
|
||||
possible_pix_fmts[2] = AV_PIX_FMT_RGBAF32;
|
||||
possible_pix_fmts[3] = AV_PIX_FMT_NONE;
|
||||
possible_pix_fmts[2] = FB_PIX_FMT_RGBAF32LE;
|
||||
possible_pix_fmts[3] = FB_PIX_FMT_NONE;
|
||||
} else {
|
||||
possible_pix_fmts[2] = AV_PIX_FMT_NONE;
|
||||
possible_pix_fmts[2] = FB_PIX_FMT_NONE;
|
||||
}
|
||||
}
|
||||
|
||||
return avcodec_find_best_pix_fmt_of_list(possible_pix_fmts, pix_fmt, 1,
|
||||
nullptr);
|
||||
return fb_find_best_pix_fmt_of_list(possible_pix_fmts, pix_fmt);
|
||||
}
|
||||
|
||||
SampleFormat FFmpegUtils::GetNativeSampleFormat(const AVSampleFormat &smp_fmt)
|
||||
SampleFormat FFmpegUtils::GetNativeSampleFormat(int smp_fmt)
|
||||
{
|
||||
switch (smp_fmt) {
|
||||
case AV_SAMPLE_FMT_U8:
|
||||
case FB_SAMPLE_FMT_U8:
|
||||
return SampleFormat::U8;
|
||||
case AV_SAMPLE_FMT_S16:
|
||||
case FB_SAMPLE_FMT_S16:
|
||||
return SampleFormat::S16;
|
||||
case AV_SAMPLE_FMT_S32:
|
||||
case FB_SAMPLE_FMT_S32:
|
||||
return SampleFormat::S32;
|
||||
case AV_SAMPLE_FMT_S64:
|
||||
case FB_SAMPLE_FMT_S64:
|
||||
return SampleFormat::S64;
|
||||
case AV_SAMPLE_FMT_FLT:
|
||||
case FB_SAMPLE_FMT_FLT:
|
||||
return SampleFormat::F32;
|
||||
case AV_SAMPLE_FMT_DBL:
|
||||
case FB_SAMPLE_FMT_DBL:
|
||||
return SampleFormat::F64;
|
||||
case AV_SAMPLE_FMT_U8P:
|
||||
case FB_SAMPLE_FMT_U8P:
|
||||
return SampleFormat::U8P;
|
||||
case AV_SAMPLE_FMT_S16P:
|
||||
case FB_SAMPLE_FMT_S16P:
|
||||
return SampleFormat::S16P;
|
||||
case AV_SAMPLE_FMT_S32P:
|
||||
case FB_SAMPLE_FMT_S32P:
|
||||
return SampleFormat::S32P;
|
||||
case AV_SAMPLE_FMT_S64P:
|
||||
case FB_SAMPLE_FMT_S64P:
|
||||
return SampleFormat::S64P;
|
||||
case AV_SAMPLE_FMT_FLTP:
|
||||
case FB_SAMPLE_FMT_FLTP:
|
||||
return SampleFormat::F32P;
|
||||
case AV_SAMPLE_FMT_DBLP:
|
||||
case FB_SAMPLE_FMT_DBLP:
|
||||
return SampleFormat::F64P;
|
||||
case AV_SAMPLE_FMT_NONE:
|
||||
case AV_SAMPLE_FMT_NB:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return SampleFormat::INVALID;
|
||||
}
|
||||
|
||||
AVSampleFormat FFmpegUtils::GetFFmpegSampleFormat(const SampleFormat &smp_fmt)
|
||||
int FFmpegUtils::GetFFmpegSampleFormat(const SampleFormat &smp_fmt)
|
||||
{
|
||||
switch (smp_fmt) {
|
||||
case SampleFormat::U8:
|
||||
return AV_SAMPLE_FMT_U8;
|
||||
return FB_SAMPLE_FMT_U8;
|
||||
case SampleFormat::S16:
|
||||
return AV_SAMPLE_FMT_S16;
|
||||
return FB_SAMPLE_FMT_S16;
|
||||
case SampleFormat::S32:
|
||||
return AV_SAMPLE_FMT_S32;
|
||||
return FB_SAMPLE_FMT_S32;
|
||||
case SampleFormat::S64:
|
||||
return AV_SAMPLE_FMT_S64;
|
||||
return FB_SAMPLE_FMT_S64;
|
||||
case SampleFormat::F32:
|
||||
return AV_SAMPLE_FMT_FLT;
|
||||
return FB_SAMPLE_FMT_FLT;
|
||||
case SampleFormat::F64:
|
||||
return AV_SAMPLE_FMT_DBL;
|
||||
return FB_SAMPLE_FMT_DBL;
|
||||
case SampleFormat::U8P:
|
||||
return AV_SAMPLE_FMT_U8P;
|
||||
return FB_SAMPLE_FMT_U8P;
|
||||
case SampleFormat::S16P:
|
||||
return AV_SAMPLE_FMT_S16P;
|
||||
return FB_SAMPLE_FMT_S16P;
|
||||
case SampleFormat::S32P:
|
||||
return AV_SAMPLE_FMT_S32P;
|
||||
return FB_SAMPLE_FMT_S32P;
|
||||
case SampleFormat::S64P:
|
||||
return AV_SAMPLE_FMT_S64P;
|
||||
return FB_SAMPLE_FMT_S64P;
|
||||
case SampleFormat::F32P:
|
||||
return AV_SAMPLE_FMT_FLTP;
|
||||
return FB_SAMPLE_FMT_FLTP;
|
||||
case SampleFormat::F64P:
|
||||
return AV_SAMPLE_FMT_DBLP;
|
||||
return FB_SAMPLE_FMT_DBLP;
|
||||
case SampleFormat::INVALID:
|
||||
case SampleFormat::COUNT:
|
||||
break;
|
||||
}
|
||||
|
||||
return AV_SAMPLE_FMT_NONE;
|
||||
return FB_SAMPLE_FMT_NONE;
|
||||
}
|
||||
|
||||
int FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVColorSpace cs)
|
||||
{
|
||||
switch (cs) {
|
||||
case AVCOL_SPC_BT709:
|
||||
return SWS_CS_ITU709;
|
||||
case AVCOL_SPC_FCC:
|
||||
return SWS_CS_FCC;
|
||||
case AVCOL_SPC_BT470BG:
|
||||
return SWS_CS_ITU624;
|
||||
case AVCOL_SPC_SMPTE170M:
|
||||
return SWS_CS_SMPTE170M;
|
||||
case AVCOL_SPC_SMPTE240M:
|
||||
return SWS_CS_SMPTE240M;
|
||||
case AVCOL_SPC_BT2020_NCL:
|
||||
return SWS_CS_BT2020;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return SWS_CS_DEFAULT;
|
||||
}
|
||||
|
||||
AVPixelFormat FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AVPixelFormat f)
|
||||
int FFmpegUtils::ConvertJPEGSpaceToRegularSpace(int f)
|
||||
{
|
||||
switch (f) {
|
||||
case AV_PIX_FMT_YUVJ420P:
|
||||
return AV_PIX_FMT_YUV420P;
|
||||
case AV_PIX_FMT_YUVJ422P:
|
||||
return AV_PIX_FMT_YUV422P;
|
||||
case AV_PIX_FMT_YUVJ444P:
|
||||
return AV_PIX_FMT_YUV444P;
|
||||
case AV_PIX_FMT_YUVJ440P:
|
||||
return AV_PIX_FMT_YUV440P;
|
||||
case AV_PIX_FMT_YUVJ411P:
|
||||
return AV_PIX_FMT_YUV411P;
|
||||
case FB_PIX_FMT_YUVJ420P:
|
||||
return FB_PIX_FMT_YUV420P;
|
||||
case FB_PIX_FMT_YUVJ422P:
|
||||
return FB_PIX_FMT_YUV422P;
|
||||
case FB_PIX_FMT_YUVJ444P:
|
||||
return FB_PIX_FMT_YUV444P;
|
||||
case FB_PIX_FMT_YUVJ440P:
|
||||
return FB_PIX_FMT_YUV440P;
|
||||
case FB_PIX_FMT_YUVJ411P:
|
||||
return FB_PIX_FMT_YUV411P;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -160,25 +135,21 @@ AVPixelFormat FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AVPixelFormat f)
|
||||
return f;
|
||||
}
|
||||
|
||||
AVPixelFormat FFmpegUtils::GetFFmpegPixelFormat(const PixelFormat &pix_fmt,
|
||||
int channel_layout)
|
||||
int FFmpegUtils::GetFFmpegPixelFormat(const PixelFormat &pix_fmt,
|
||||
int channel_layout)
|
||||
{
|
||||
if (channel_layout == VideoParams::kRGBChannelCount) {
|
||||
switch (pix_fmt) {
|
||||
case PixelFormat::U8:
|
||||
return AV_PIX_FMT_RGB24;
|
||||
return FB_PIX_FMT_RGB24;
|
||||
case PixelFormat::U10:
|
||||
return AV_PIX_FMT_NONE;
|
||||
return FB_PIX_FMT_NONE;
|
||||
case PixelFormat::U16:
|
||||
return AV_PIX_FMT_RGB48;
|
||||
return FB_PIX_FMT_RGB48LE;
|
||||
case PixelFormat::F16:
|
||||
#ifdef HAVE_AV_PIX_FMT_RGBF16
|
||||
return AV_PIX_FMT_RGBF16;
|
||||
#else
|
||||
return AV_PIX_FMT_RGB48;
|
||||
#endif
|
||||
return FB_PIX_FMT_RGBF16LE;
|
||||
case PixelFormat::F32:
|
||||
return AV_PIX_FMT_RGBF32;
|
||||
return FB_PIX_FMT_RGBF32LE;
|
||||
case PixelFormat::INVALID:
|
||||
case PixelFormat::COUNT:
|
||||
break;
|
||||
@@ -186,26 +157,22 @@ AVPixelFormat FFmpegUtils::GetFFmpegPixelFormat(const PixelFormat &pix_fmt,
|
||||
} else if (channel_layout == VideoParams::kRGBAChannelCount) {
|
||||
switch (pix_fmt) {
|
||||
case PixelFormat::U8:
|
||||
return AV_PIX_FMT_RGBA;
|
||||
return FB_PIX_FMT_RGBA;
|
||||
case PixelFormat::U10:
|
||||
return AV_PIX_FMT_NONE;
|
||||
return FB_PIX_FMT_NONE;
|
||||
case PixelFormat::U16:
|
||||
return AV_PIX_FMT_RGBA64;
|
||||
return FB_PIX_FMT_RGBA64LE;
|
||||
case PixelFormat::F16:
|
||||
#ifdef HAVE_AV_PIX_FMT_RGBAF16
|
||||
return AV_PIX_FMT_RGBAF16;
|
||||
#else
|
||||
return AV_PIX_FMT_RGBA64;
|
||||
#endif
|
||||
return FB_PIX_FMT_RGBAF16LE;
|
||||
case PixelFormat::F32:
|
||||
return AV_PIX_FMT_RGBAF32;
|
||||
return FB_PIX_FMT_RGBAF32LE;
|
||||
case PixelFormat::INVALID:
|
||||
case PixelFormat::COUNT:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return AV_PIX_FMT_NONE;
|
||||
return FB_PIX_FMT_NONE;
|
||||
}
|
||||
|
||||
PixelFormat FFmpegUtils::GetCompatiblePixelFormat(const PixelFormat &pix_fmt)
|
||||
|
||||
Reference in New Issue
Block a user