jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #26839: android: cosmetics

Browse Source
This commit is contained in:
Tristan Matthews
2013-07-15 11:17:13 -04:00
parent f5b76d0599
commit 72374159af
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/src/account.cpp
View File

@ -102,7 +102,6 @@ Account::~Account()
void Account::setRegistrationState(const RegistrationState &state)
{
if (state != registrationState_) {
registrationState_ = state;
// Notify the client
ConfigurationManager *c(Manager::instance().getClient()->getConfigurationManager());

77
daemon/src/audio/audiolayer.cpp
View File

@ -80,7 +80,7 @@ void AudioLayer::applyGain(SFLDataFormat *src , int samples, int gain)
{
if (gain != 100)
for (int i = 0 ; i < samples; i++)
src[i] = src[i] * gain* 0.01;
src[i] = src[i] * gain * 0.01;
}
// Notify (with a beep) an incoming call when there is already a call in progress
@ -111,14 +111,16 @@ void AudioLayer::notifyIncomingCall()
putUrgent(buf, sizeof buf);
}
bool AudioLayer::audioBufferFillWithZeros(AudioBuffer &buffer) {
bool AudioLayer::audioBufferFillWithZeros(AudioBuffer &buffer)
{
memset(buffer.data(), 0, buffer.size());
return true;
}
bool AudioLayer::audioPlaybackFillWithToneOrRingtone(AudioBuffer &buffer) {
bool AudioLayer::audioPlaybackFillWithToneOrRingtone(AudioBuffer &buffer)
{
AudioLoop *tone = Manager::instance().getTelephoneTone();
AudioLoop *file_tone = Manager::instance().getTelephoneFile();
@ -126,18 +128,17 @@ bool AudioLayer::audioPlaybackFillWithToneOrRingtone(AudioBuffer &buffer) {
// reached. For this reason we need to fill audio buffer with zeros if pointer is NULL
if (tone) {
tone->getNext(buffer.data(), buffer.length(), getPlaybackGain());
}
else if (file_tone) {
} else if (file_tone) {
file_tone->getNext(buffer.data(), buffer.length(), getPlaybackGain());
}
else {
} else {
audioBufferFillWithZeros(buffer);
}
return true;
}
bool AudioLayer::audioPlaybackFillWithUrgent(AudioBuffer &buffer, size_t bytesToGet) {
bool AudioLayer::audioPlaybackFillWithUrgent(AudioBuffer &buffer, size_t bytesToGet)
{
// Urgent data (dtmf, incoming call signal) come first.
bytesToGet = std::min(bytesToGet, buffer.size());
const size_t samplesToGet = bytesToGet / sizeof(SFLDataFormat);
@ -150,17 +151,19 @@ bool AudioLayer::audioPlaybackFillWithUrgent(AudioBuffer &buffer, size_t bytesTo
return true;
}
bool AudioLayer::audioPlaybackFillWithVoice(AudioBuffer &buffer, size_t bytesAvail) {
bool AudioLayer::audioPlaybackFillWithVoice(AudioBuffer &buffer, size_t bytesAvail)
{
const size_t bytesToCpy = buffer.size();
const size_t mainBufferSampleRate = Manager::instance().getMainBuffer().getInternalSamplingRate();
const bool resample = sampleRate_ != mainBufferSampleRate;
if(bytesAvail == 0)
if (bytesAvail == 0)
return false;
double resampleFactor = 1.0;
size_t maxNbBytesToGet = bytesToCpy;
if (resample) {
resampleFactor = mainBufferSampleRate / static_cast<double>(sampleRate_);
maxNbBytesToGet = bytesToCpy * resampleFactor;
@ -171,7 +174,8 @@ bool AudioLayer::audioPlaybackFillWithVoice(AudioBuffer &buffer, size_t bytesAva
const size_t samplesToGet = bytesToGet / sizeof(SFLDataFormat);
AudioBuffer out(samplesToGet);
SFLDataFormat * out_ptr = NULL;
if(resample)
if (resample)
out_ptr = &(*out.data());
else
out_ptr = &(*buffer.data());
@ -183,13 +187,14 @@ bool AudioLayer::audioPlaybackFillWithVoice(AudioBuffer &buffer, size_t bytesAva
SFLDataFormat * const rsmpl_out_ptr = buffer.data();
const size_t outSamples = samplesToGet * resampleFactor;
converter_.resample(out_ptr, rsmpl_out_ptr, outSamples,
mainBufferSampleRate, sampleRate_, samplesToGet);
mainBufferSampleRate, sampleRate_, samplesToGet);
}
return true;
}
bool AudioLayer::audioPlaybackFillBuffer(AudioBuffer &buffer) {
bool AudioLayer::audioPlaybackFillBuffer(AudioBuffer &buffer)
{
// Looks if there's any voice audio from rtp to be played
MainBuffer &mbuffer = Manager::instance().getMainBuffer();
size_t bytesToGet = mbuffer.availableForGet(MainBuffer::DEFAULT_ID);
@ -200,30 +205,32 @@ bool AudioLayer::audioPlaybackFillBuffer(AudioBuffer &buffer) {
bool bufferFilled = false;
switch(mode) {
case NONE:
case TONE:
case RINGTONE:
case URGENT: {
if (urgentBytesToGet > 0)
bufferFilled = audioPlaybackFillWithUrgent(buffer, urgentBytesToGet);
else
bufferFilled = audioPlaybackFillWithToneOrRingtone(buffer);
switch (mode) {
case NONE:
case TONE:
case RINGTONE:
case URGENT: {
if (urgentBytesToGet > 0)
bufferFilled = audioPlaybackFillWithUrgent(buffer, urgentBytesToGet);
else
bufferFilled = audioPlaybackFillWithToneOrRingtone(buffer);
}
break;
case VOICE: {
if(bytesToGet > 0)
bufferFilled = audioPlaybackFillWithVoice(buffer, bytesToGet);
else
case VOICE: {
if (bytesToGet > 0)
bufferFilled = audioPlaybackFillWithVoice(buffer, bytesToGet);
else
bufferFilled = audioBufferFillWithZeros(buffer);
}
break;
case ZEROS:
default:
bufferFilled = audioBufferFillWithZeros(buffer);
}
break;
case ZEROS:
default:
bufferFilled = audioBufferFillWithZeros(buffer);
}
if(!bufferFilled)
if (!bufferFilled)
printf("Error buffer not filled in audio playback\n");
return bufferFilled;
@ -253,14 +260,14 @@ void AudioLayer::audioCaptureFillBuffer(AudioBuffer &buffer)
AudioBuffer rsmpl_out(outSamples);
SFLDataFormat * const rsmpl_out_ptr = rsmpl_out.data();
converter_.resample(in_ptr, rsmpl_out_ptr,
rsmpl_out.length(), mainBufferSampleRate, sampleRate_,
toGetSamples);
rsmpl_out.length(), mainBufferSampleRate, sampleRate_,
toGetSamples);
dcblocker_.process(rsmpl_out_ptr, rsmpl_out_ptr, outSamples);
mbuffer.putData(rsmpl_out_ptr, rsmpl_out.size(), MainBuffer::DEFAULT_ID);
} else {
dcblocker_.process(in_ptr, in_ptr, toGetSamples);
#ifdef RECORD_TOMAIN_TODISK
opensl_tomainbuffer.write((char const *)in_ptr, toGetBytes/);
opensl_tomainbuffer.write((char const *)in_ptr, toGetBytes /);
#endif
mbuffer.putData(in_ptr, toGetBytes, MainBuffer::DEFAULT_ID);
}