jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3083 from pkviet/srtfix4

Browse Source 
UI: Enable sps/pps (video headers) repetition (for srt/mpegts)
This commit is contained in:
Jim 2020-10-30 23:25:24 -07:00 committed by GitHub
commit b32abbe33f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
UI/window-basic-main-outputs.cpp
View File

@ -1298,6 +1298,15 @@ inline void AdvancedOutput::SetupStreaming()
obs_output_set_audio_encoder(streamOutput, streamAudioEnc, 0);
obs_encoder_set_scaled_size(h264Streaming, cx, cy);
obs_encoder_set_video(h264Streaming, obs_get_video());
const char *id = obs_service_get_id(main->GetService());
if (strcmp(id, "rtmp_custom") == 0) {
obs_data_t *settings = obs_data_create();
obs_service_apply_encoder_settings(main->GetService(), settings,
nullptr);
obs_encoder_update(h264Streaming, settings);
obs_data_release(settings);
}
}
inline void AdvancedOutput::SetupRecording()

8
plugins/obs-ffmpeg/jim-nvenc.c
View File

@ -426,6 +426,14 @@ static bool init_encoder(struct nvenc_data *enc, obs_data_t *settings)
config->gopLength = gop_size;
config->frameIntervalP = 1 + bf;
h264_config->idrPeriod = gop_size;
bool repeat_headers = obs_data_get_bool(settings, "repeat_headers");
if (repeat_headers) {
h264_config->repeatSPSPPS = 1;
h264_config->disableSPSPPS = 0;
h264_config->outputAUD = 1;
}
vui_params->videoSignalTypePresentFlag = 1;
vui_params->videoFullRangeFlag = (voi->range == VIDEO_RANGE_FULL);
vui_params->colourDescriptionPresentFlag = 1;

4
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
View File

@ -477,6 +477,7 @@ void nvenc_defaults(obs_data_t *settings)
obs_data_set_default_bool(settings, "psycho_aq", true);
obs_data_set_default_int(settings, "gpu", 0);
obs_data_set_default_int(settings, "bf", 2);
obs_data_set_default_bool(settings, "repeat_headers", false);
}
static bool rate_control_modified(obs_properties_t *ppts, obs_property_t *p,
@ -576,6 +577,9 @@ obs_properties_t *nvenc_properties_internal(bool ffmpeg)
obs_module_text("NVENC.PsychoVisualTuning"));
obs_property_set_long_description(
p, obs_module_text("NVENC.PsychoVisualTuning.ToolTip"));
p = obs_properties_add_bool(props, "repeat_headers",
"repeat_headers");
obs_property_set_visible(p, false);
}
obs_properties_add_int(props, "gpu", obs_module_text("GPU"), 0, 8, 1);

15
plugins/obs-x264/obs-x264.c
View File

@ -110,6 +110,7 @@ static void obs_x264_defaults(obs_data_t *settings)
obs_data_set_default_string(settings, "profile", "");
obs_data_set_default_string(settings, "tune", "");
obs_data_set_default_string(settings, "x264opts", "");
obs_data_set_default_bool(settings, "repeat_headers", false);
}
static inline void add_strings(obs_property_t *list, const char *const *strings)
@ -172,6 +173,7 @@ static obs_properties_t *obs_x264_props(void *unused)
obs_properties_t *props = obs_properties_create();
obs_property_t *list;
obs_property_t *p;
obs_property_t *headers;
list = obs_properties_add_list(props, "rate_control", TEXT_RATE_CONTROL,
OBS_COMBO_TYPE_LIST,
@ -222,6 +224,10 @@ static obs_properties_t *obs_x264_props(void *unused)
obs_properties_add_text(props, "x264opts", TEXT_X264_OPTS,
OBS_TEXT_DEFAULT);
headers = obs_properties_add_bool(props, "repeat_headers",
"repeat_headers");
obs_property_set_visible(headers, false);
return props;
}
@ -583,6 +589,7 @@ static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings,
char *tune = bstrdup(obs_data_get_string(settings, "tune"));
struct obs_x264_options options = obs_x264_parse_options(
obs_data_get_string(settings, "x264opts"));
bool repeat_headers = obs_data_get_bool(settings, "repeat_headers");
bool success = true;
@ -603,6 +610,12 @@ static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings,
success = reset_x264_params(obsx264, preset, tune);
}
if (repeat_headers) {
obsx264->params.b_repeat_headers = 1;
obsx264->params.b_annexb = 1;
obsx264->params.b_aud = 1;
}
if (success) {
update_params(obsx264, settings, &options, update);
if (!update) {
@ -613,8 +626,6 @@ static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings,
apply_x264_profile(obsx264, profile);
}
obsx264->params.b_repeat_headers = false;
obs_x264_free_options(options);
bfree(preset);
bfree(profile);

15
plugins/rtmp-services/rtmp-custom.c
View File

@ -1,4 +1,5 @@
#include <obs-module.h>
#include <util/dstr.h>
struct rtmp_custom {
char *server, *key;
@ -109,6 +110,19 @@ static const char *rtmp_custom_password(void *data)
return service->password;
}
#define RTMP_PROTOCOL "rtmp"
static void rtmp_custom_apply_settings(void *data, obs_data_t *video_settings,
obs_data_t *audio_settings)
{
struct rtmp_custom *service = data;
if (service->server != NULL && video_settings != NULL &&
strncmp(service->server, RTMP_PROTOCOL, strlen(RTMP_PROTOCOL)) !=
0) {
obs_data_set_bool(video_settings, "repeat_headers", true);
}
}
struct obs_service_info rtmp_custom_service = {
.id = "rtmp_custom",
.get_name = rtmp_custom_name,
@ -120,4 +134,5 @@ struct obs_service_info rtmp_custom_service = {
.get_key = rtmp_custom_key,
.get_username = rtmp_custom_username,
.get_password = rtmp_custom_password,
.apply_encoder_settings = rtmp_custom_apply_settings,
};