From 7156cbb36dc2dd9a8d9584baec2a02ebb6b5d5b5 Mon Sep 17 00:00:00 2001
From: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
Date: Mon, 20 Aug 2007 17:07:19 -0400
Subject: [PATCH] Try to set rate correctly.
+ Add .gitignore
---
.gitignore | 21 +++++++++++++++++++++
src/audio/audiortp.cpp | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..2c15282f5d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+# Ignore unused objects
+*.lo
+*.o
+*.a
+*.la
+*.Po
+*.Plo
+
+# Ignore rendered docs
+doc/html
+
+# Ignore buildsys stuff
+autom4te.cache
+
+# Ignore temp portaudio stuff
+tools/portaudio
+
+# Ignore temp files
+*~
+
+
diff --git a/src/audio/audiortp.cpp b/src/audio/audiortp.cpp
index ca02f0a955..6b242a678d 100644
--- a/src/audio/audiortp.cpp
+++ b/src/audio/audiortp.cpp
@@ -362,6 +362,7 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime)
SFLDataFormat* toAudioLayer;
int nbSample = nbInt16;
+ // 48000 / 8000 = 6 .. Samplerate will convert to 48000 ?!
int nbSampleMaxRate = nbInt16 * 6; // TODO: change it
if ( audiolayer->getSampleRate() != audiocodec->getClockRate() && nbSample) {
@@ -374,7 +375,7 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime)
src_data.data_in = _floatBuffer8000;
src_data.data_out = _floatBuffer48000;
src_data.input_frames = nbSample;
- src_data.output_frames = nbSampleMaxRate;
+ src_data.output_frames = nbSample * audiolayer->getSample() / audiocodec->getClockRate();
src_data.src_ratio = factord;
src_short_to_float_array(_receiveDataDecoded, _floatBuffer8000, nbSample);
src_simple (&src_data, SRC_SINC_BEST_QUALITY/*SRC_SINC_MEDIUM_QUALITY*/, 1); // 1=mono channel
--
GitLab