Skip to content
Snippets Groups Projects
Commit d388a2fa authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#4056] Remove "\n" characters in SIP MESSAGE

parent 870aefa7
No related branches found
No related tags found
No related merge requests found
...@@ -54,6 +54,8 @@ ...@@ -54,6 +54,8 @@
#include "audio/jitterbuf.h" #include "audio/jitterbuf.h"
#include <fstream>
// Frequency (in packet number) // Frequency (in packet number)
#define RTP_TIMESTAMP_RESET_FREQ 100 #define RTP_TIMESTAMP_RESET_FREQ 100
...@@ -254,6 +256,8 @@ class AudioRtpSession : public ost::Thread, public ost::TimerPort ...@@ -254,6 +256,8 @@ class AudioRtpSession : public ost::Thread, public ost::TimerPort
SpeexPreprocessState *_noiseState; SpeexPreprocessState *_noiseState;
// ofstream *captureFile;
protected: protected:
SIPCall * _ca; SIPCall * _ca;
...@@ -311,6 +315,8 @@ AudioRtpSession<D>::AudioRtpSession (ManagerImpl * manager, SIPCall * sipcall) : ...@@ -311,6 +315,8 @@ AudioRtpSession<D>::AudioRtpSession (ManagerImpl * manager, SIPCall * sipcall) :
_ts= 0; _ts= 0;
_packetLength = 20; _packetLength = 20;
_currentTime = 0; _currentTime = 0;
// captureFile = new ofstream ("probeCaptureFile", ofstream::binary);
} }
template <typename D> template <typename D>
...@@ -368,6 +374,11 @@ AudioRtpSession<D>::~AudioRtpSession() ...@@ -368,6 +374,11 @@ AudioRtpSession<D>::~AudioRtpSession()
speex_preprocess_state_destroy (_noiseState); speex_preprocess_state_destroy (_noiseState);
} }
// captureFile->close();
// delete captureFile;
} }
template <typename D> template <typename D>
...@@ -386,14 +397,14 @@ void AudioRtpSession<D>::initBuffers() ...@@ -386,14 +397,14 @@ void AudioRtpSession<D>::initBuffers()
int nbSamplesMax = (int) (_codecSampleRate * _layerFrameSize /1000) *2; int nbSamplesMax = (int) (_codecSampleRate * _layerFrameSize /1000) *2;
_micData = new SFLDataFormat[nbSamplesMax]; _micData = new SFLDataFormat[nbSamplesMax];
_micDataConverted = new SFLDataFormat[nbSamplesMax]; _micDataConverted = new SFLDataFormat[nbSamplesMax];
_micDataEncoded = new unsigned char[nbSamplesMax]; _micDataEncoded = new unsigned char[nbSamplesMax*2];
_spkrDataConverted = new SFLDataFormat[nbSamplesMax]; _spkrDataConverted = new SFLDataFormat[nbSamplesMax];
_spkrDataDecoded = new SFLDataFormat[nbSamplesMax]; _spkrDataDecoded = new SFLDataFormat[nbSamplesMax];
memset (_micData, 0, nbSamplesMax*sizeof (SFLDataFormat)); memset (_micData, 0, nbSamplesMax*sizeof (SFLDataFormat));
memset (_micDataConverted, 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 (_spkrDataConverted, 0, nbSamplesMax*sizeof (SFLDataFormat));
memset (_spkrDataDecoded, 0, nbSamplesMax*sizeof (SFLDataFormat)); memset (_spkrDataDecoded, 0, nbSamplesMax*sizeof (SFLDataFormat));
...@@ -649,6 +660,8 @@ void AudioRtpSession<D>::processDataDecode (unsigned char * spkrData, unsigned i ...@@ -649,6 +660,8 @@ void AudioRtpSession<D>::processDataDecode (unsigned char * spkrData, unsigned i
// Return the size of data in bytes // Return the size of data in bytes
int expandedSize = _audiocodec->codecDecode (_spkrDataDecoded , spkrData , size); int expandedSize = _audiocodec->codecDecode (_spkrDataDecoded , spkrData , size);
// captureFile->write ((const char *)_spkrDataDecoded, expandedSize);
// buffer _receiveDataDecoded ----> short int or int16, coded on 2 bytes // buffer _receiveDataDecoded ----> short int or int16, coded on 2 bytes
int nbSample = expandedSize / sizeof (SFLDataFormat); int nbSample = expandedSize / sizeof (SFLDataFormat);
......
...@@ -290,11 +290,11 @@ InstantMessaging::UriList InstantMessaging::parseXmlUriList (std::string& urilis ...@@ -290,11 +290,11 @@ InstantMessaging::UriList InstantMessaging::parseXmlUriList (std::string& urilis
std::string InstantMessaging::appendUriList (std::string text, UriList& list) 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 (text);
formatedText.append ("\n--boundary\nContent-Type: application/resource-lists+xml\n"); formatedText.append ("--boundary Content-Type: application/resource-lists+xml");
formatedText.append ("Content-Disposition: recipient-list\n\n"); formatedText.append ("Content-Disposition: recipient-list");
std::string recipientlist = generateXmlUriList (list); std::string recipientlist = generateXmlUriList (list);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment