From cf2b8d5026bef4c08a641a1bdf2426c20e7a3d36 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.net>
Date: Wed, 22 Apr 2009 18:39:02 -0400
Subject: [PATCH] add nbSampleMax for unresampled data (#1143)
---
sflphone-common/src/audio/audiortp.cpp | 3 ++-
sflphone-common/src/audio/codecs/celtcodec.cpp | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sflphone-common/src/audio/audiortp.cpp b/sflphone-common/src/audio/audiortp.cpp
index 318f418a6b..09892b08c2 100644
--- a/sflphone-common/src/audio/audiortp.cpp
+++ b/sflphone-common/src/audio/audiortp.cpp
@@ -398,7 +398,7 @@ AudioRtpRTX::sendSessionFromMic(int timestamp)
int nbSamplesMax = _layerFrameSize * _audiocodec->getClockRate() / 1000;
_debug("_nbSamplesMax %i\n", nbSamplesMax);
- //_debug("resample data = %i\n", nb_sample_up);
+ _debug("resample data = %i\n", nb_sample_up);
nbSample = reSampleData(_audiocodec->getClockRate(), nb_sample_up, DOWN_SAMPLING);
if ( nbSample < nbSamplesMax - 10 ) { // if only 10 is missing, it's ok
@@ -410,6 +410,7 @@ AudioRtpRTX::sendSessionFromMic(int timestamp)
} else {
+ int nbSamplesMax = 128;
// no resampling required
compSize = _audiocodec->codecEncode( micDataEncoded, micData, nbSample*sizeof(int16));
diff --git a/sflphone-common/src/audio/codecs/celtcodec.cpp b/sflphone-common/src/audio/codecs/celtcodec.cpp
index feb3f61d0b..42a9bdbb44 100644
--- a/sflphone-common/src/audio/codecs/celtcodec.cpp
+++ b/sflphone-common/src/audio/codecs/celtcodec.cpp
@@ -26,8 +26,7 @@
class Celt : public AudioCodec{
public:
Celt(int payload=0)
- : AudioCodec(payload, "celt"),
- _celt_frame_size(128)
+ : AudioCodec(payload, "celt")
{
_clockRate = 44100;
_frameSize = 512; // fixed frameSize, TODO: support 64 to 512 frame size
@@ -86,7 +85,8 @@ class Celt : public AudioCodec{
virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
{
int len = 0;
- len = celt_encode(enc, (celt_int16_t *)src, NULL, dst, size);
+ len = celt_encode(enc, (celt_int16_t *)src, NULL, dst, 128);
+ // returns the number of bytes writen
return len;
}
--
GitLab