- more cleanups - use uuid library on the rtphone level + formatting fixed
This commit is contained in:
@@ -15,3 +15,4 @@ set_property(TARGET helper_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<C
|
|||||||
# Private include directories
|
# Private include directories
|
||||||
target_include_directories(helper_lib PUBLIC ../../libs/ ../../engine ../ .)
|
target_include_directories(helper_lib PUBLIC ../../libs/ ../../engine ../ .)
|
||||||
target_compile_definitions(helper_lib PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_UNICODE)
|
target_compile_definitions(helper_lib PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_UNICODE)
|
||||||
|
target_link_libraries(helper_lib PUBLIC uuid)
|
||||||
|
|||||||
@@ -331,6 +331,7 @@ AudioReceiver::AudioReceiver(const CodecList::Settings& settings, MT::Statistics
|
|||||||
mResampler48.start(AUDIO_CHANNELS, 48000, AUDIO_SAMPLERATE);
|
mResampler48.start(AUDIO_CHANNELS, 48000, AUDIO_SAMPLERATE);
|
||||||
|
|
||||||
// Init codecs
|
// Init codecs
|
||||||
|
mCodecList.setSettings(settings);
|
||||||
mCodecList.fillCodecMap(mCodecMap);
|
mCodecList.fillCodecMap(mCodecMap);
|
||||||
|
|
||||||
#if defined(DUMP_DECODED)
|
#if defined(DUMP_DECODED)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
#include "MT_Statistics.h"
|
#include "MT_Statistics.h"
|
||||||
#include "audio/Audio_Interface.h"
|
#include "audio/Audio_Interface.h"
|
||||||
@@ -55,8 +56,11 @@ void JitterStatistics::process(jrtplib::RTPPacket* packet, int rate)
|
|||||||
mReceiveTime = receiveTime;
|
mReceiveTime = receiveTime;
|
||||||
mReceiveTimestamp = timestamp;
|
mReceiveTimestamp = timestamp;
|
||||||
|
|
||||||
// And mJitter are in seconds again
|
// And mJitter are in milliseconds again
|
||||||
mJitter.process(mLastJitter.value() / float(rate));
|
float jitter_s = mLastJitter.value() / (float(rate));
|
||||||
|
// std::cout << "Jitter (in seconds): " << std::dec << jitter_s << std::endl;
|
||||||
|
|
||||||
|
mJitter.process(jitter_s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user