eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix

Browse source
This commit is contained in:
Volker Fischer 2009-07-30 18:54:50 +00:00
parent 9837af237d
commit 148841d924
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client.cpp
View file

@ -387,7 +387,7 @@ void CClient::ProcessAudioData ( CVector<int16_t>& vecsStereoSndCrd )
// Socket.SendPacket ( Channel.PrepSendPacket ( vecsNetwork ), // Socket.SendPacket ( Channel.PrepSendPacket ( vecsNetwork ),
// Channel.GetAddress() ); // Channel.GetAddress() );
celt_encode(CeltEncoder, &vecsNetwork[0], NULL, &vecCeltData[0], iCeltNumCodedBytes); celt_encode ( CeltEncoder, &vecsNetwork[0], NULL, &vecCeltData[0], iCeltNumCodedBytes );
Socket.SendPacket ( vecCeltData, Channel.GetAddress() ); Socket.SendPacket ( vecCeltData, Channel.GetAddress() );
@ -438,7 +438,7 @@ for ( i = 0; i < iMonoBlockSizeSam; i++ )
*/ */
// TEST CELT // TEST CELT
//celt_encode(CeltEncoder, &vecsAudioSndCrdMono[0], NULL, &vecCeltData[0], iCeltNumCodedBytes); //celt_encode(CeltEncoder, &vecsAudioSndCrdMono[0], NULL, &vecCeltData[0], iCeltNumCodedBytes);
celt_decode(CeltDecoder, &vecbyNetwData[0], iCeltNumCodedBytes, &vecsAudioSndCrdMono[0]); celt_decode ( CeltDecoder, &vecbyNetwData[0], iCeltNumCodedBytes, &vecsAudioSndCrdMono[0] );
for ( i = 0, j = 0; i < iMonoBlockSizeSam; i++, j += 2 ) for ( i = 0, j = 0; i < iMonoBlockSizeSam; i++, j += 2 )

5
src/util.cpp
View file

@ -64,13 +64,14 @@ void CStereoSignalLevelMeter::Update ( CVector<short>& vecsAudio )
dCurLevelR = UpdateCurLevel ( dCurLevelR, sMaxR ); dCurLevelR = UpdateCurLevel ( dCurLevelR, sMaxR );
} }
double CStereoSignalLevelMeter::UpdateCurLevel ( double dCurLevel, const short& sMax ) double CStereoSignalLevelMeter::UpdateCurLevel ( double dCurLevel,
const short& sMax )
{ {
// decrease max with time // decrease max with time
if ( dCurLevel >= METER_FLY_BACK ) if ( dCurLevel >= METER_FLY_BACK )
{ {
// TODO calculate factor from sample rate // TODO calculate factor from sample rate
dCurLevel *= 0.99; dCurLevel *= 0.95;
} }
else else
{ {