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

encoder: Actually fix parsing this time

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-11-16 23:46:20 +01:00
parent e4474c29c4
commit 815152d024
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/encoder.cpp
+5 -4
View File
@@ -696,7 +696,7 @@ void obsffmpeg::encoder::initialize_hw(obs_data_t*)
_context->framerate.den = _context->time_base.num = voi->fps_den; _context->framerate.den = _context->time_base.num = voi->fps_den;
ffmpeg::tools::setup_obs_color(voi->colorspace, voi->range, _context); ffmpeg::tools::setup_obs_color(voi->colorspace, voi->range, _context);
_context->sw_pix_fmt = ffmpeg::tools::obs_videoformat_to_avpixelformat(voi->format); _context->sw_pix_fmt = ffmpeg::tools::obs_videoformat_to_avpixelformat(voi->format);
#ifdef WIN32 #ifdef WIN32
_context->pix_fmt = AV_PIX_FMT_D3D11; _context->pix_fmt = AV_PIX_FMT_D3D11;
#endif #endif
@@ -1382,6 +1382,7 @@ void obsffmpeg::encoder::parse_ffmpeg_commandline(std::string text)
std::string ropt = opt_stream.str(); std::string ropt = opt_stream.str();
if (ropt.size() > 0) { if (ropt.size() > 0) {
opts.push_back(ropt); opts.push_back(ropt);
opt_stream.str(std::string());
opt_stream.clear(); opt_stream.clear();
} }
} else { } else {
@@ -1413,13 +1414,13 @@ void obsffmpeg::encoder::parse_ffmpeg_commandline(std::string text)
} }
try { try {
std::string key = opt.substr(1, eq_at - cstr); std::string key = opt.substr(1, eq_at - cstr - 1);
std::string value = opt.substr(eq_at - cstr + 1); std::string value = opt.substr(eq_at - cstr + 1);
int res = av_opt_set(_context, key.c_str(), value.c_str(), AV_OPT_SEARCH_CHILDREN); int res = av_opt_set(_context, key.c_str(), value.c_str(), AV_OPT_SEARCH_CHILDREN);
if (res < 0) { if (res < 0) {
PLOG_WARNING("Option '%s' encountered error: %s", opt.c_str(), PLOG_WARNING("Option '%s' (key: '%s', value: '%s') encountered error: %s", opt.c_str(),
ffmpeg::tools::get_error_description(res)); key.c_str(), value.c_str(), ffmpeg::tools::get_error_description(res));
} }
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
PLOG_ERROR("Option '%s' encountered exception: %s", opt.c_str(), ex.what()) PLOG_ERROR("Option '%s' encountered exception: %s", opt.c_str(), ex.what())