From d388a2facd1d018ecff44f95d2192cf58729bfc3 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Mon, 13 Sep 2010 10:28:11 -0400
Subject: [PATCH] [#4056] Remove "\n" characters in SIP MESSAGE
---
.../src/audio/audiortp/AudioRtpSession.h | 17 +++++++++++++++--
sflphone-common/src/sip/im/InstantMessaging.cpp | 6 +++---
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index 25770f4c37..30971aaa53 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -54,6 +54,8 @@
#include "audio/jitterbuf.h"
+#include <fstream>
+
// Frequency (in packet number)
#define RTP_TIMESTAMP_RESET_FREQ 100
@@ -254,6 +256,8 @@ class AudioRtpSession : public ost::Thread, public ost::TimerPort
SpeexPreprocessState *_noiseState;
+ // ofstream *captureFile;
+
protected:
SIPCall * _ca;
@@ -311,6 +315,8 @@ AudioRtpSession<D>::AudioRtpSession (ManagerImpl * manager, SIPCall * sipcall) :
_ts= 0;
_packetLength = 20;
_currentTime = 0;
+
+ // captureFile = new ofstream ("probeCaptureFile", ofstream::binary);
}
template <typename D>
@@ -368,6 +374,11 @@ AudioRtpSession<D>::~AudioRtpSession()
speex_preprocess_state_destroy (_noiseState);
}
+
+ // captureFile->close();
+
+ // delete captureFile;
+
}
template <typename D>
@@ -386,14 +397,14 @@ void AudioRtpSession<D>::initBuffers()
int nbSamplesMax = (int) (_codecSampleRate * _layerFrameSize /1000) *2;
_micData = new SFLDataFormat[nbSamplesMax];
_micDataConverted = new SFLDataFormat[nbSamplesMax];
- _micDataEncoded = new unsigned char[nbSamplesMax];
+ _micDataEncoded = new unsigned char[nbSamplesMax*2];
_spkrDataConverted = new SFLDataFormat[nbSamplesMax];
_spkrDataDecoded = new SFLDataFormat[nbSamplesMax];
memset (_micData, 0, nbSamplesMax*sizeof (SFLDataFormat));
memset (_micDataConverted, 0, nbSamplesMax*sizeof (SFLDataFormat));
- memset (_micDataEncoded, 0, nbSamplesMax);
+ memset (_micDataEncoded, 0, nbSamplesMax*2);
memset (_spkrDataConverted, 0, nbSamplesMax*sizeof (SFLDataFormat));
memset (_spkrDataDecoded, 0, nbSamplesMax*sizeof (SFLDataFormat));
@@ -649,6 +660,8 @@ void AudioRtpSession<D>::processDataDecode (unsigned char * spkrData, unsigned i
// Return the size of data in bytes
int expandedSize = _audiocodec->codecDecode (_spkrDataDecoded , spkrData , size);
+ // captureFile->write ((const char *)_spkrDataDecoded, expandedSize);
+
// buffer _receiveDataDecoded ----> short int or int16, coded on 2 bytes
int nbSample = expandedSize / sizeof (SFLDataFormat);
diff --git a/sflphone-common/src/sip/im/InstantMessaging.cpp b/sflphone-common/src/sip/im/InstantMessaging.cpp
index 51b03f8981..c88c166757 100644
--- a/sflphone-common/src/sip/im/InstantMessaging.cpp
+++ b/sflphone-common/src/sip/im/InstantMessaging.cpp
@@ -290,11 +290,11 @@ InstantMessaging::UriList InstantMessaging::parseXmlUriList (std::string& urilis
std::string InstantMessaging::appendUriList (std::string text, UriList& list)
{
- std::string formatedText = "--boundary\n Content-Type: text/plain\n\n";
+ std::string formatedText = "--boundary Content-Type: text/plain";
formatedText.append (text);
- formatedText.append ("\n--boundary\nContent-Type: application/resource-lists+xml\n");
- formatedText.append ("Content-Disposition: recipient-list\n\n");
+ formatedText.append ("--boundary Content-Type: application/resource-lists+xml");
+ formatedText.append ("Content-Disposition: recipient-list");
std::string recipientlist = generateXmlUriList (list);
--
GitLab