diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..2c15282f5dfb9e172a3d70966de99fdf64da9414 --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +# Ignore unused objects +*.lo +*.o +*.a +*.la +*.Po +*.Plo + +# Ignore rendered docs +doc/html + +# Ignore buildsys stuff +autom4te.cache + +# Ignore temp portaudio stuff +tools/portaudio + +# Ignore temp files +*~ + + diff --git a/src/audio/audiortp.cpp b/src/audio/audiortp.cpp index ca02f0a955b5a6cc1126f9f3eeef79ff786e1ffc..6b242a678de73c4f76b2827816d4d7b35cca7908 100644 --- a/src/audio/audiortp.cpp +++ b/src/audio/audiortp.cpp @@ -362,6 +362,7 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime) SFLDataFormat* toAudioLayer; int nbSample = nbInt16; + // 48000 / 8000 = 6 .. Samplerate will convert to 48000 ?! int nbSampleMaxRate = nbInt16 * 6; // TODO: change it if ( audiolayer->getSampleRate() != audiocodec->getClockRate() && nbSample) { @@ -374,7 +375,7 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime) src_data.data_in = _floatBuffer8000; src_data.data_out = _floatBuffer48000; src_data.input_frames = nbSample; - src_data.output_frames = nbSampleMaxRate; + src_data.output_frames = nbSample * audiolayer->getSample() / audiocodec->getClockRate(); src_data.src_ratio = factord; src_short_to_float_array(_receiveDataDecoded, _floatBuffer8000, nbSample); src_simple (&src_data, SRC_SINC_BEST_QUALITY/*SRC_SINC_MEDIUM_QUALITY*/, 1); // 1=mono channel