Imported Upstream version 0.14.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2016-05-24 21:53:01 +02:00
parent fb3990e9e5
commit 41a01dbf05
529 changed files with 25112 additions and 2336 deletions

View file

@ -1,4 +1,5 @@
#include <util/platform.h>
#include <util/dstr.h>
#include <obs-module.h>
#include <jansson.h>
@ -328,7 +329,7 @@ static void apply_video_encoder_settings(obs_data_t *settings,
obs_data_set_int(settings, "keyint_sec", keyint);
}
obs_data_set_bool(settings, "cbr", true);
obs_data_set_string(settings, "rate_control", "CBR");
item = json_object_get(recommended, "profile");
if (item && json_is_string(item)) {
@ -344,6 +345,22 @@ static void apply_video_encoder_settings(obs_data_t *settings,
obs_data_set_int(settings, "buffer_size", max_bitrate);
}
}
item = json_object_get(recommended, "x264opts");
if (item && json_is_string(item)) {
const char *x264_settings = json_string_value(item);
const char *cur_settings =
obs_data_get_string(settings, "x264opts");
struct dstr opts;
dstr_init_copy(&opts, cur_settings);
if (!dstr_is_empty(&opts))
dstr_cat(&opts, " ");
dstr_cat(&opts, x264_settings);
obs_data_set_string(settings, "x264opts", opts.array);
dstr_free(&opts);
}
}
static void apply_audio_encoder_settings(obs_data_t *settings,