From f2eb4e60e3ad73812501a7d14951805bde113c5a Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Tue, 5 Dec 2006 21:12:12 +0000 Subject: Fix for an RtpMixer bug where an empty chunk was generated in the output (Background processing was aborting saying the Audio Encoding was unknown). AudioChunk SetBuffer and CreateBuffer methods now use the byteSize contained in the chunk details structure instead of asking for it separately. git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@360 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkbasecxx/Filter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'orkbasecxx/Filter.cpp') diff --git a/orkbasecxx/Filter.cpp b/orkbasecxx/Filter.cpp index f154148..df25c1d 100644 --- a/orkbasecxx/Filter.cpp +++ b/orkbasecxx/Filter.cpp @@ -119,9 +119,9 @@ void AlawToPcmFilter::AudioChunkIn(AudioChunkRef& inputAudioChunk) m_outputAudioChunk.reset(new AudioChunk()); outputDetails.m_rtpPayloadType = -1; // Override details that this filter changes outputDetails.m_encoding = PcmAudio; - int numSamples = inputAudioChunk->GetNumSamples(); - short* outputBuffer = (short*)m_outputAudioChunk->CreateBuffer(numSamples*2, outputDetails); + outputDetails.m_numBytes = numSamples*2; + short* outputBuffer = (short*)m_outputAudioChunk->CreateBuffer(outputDetails); char* inputBuffer = (char*)inputAudioChunk->m_pBuffer; @@ -198,9 +198,9 @@ void UlawToPcmFilter::AudioChunkIn(AudioChunkRef& inputAudioChunk) m_outputAudioChunk.reset(new AudioChunk()); outputDetails.m_rtpPayloadType = -1; // Override details that this filter changes outputDetails.m_encoding = PcmAudio; - int numSamples = inputAudioChunk->GetNumSamples(); - short* outputBuffer = (short*)m_outputAudioChunk->CreateBuffer(numSamples*2, outputDetails); + outputDetails.m_numBytes = numSamples*2; + short* outputBuffer = (short*)m_outputAudioChunk->CreateBuffer(outputDetails); char* inputBuffer = (char*)inputAudioChunk->m_pBuffer; -- cgit v1.2.3