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

Make VOIP running with newer FFmpeg version.

Browse Source
This commit is contained in:
Phenom 2015-09-24 00:20:51 +02:00
parent 79d761ae2e
commit e47168baae
3 changed files with 10 additions and 0 deletions
Show Stats 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 -------------------------------------=

3
win_build_libs/Makefile
View File

@ -201,6 +201,9 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
mkdir -p libs/include/libavutil && cp -r ffmpeg-$(FFMPEG_VERSION)/libavutil/*.h libs/include/libavutil/
cp -r ffmpeg-$(FFMPEG_VERSION)/libavutil/*.a libs/lib/
cp -r ffmpeg-$(FFMPEG_VERSION)/libavutil/*.dll libs/bin/
mkdir -p libs/include/libswresample && cp -r ffmpeg-$(FFMPEG_VERSION)/libswresample/*.h libs/include/libswresample/
cp -r ffmpeg-$(FFMPEG_VERSION)/libswresample/*.a libs/lib/
cp -r ffmpeg-$(FFMPEG_VERSION)/libswresample/*.dll libs/bin/
rm -r -f ffmpeg-$(FFMPEG_VERSION)
touch ffmpeg