Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 10:46:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch

Browse source 
Fix Windows 7 32b Compilation from scratch.
This commit is contained in:
defnax 2015-11-06 01:58:30 +01:00
commit c41f98cb4c
22 changed files with 1257 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/VOIP/gui/VideoProcessor.cpp
View file

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

1
plugins/VOIP/gui/VideoProcessor.h
View file

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