Skip to content

Update go2rtc_stream.c #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rivandraa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update go2rtc_stream.c #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 39 additions & 34 deletions src/video/go2rtc/go2rtc_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,48 +213,53 @@ bool go2rtc_stream_register(const char *stream_id, const char *stream_url,
* codec, go2rtc_integration_reregister_stream() re-issues this call
* with the corrected value.
*/
const char *sources[3];
const char *sources[4];
int num_sources = 0;

sources[num_sources++] = modified_url;

char ffmpeg_aac_source[URL_BUFFER_SIZE];
if (record_audio) {
snprintf(ffmpeg_aac_source, sizeof(ffmpeg_aac_source),
"ffmpeg:%s#audio=aac", encoded_stream_id);
sources[num_sources++] = ffmpeg_aac_source;
}

bool is_h264 = (codec && codec[0] != '\0' && strcasecmp(codec, "h264") == 0);
char ffmpeg_h264_source[URL_BUFFER_SIZE];

char combined_buf[URL_BUFFER_SIZE];
int combined_idx = -1;

const char *audio_codec = (strstr(encoded_stream_id, "_sub") != NULL) ? "opus" : "aac";

bool is_h264 = (codec != NULL && strcasestr(codec, "h264") != NULL);

if (!is_h264) {
Comment on lines +224 to 228
snprintf(ffmpeg_h264_source, sizeof(ffmpeg_h264_source),
"ffmpeg:%s#video=h264#hardware", encoded_stream_id);
sources[num_sources++] = ffmpeg_h264_source;
log_info("Stream %s codec=%s; adding ffmpeg H.264 fallback source for WebRTC",
stream_id, (codec && codec[0]) ? codec : "unknown");
snprintf(combined_buf, sizeof(combined_buf),
"ffmpeg:%s#video=h264#audio=%s#hardware",
encoded_stream_id, audio_codec);
} else {
log_info("Stream %s codec=h264; no transcoding fallback needed", stream_id);
}

bool result;
if (num_sources > 1) {
result = go2rtc_api_add_stream_multi(encoded_stream_id, sources, num_sources);
if (!result) {
log_error("Failed to register stream %s with go2rtc (%d sources); falling back to primary-only",
encoded_stream_id, num_sources);
result = go2rtc_api_add_stream(encoded_stream_id, modified_url);
}
} else {
result = go2rtc_api_add_stream(encoded_stream_id, modified_url);
snprintf(combined_buf, sizeof(combined_buf),
"ffmpeg:%s#audio=%s",
encoded_stream_id, audio_codec);
}

sources[num_sources] = strdup(combined_buf);
if (sources[num_sources] != NULL) {
combined_idx = num_sources;
num_sources++;
log_info("Stream %s: Combined producer added (audio=%s, h264_detected=%s)",
encoded_stream_id, audio_codec, is_h264 ? "yes" : "no");
}

bool result = false;
if (num_sources > 0) {
result = (num_sources > 1)
? go2rtc_api_add_stream_multi(encoded_stream_id, sources, num_sources)
: go2rtc_api_add_stream(encoded_stream_id, modified_url);
Comment on lines +248 to +250
Comment on lines +249 to +250
}

if (result) {
log_info("Successfully registered stream %s with go2rtc (%d source%s)",
encoded_stream_id, num_sources, num_sources == 1 ? "" : "s");
log_info("Successfully registered stream %s", encoded_stream_id);
} else {
log_error("Failed to register stream %s with go2rtc", encoded_stream_id);
log_error("Failed to register stream %s", encoded_stream_id);
}


if (combined_idx != -1) {
free((void*)sources[combined_idx]);
}

// Intentionally do NOT preload here.
//
// Registration happens during startup for every enabled stream. Preloading
Expand Down
Loading