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

New upstream version 25.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-03-25 09:07:22 +01:00
parent 04fe0efc67
commit 8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libobs/util/platform.c
View file

@ -25,6 +25,7 @@
#include "bmem.h"
#include "utf8.h"
#include "dstr.h"
#include "obs.h"
FILE *os_wfopen(const wchar_t *path, const char *mode)
{
@ -652,6 +653,9 @@ const char *os_get_path_extension(const char *path)
char *period;
char *slash;
if (!path[0])
return NULL;
dstr_init_copy(&temp, path);
dstr_replace(&temp, "\\", "/");
@ -708,6 +712,8 @@ char *os_generate_formatted_filename(const char *extension, bool space,
time_t now = time(0);
struct tm *cur_time;
cur_time = localtime(&now);
struct obs_video_info ovi;
obs_get_video_info(&ovi);
const size_t spec_count = 23;
static const char *spec[][2] = {
@ -728,11 +734,10 @@ char *os_generate_formatted_filename(const char *extension, bool space,
dstr_init_copy(&sf, format);
while (pos < sf.len) {
const char *cmp = sf.array + pos;
for (size_t i = 0; i < spec_count && !convert[0]; i++) {
size_t len = strlen(spec[i][0]);
const char *cmp = sf.array + pos;
if (astrcmp_n(cmp, spec[i][0], len) == 0) {
if (strlen(spec[i][1]))
strftime(convert, sizeof(convert),
@ -747,6 +752,35 @@ char *os_generate_formatted_filename(const char *extension, bool space,
}
}
if (!convert[0]) {
if (astrcmp_n(cmp, "%FPS", 4) == 0) {
if (ovi.fps_den <= 1) {
sprintf(convert, "%u", ovi.fps_num);
} else {
const double obsFPS =
(double)ovi.fps_num /
(double)ovi.fps_den;
sprintf(convert, "%.2f", obsFPS);
}
replace_text(&sf, pos, 4, convert);
} else if (astrcmp_n(cmp, "%CRES", 5) == 0) {
sprintf(convert, "%ux%u", ovi.base_width,
ovi.base_height);
replace_text(&sf, pos, 5, convert);
} else if (astrcmp_n(cmp, "%ORES", 5) == 0) {
sprintf(convert, "%ux%u", ovi.output_width,
ovi.output_height);
replace_text(&sf, pos, 5, convert);
} else if (astrcmp_n(cmp, "%VF", 3) == 0) {
strcpy(convert, get_video_format_name(
ovi.output_format));
replace_text(&sf, pos, 3, convert);
}
}
if (convert[0]) {
pos += strlen(convert);
convert[0] = 0;