mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-04 06:36:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Implement a few more audio options/functions

Browse Source 
Implement a few audio options in to the user interface as well as a few
inline audio functions in audio-io.h.

Make it so ffmpeg plugin automatically converts to the desired format.

Use regular interleaved float internally for audio instead of planar
float.
This commit is contained in:
jp9000
2014-02-23 16:27:19 -07:00
parent 0ff0d32731
commit c232ebde15
10 changed files with 311 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
obs/window-basic-settings.cpp
View File

@@ -178,6 +178,8 @@ static const size_t numVals = sizeof(vals)/sizeof(double);
void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy)
{
ui->outputResolution->clear();
for (size_t idx = 0; idx < numVals; idx++) {
uint32_t downscaleCX = uint32_t(double(cx) / vals[idx]);
uint32_t downscaleCY = uint32_t(double(cy) / vals[idx]);
@@ -196,7 +198,6 @@ void OBSBasicSettings::LoadResolutionLists()
vector<MonitorInfo> monitors;
ui->baseResolution->clear();
ui->outputResolution->clear();
GetMonitors(monitors);
@@ -270,14 +271,47 @@ void OBSBasicSettings::LoadVideoSettings()
loading = false;
}
void OBSBasicSettings::LoadAudioSettings()
{
uint32_t sampleRate = config_get_uint(GetGlobalConfig(), "Audio",
"SampleRate");
const char *speakers = config_get_string(GetGlobalConfig(), "Audio",
"ChannelSetup");
uint32_t bufferingTime = config_get_uint(GetGlobalConfig(), "Audio",
"BufferingTime");
loading = true;
const char *str;
if (sampleRate == 22050)
str = "22.05khz";
else if (sampleRate == 48000)
str = "48khz";
else
str = "44.1khz";
int sampleRateIdx = ui->sampleRate->findText(str);
if (sampleRateIdx != -1)
ui->sampleRate->setCurrentIndex(sampleRateIdx);
if (strcmp(speakers, "Mono") == 0)
ui->channelSetup->setCurrentIndex(0);
else
ui->channelSetup->setCurrentIndex(1);
ui->audioBufferingTime->setValue(bufferingTime);
loading = false;
}
void OBSBasicSettings::LoadSettings(bool changedOnly)
{
if (!changedOnly || generalChanged)
LoadGeneralSettings();
//if (!changedOnly || outputChanged)
// LoadOutputSettings();
//if (!changedOnly || audioChanged)
// LoadOutputSettings();
if (!changedOnly || audioChanged)
LoadAudioSettings();
if (!changedOnly || videoChanged)
LoadVideoSettings();
}
@@ -331,14 +365,39 @@ void OBSBasicSettings::SaveVideoSettings()
window->ResetVideo();
}
void OBSBasicSettings::SaveAudioSettings()
{
QString sampleRateStr = ui->sampleRate->currentText();
int channelSetupIdx = ui->channelSetup->currentIndex();
int bufferingTime = ui->audioBufferingTime->value();
const char *channelSetup;
if (channelSetupIdx == 0)
channelSetup = "Mono";
else
channelSetup = "Stereo";
int sampleRate = 44100;
if (sampleRateStr == "22.05khz")
sampleRate = 22050;
else if (sampleRateStr == "48khz")
sampleRate = 48000;
config_set_uint(GetGlobalConfig(), "Audio", "SampleRate", sampleRate);
config_set_string(GetGlobalConfig(), "Audio", "ChannelSetup",
channelSetup);
config_set_uint(GetGlobalConfig(), "Audio", "BufferingTime",
bufferingTime);
}
void OBSBasicSettings::SaveSettings()
{
if (generalChanged)
SaveGeneralSettings();
//if (outputChanged)
// SaveOutputSettings();
//if (audioChanged)
// SaveAudioSettings();
if (audioChanged)
SaveAudioSettings();
if (videoChanged)
SaveVideoSettings();
@@ -430,6 +489,30 @@ void OBSBasicSettings::on_language_currentIndexChanged(int index)
UNUSED_PARAMETER(index);
}
void OBSBasicSettings::on_sampleRate_currentIndexChanged(int index)
{
if (!loading)
audioChanged = true;
UNUSED_PARAMETER(index);
}
void OBSBasicSettings::on_channelSetup_currentIndexChanged(int index)
{
if (!loading)
audioChanged = true;
UNUSED_PARAMETER(index);
}
void OBSBasicSettings::on_audioBufferingTime_valueChanged(int value)
{
if (!loading)
audioChanged = true;
UNUSED_PARAMETER(value);
}
void OBSBasicSettings::on_renderer_currentIndexChanged(int index)
{
if (!loading) {
@@ -450,8 +533,14 @@ void OBSBasicSettings::on_fpsType_currentIndexChanged(int index)
void OBSBasicSettings::on_baseResolution_editTextChanged(const QString &text)
{
if (!loading && ValidResolutions(ui.get()))
if (!loading && ValidResolutions(ui.get())) {
QString baseResolution = ui->baseResolution->currentText();
uint32_t cx, cy;
ConvertResText(QT_TO_UTF8(baseResolution), cx, cy);
ResetDownscales(cx, cy);
videoChanged = true;
}
UNUSED_PARAMETER(text);
}
@@ -463,3 +552,35 @@ void OBSBasicSettings::on_outputResolution_editTextChanged(const QString &text)
UNUSED_PARAMETER(text);
}
void OBSBasicSettings::on_fpsCommon_currentIndexChanged(int index)
{
if (!loading)
videoChanged = true;
UNUSED_PARAMETER(index);
}
void OBSBasicSettings::on_fpsInteger_valueChanged(int value)
{
if (!loading)
videoChanged = true;
UNUSED_PARAMETER(value);
}
void OBSBasicSettings::on_fpsNumerator_valueChanged(int value)
{
if (!loading)
videoChanged = true;
UNUSED_PARAMETER(value);
}
void OBSBasicSettings::on_fpsDenominator_valueChanged(int value)
{
if (!loading)
videoChanged = true;
UNUSED_PARAMETER(value);
}