lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 21.0.2+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2018-02-19 20:54:37 +01:00
parent 1f1bbb3518
commit baafb6325b
706 changed files with 49633 additions and 5044 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/obs-x264/data/locale/el-GR.ini
View file

@ -1,6 +1,7 @@
Bitrate="Ρυθμός μετάδοσης bit"
CustomBufsize="Χρήση Προσαρμοσμένου Μεγέθους Buffer"
BufferSize="Μέγεθος buffer"
RateControl="Έλεγχος ρυθμού"
CRF="CRF"
KeyframeIntervalSec="Συχνότητα Καρέ-Κλειδιού (δευτερόλεπτα, 0=αυτόματο)"
CPUPreset="Προφίλ Χρήσης CPU (υψηλότερο = λιγότερη CPU)"
@ -8,5 +9,5 @@ Profile="Προφίλ"
Tune="Βελτιστοποίηση"
None="(Κανένα)"
EncoderOptions="Επιλογές x264 (διαχωρισμένες από κενό)"
VFR="Μεταβλητή ταχύτητα καρέ (VFR)"
VFR="Μεταβλητός Ρυθμός καρέ (VFR)"

2
plugins/obs-x264/data/locale/ka-GE.ini Normal file
View file

@ -0,0 +1,2 @@
CRF="CRF"

2
plugins/obs-x264/data/locale/ko-KR.ini
View file

@ -4,7 +4,7 @@ BufferSize="버퍼 크기"
RateControl="데이터율 제어"
CRF="CRF"
KeyframeIntervalSec="키프레임 간격 (초 단위, 0=자동)"
CPUPreset="CPU 사용량 사전설정 (높음 = 적은 CPU 부담)"
CPUPreset="CPU 사용량 (빠를수록 부담 적으나 화질 나쁨)"
Profile="프로파일"
Tune="조정"
None="(없음)"

25
plugins/obs-x264/obs-x264.c
View file

@ -35,6 +35,8 @@
#define info(format, ...) do_log(LOG_INFO, format, ##__VA_ARGS__)
#define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
//#define ENABLE_VFR
/* ------------------------------------------------------------------------- */
struct obs_x264 {
@ -96,7 +98,9 @@ static void obs_x264_defaults(obs_data_t *settings)
obs_data_set_default_int (settings, "buffer_size", 2500);
obs_data_set_default_int (settings, "keyint_sec", 0);
obs_data_set_default_int (settings, "crf", 23);
#ifdef ENABLE_VFR
obs_data_set_default_bool (settings, "vfr", false);
#endif
obs_data_set_default_string(settings, "rate_control","CBR");
obs_data_set_default_string(settings, "preset", "veryfast");
@ -202,7 +206,9 @@ static obs_properties_t *obs_x264_props(void *unused)
obs_property_list_add_string(list, TEXT_NONE, "");
add_strings(list, x264_tune_names);
#ifdef ENABLE_VFR
obs_properties_add_bool(props, "vfr", TEXT_VFR);
#endif
obs_properties_add_text(props, "x264opts", TEXT_X264_OPTS,
OBS_TEXT_DEFAULT);
@ -407,11 +413,15 @@ static void update_params(struct obs_x264 *obsx264, obs_data_t *settings,
int crf = (int)obs_data_get_int(settings, "crf");
int width = (int)obs_encoder_get_width(obsx264->encoder);
int height = (int)obs_encoder_get_height(obsx264->encoder);
int bf = (int)obs_data_get_int(settings, "bf");
bool use_bufsize = obs_data_get_bool(settings, "use_bufsize");
bool vfr = obs_data_get_bool(settings, "vfr");
bool cbr_override= obs_data_get_bool(settings, "cbr");
enum rate_control rc;
#ifdef ENABLE_VFR
bool vfr = obs_data_get_bool(settings, "vfr");
#endif
/* XXX: "cbr" setting has been deprecated */
if (cbr_override) {
warn("\"cbr\" setting has been deprecated for all encoders! "
@ -446,7 +456,11 @@ static void update_params(struct obs_x264 *obsx264, obs_data_t *settings,
if (!use_bufsize)
buffer_size = bitrate;
#ifdef ENABLE_VFR
obsx264->params.b_vfr_input = vfr;
#else
obsx264->params.b_vfr_input = false;
#endif
obsx264->params.rc.i_vbv_max_bitrate = bitrate;
obsx264->params.rc.i_vbv_buffer_size = buffer_size;
obsx264->params.rc.i_bitrate = bitrate;
@ -458,6 +472,9 @@ static void update_params(struct obs_x264 *obsx264, obs_data_t *settings,
obsx264->params.p_log_private = obsx264;
obsx264->params.i_log_level = X264_LOG_WARNING;
if (obs_data_has_user_value(settings, "bf"))
obsx264->params.i_bframe = bf;
obsx264->params.vui.i_transfer =
get_x264_cs_val(info.colorspace, x264_transfer_names);
obsx264->params.vui.i_colmatrix =
@ -506,16 +523,14 @@ static void update_params(struct obs_x264 *obsx264, obs_data_t *settings,
"\tfps_den: %d\n"
"\twidth: %d\n"
"\theight: %d\n"
"\tkeyint: %d\n"
"\tvfr: %s\n",
"\tkeyint: %d\n",
rate_control,
obsx264->params.rc.i_vbv_max_bitrate,
obsx264->params.rc.i_vbv_buffer_size,
(int)obsx264->params.rc.f_rf_constant,
voi->fps_num, voi->fps_den,
width, height,
obsx264->params.i_keyint_max,
vfr ? "on" : "off");
obsx264->params.i_keyint_max);
}
static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings)