OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-08 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtmp-services: Enforce encoder settings per protocol

Browse source 
For mpegts output, used in rtmp-custom service, encoder settings
require:
- ADTS with fdk-aac.
For all non-rtmp protocols, one also requires:
- video encoder header repetition;
This future proofs the code against protocol addition.

Additionally, I've added a check against NULL audio settings, which was
in my fork but that I forgot to add in the PR [1].

[1] https://github.com/obsproject/obs-studio/pull/6163

Signed-off-by: pkv <pkv@obsproject.com>
This commit is contained in:
pkv 2023-06-22 13:46:44 +02:00 committed by Lain
parent 457c88b138
commit ba92140f2b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,18 +134,21 @@ static const char *rtmp_custom_get_protocol(void *data)
return "RTMP";
}
#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) {
const char *protocol = rtmp_custom_get_protocol(service);
bool has_mpegts = false;
bool is_rtmp = false;
if (strcmp(protocol, "SRT") == 0 || strcmp(protocol, "RIST") == 0)
has_mpegts = true;
if (strcmp(protocol, "RTMP") == 0 || strcmp(protocol, "RTMPS") == 0)
is_rtmp = true;
if (!is_rtmp && video_settings != NULL)
obs_data_set_bool(video_settings, "repeat_headers", true);
if (has_mpegts && audio_settings != NULL)
obs_data_set_bool(audio_settings, "set_to_ADTS", true);
}
}
static const char *rtmp_custom_get_connect_info(void *data, uint32_t type)