opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 09:41:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1589 from caffeinetv/minor-improvements

Browse Source 
Minor improvements
This commit is contained in:
Jim
2019-04-14 03:43:05 -07:00
committed by GitHub
parent 30e90c3030 54e7267ad9
commit b2bc1e159b
4 changed files with 88 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main-outputs.cpp
+77 -48
View File
@@ -714,28 +714,39 @@ bool SimpleOutput::StartStreaming(obs_service_t *service)
obs_output_get_signal_handler(streamOutput),
"stop", OBSStopStreaming, this);
const char *codec =
obs_output_get_supported_audio_codecs(streamOutput);
if (!codec) {
return false;
}
bool isEncoded = obs_output_get_flags(streamOutput)
& OBS_OUTPUT_ENCODED;
if (strcmp(codec, "aac") != 0) {
const char *id = FindAudioEncoderFromCodec(codec);
int audioBitrate = GetAudioBitrate();
obs_data_t *settings = obs_data_create();
obs_data_set_int(settings, "bitrate", audioBitrate);
aacStreaming = obs_audio_encoder_create(id,
"alt_audio_enc", nullptr, 0, nullptr);
obs_encoder_release(aacStreaming);
if (!aacStreaming)
if (isEncoded) {
const char *codec =
obs_output_get_supported_audio_codecs(
streamOutput);
if (!codec) {
blog(LOG_WARNING, "Failed to load audio codec");
return false;
}
obs_encoder_update(aacStreaming, settings);
obs_encoder_set_audio(aacStreaming, obs_get_audio());
if (strcmp(codec, "aac") != 0) {
const char *id = FindAudioEncoderFromCodec(
codec);
int audioBitrate = GetAudioBitrate();
obs_data_t *settings = obs_data_create();
obs_data_set_int(settings, "bitrate",
audioBitrate);
obs_data_release(settings);
aacStreaming = obs_audio_encoder_create(id,
"alt_audio_enc", nullptr, 0,
nullptr);
obs_encoder_release(aacStreaming);
if (!aacStreaming)
return false;
obs_encoder_update(aacStreaming, settings);
obs_encoder_set_audio(aacStreaming,
obs_get_audio());
obs_data_release(settings);
}
}
outputType = type;
@@ -789,12 +800,15 @@ bool SimpleOutput::StartStreaming(obs_service_t *service)
}
const char *error = obs_output_get_last_error(streamOutput);
bool has_last_error = error && *error;
bool hasLastError = error && *error;
if (hasLastError)
lastError = error;
else
lastError = string();
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s",
type,
has_last_error ? " Last Error: " : "",
has_last_error ? error : "");
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s", type,
hasLastError ? " Last Error: " : "",
hasLastError ? error : "");
return false;
}
@@ -1506,30 +1520,42 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service)
obs_output_get_signal_handler(streamOutput),
"stop", OBSStopStreaming, this);
const char *codec =
obs_output_get_supported_audio_codecs(streamOutput);
if (!codec) {
return false;
}
bool isEncoded = obs_output_get_flags(streamOutput)
& OBS_OUTPUT_ENCODED;
if (strcmp(codec, "aac") == 0) {
streamAudioEnc = aacTrack[trackIndex - 1];
} else {
const char *id = FindAudioEncoderFromCodec(codec);
int audioBitrate = GetAudioBitrate(trackIndex - 1);
obs_data_t *settings = obs_data_create();
obs_data_set_int(settings, "bitrate", audioBitrate);
streamAudioEnc = obs_audio_encoder_create(id,
"alt_audio_enc", nullptr,
trackIndex - 1, nullptr);
if (!streamAudioEnc)
if (isEncoded) {
const char *codec =
obs_output_get_supported_audio_codecs(
streamOutput);
if (!codec) {
blog(LOG_WARNING, "Failed to load audio codec");
return false;
}
obs_encoder_update(streamAudioEnc, settings);
obs_encoder_set_audio(streamAudioEnc, obs_get_audio());
if (strcmp(codec, "aac") == 0) {
streamAudioEnc = aacTrack[trackIndex - 1];
} else {
obs_data_t *settings = obs_data_create();
const char *id =
FindAudioEncoderFromCodec(codec);
int audioBitrate =
GetAudioBitrate(trackIndex - 1);
obs_data_set_int(settings, "bitrate",
audioBitrate);
streamAudioEnc = obs_audio_encoder_create(id,
"alt_audio_enc", nullptr,
trackIndex - 1, nullptr);
obs_data_release(settings);
if (!streamAudioEnc)
return false;
obs_encoder_update(streamAudioEnc, settings);
obs_encoder_set_audio(streamAudioEnc,
obs_get_audio());
obs_data_release(settings);
}
}
outputType = type;
@@ -1581,12 +1607,15 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service)
}
const char *error = obs_output_get_last_error(streamOutput);
bool has_last_error = error && *error;
bool hasLastError = error && *error;
if (hasLastError)
lastError = error;
else
lastError = string();
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s",
type,
has_last_error ? " Last Error: " : "",
has_last_error ? error : "");
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s", type,
hasLastError ? " Last Error: " : "",
hasLastError ? error : "");
return false;
}