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: audiolayer: fix warnings

Browse Source
This commit is contained in:
Tristan Matthews
2013-07-12 17:31:11 -04:00
parent 098de34346
commit 879f8a1f5b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ bool AudioLayer::audioPlaybackFillWithUrgent(AudioBuffer &buffer, size_t bytesTo
bytesToGet = std::min(bytesToGet, buffer.size());
const size_t samplesToGet = bytesToGet / sizeof(SFLDataFormat);
urgentRingBuffer_.get(buffer.data(), bytesToGet, MainBuffer::DEFAULT_ID);
// AudioLayer::applyGain(buffer.size, samplesToGet, getPlaybackGain());
AudioLayer::applyGain(buffer.data(), samplesToGet, getPlaybackGain());
// Consume the regular one as well (same amount of bytes)
Manager::instance().getMainBuffer().discard(bytesToGet, MainBuffer::DEFAULT_ID);
@ -182,7 +182,6 @@ bool AudioLayer::audioPlaybackFillWithVoice(AudioBuffer &buffer, size_t bytesAva
if (resample) {
SFLDataFormat * const rsmpl_out_ptr = buffer.data();
const size_t outSamples = samplesToGet * resampleFactor;
const size_t outBytes = outSamples * sizeof(SFLDataFormat);
converter_.resample(out_ptr, rsmpl_out_ptr, outSamples,
mainBufferSampleRate, sampleRate_, samplesToGet);
}
@ -236,14 +235,15 @@ bool AudioLayer::audioPlaybackFillBuffer(AudioBuffer &buffer) {
std::ofstream opensl_tomainbuffer("/data/data/com.savoirfairelinux.sflphone/opensl_tomain.raw", std::ofstream::out | std::ofstream::binary);
#endif
void AudioLayer::audioCaptureFillBuffer(AudioBuffer &buffer) {
void AudioLayer::audioCaptureFillBuffer(AudioBuffer &buffer)
{
const int toGetBytes = buffer.size();
const int toGetSamples = buffer.length();
MainBuffer &mbuffer = Manager::instance().getMainBuffer();
const int mainBufferSampleRate = mbuffer.getInternalSamplingRate();
const bool resample = mbuffer.getInternalSamplingRate() != sampleRate_;
const unsigned mainBufferSampleRate = mbuffer.getInternalSamplingRate();
const bool resample = mainBufferSampleRate != sampleRate_;
SFLDataFormat *in_ptr = buffer.data();
AudioLayer::applyGain(in_ptr, toGetSamples, getCaptureGain());