etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-28 18:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

code: Fix support for multiple FFmpeg version

Browse source 
This should make it compile just fine with older FFmpeg versions again, such as on Ubuntu 20.04.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-16 06:04:27 +02:00 committed by Xaymar
parent 0402c8ef60
commit 5bdcefd618
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
source/encoders/ffmpeg/handler.cpp
View file

@ -18,20 +18,29 @@ streamfx::encoder::ffmpeg::handler::handler(std::string codec)
bool streamfx::encoder::ffmpeg::handler::has_keyframes(ffmpeg_factory* factory) bool streamfx::encoder::ffmpeg::handler::has_keyframes(ffmpeg_factory* factory)
{ {
#if LIBAVCODEC_VERSION_MAJOR > 58 #if defined(AV_CODEC_PROP_INTRA_ONLY) // TODO: Determine if we need to check for an exact version.
if (auto* desc = avcodec_descriptor_get(factory->get_avcodec()->id); desc) { if (auto* desc = avcodec_descriptor_get(factory->get_avcodec()->id); desc) {
return (desc->props & AV_CODEC_PROP_INTRA_ONLY) == 0; return (desc->props & AV_CODEC_PROP_INTRA_ONLY) == 0;
} else {
return false;
} }
#else #endif
#ifdef AV_CODEC_CAP_INTRA_ONLY
return (factory->get_avcodec()->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0; return (factory->get_avcodec()->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0;
#else
return false;
#endif #endif
} }
bool streamfx::encoder::ffmpeg::handler::has_threading(ffmpeg_factory* factory) bool streamfx::encoder::ffmpeg::handler::has_threading(ffmpeg_factory* factory)
{ {
return (factory->get_avcodec()->capabilities & (AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_OTHER_THREADS)); return (factory->get_avcodec()->capabilities
& (AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS
#if defined(AV_CODEC_CAP_OTHER_THREADS) // TODO: Determine if we need to check for an exact version.
| AV_CODEC_CAP_OTHER_THREADS
#else
| AV_CODEC_CAP_AUTO_THREADS
#endif
));
} }
bool streamfx::encoder::ffmpeg::handler::is_hardware(ffmpeg_factory* factory) bool streamfx::encoder::ffmpeg::handler::is_hardware(ffmpeg_factory* factory)
@ -52,7 +61,8 @@ bool streamfx::encoder::ffmpeg::handler::is_reconfigurable(ffmpeg_factory* facto
void streamfx::encoder::ffmpeg::handler::adjust_info(ffmpeg_factory* factory, std::string& id, std::string& name, std::string& codec) {} void streamfx::encoder::ffmpeg::handler::adjust_info(ffmpeg_factory* factory, std::string& id, std::string& name, std::string& codec) {}
std::string streamfx::encoder::ffmpeg::handler::help(ffmpeg_factory* factory) { std::string streamfx::encoder::ffmpeg::handler::help(ffmpeg_factory* factory)
{
return "about:blank"; return "about:blank";
} }