xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

encoder: Fix incorrect or missing Intra-Only check

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-07-24 21:21:54 +02:00
parent 2c2d42ebaf
commit 11cc88deb6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/encoder.cpp
+10 -8
View File
@@ -26,13 +26,14 @@
#include <util/profiler.hpp>
#include "ffmpeg/tools.hpp"
#include "plugin.hpp"
#include "utility.hpp"
#include "strings.hpp"
#include "utility.hpp"
extern "C" {
#include <obs-module.h>
#pragma warning(push)
#pragma warning(disable : 4244)
#include <libavcodec/avcodec.h>
#include <libavutil/dict.h>
#include <libavutil/frame.h>
#include <libavutil/opt.h>
@@ -299,12 +300,6 @@ const char* obsffmpeg::encoder_factory::get_name()
void obsffmpeg::encoder_factory::get_defaults(obs_data_t* settings)
{
if (!this->avcodec_ptr->capabilities & AV_CODEC_CAP_INTRA_ONLY) {
obs_data_set_default_int(settings, G_KEYFRAMES_INTERVALTYPE, 0);
obs_data_set_default_double(settings, G_KEYFRAMES_INTERVAL_SECONDS, 2.0);
obs_data_set_default_int(settings, G_KEYFRAMES_INTERVAL_FRAMES, 300);
}
{ // Handler
auto ptr = obsffmpeg::find_codec_handler(this->avcodec_ptr->name);
if (ptr) {
@@ -312,6 +307,12 @@ void obsffmpeg::encoder_factory::get_defaults(obs_data_t* settings)
}
}
if ((this->avcodec_ptr->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0) {
obs_data_set_default_int(settings, G_KEYFRAMES_INTERVALTYPE, 0);
obs_data_set_default_double(settings, G_KEYFRAMES_INTERVAL_SECONDS, 2.0);
obs_data_set_default_int(settings, G_KEYFRAMES_INTERVAL_FRAMES, 300);
}
{ // Integrated Options
// FFmpeg
obs_data_set_default_string(settings, P_FFMPEG_CUSTOMSETTINGS, "");
@@ -642,7 +643,8 @@ bool obsffmpeg::encoder::update(obs_data_t* settings)
}
}
{ // Key Frames
if ((this->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0) {
// Key-Frame Options
obs_video_info ovi;
if (!obs_get_video_info(&ovi)) {
throw std::runtime_error("no video info");