Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Time between display frame in VOIP

Browse Source 
But let message to take care of CPU usage at this point...
This commit is contained in:
Phenom 2015-10-04 14:38:33 +02:00
parent 686c2377d3
commit f0cf561ad3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/VOIP/gui/VideoProcessor.cpp
View File

@ -105,7 +105,7 @@ void av_frame_free(AVFrame **frame)
VideoProcessor::VideoProcessor() VideoProcessor::VideoProcessor()
:_encoded_frame_size(640,480) , vpMtx("VideoProcessor") :_encoded_frame_size(640,480) , vpMtx("VideoProcessor")
{ {
_lastTimeToShowFrame = time(NULL); //_lastTimeToShowFrame = time(NULL);
_decoded_output_device = NULL ; _decoded_output_device = NULL ;
//_encoding_current_codec = VIDEO_PROCESSOR_CODEC_ID_JPEG_VIDEO; //_encoding_current_codec = VIDEO_PROCESSOR_CODEC_ID_JPEG_VIDEO;
@ -273,12 +273,12 @@ void VideoProcessor::receiveEncodedData(const RsVOIPDataChunk& chunk)
} }
if(_decoded_output_device) if(_decoded_output_device)
if (time(NULL) > _lastTimeToShowFrame) // if (time(NULL) > _lastTimeToShowFrame)
{ // {
_decoded_output_device->showFrame(img) ; _decoded_output_device->showFrame(img) ;
_lastTimeToShowFrame = time(NULL) ;//+ 1000/25; // _lastTimeToShowFrame = time(NULL) ;//+ 1000/25;
#warning "\plugins\VOIP\gui\VideoProcessor.cpp:210 TODO: Get CPU usage to pass image." #warning "\plugins\VOIP\gui\VideoProcessor.cpp:210 TODO: Get CPU usage to pass image."
} // }
} }
void VideoProcessor::setMaximumBandwidth(uint32_t bytes_per_sec) void VideoProcessor::setMaximumBandwidth(uint32_t bytes_per_sec)

2
plugins/VOIP/gui/VideoProcessor.h
View File

@ -102,7 +102,7 @@ class VideoProcessor
private: private:
QVideoOutputDevice *_decoded_output_device ; QVideoOutputDevice *_decoded_output_device ;
std::list<QImage> _decoded_image_queue ; std::list<QImage> _decoded_image_queue ;
time_t _lastTimeToShowFrame ; //time_t _lastTimeToShowFrame ;
// ===================================================================================== // =====================================================================================
// =------------------------------------ ENCODING -------------------------------------= // =------------------------------------ ENCODING -------------------------------------=