Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-10 06:15:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

commit from PR#86 for VOIP, modified so as to restore real-time preview and video display

Browse source
This commit is contained in:
csoler 2015-10-03 22:08:24 -04:00
parent 9158ed64ef
commit b5bfddd1bc
6 changed files with 321 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/VOIP/gui/QVideoDevice.h
View file

@ -2,10 +2,12 @@
#include <QLabel>
#include "interface/rsVOIP.h"
#include "opencv2/opencv.hpp"
#include "gui/VideoProcessor.h"
class VideoEncoder ;
class CvCapture ;
// Responsible from displaying the video. The source of the video is
// a VideoDecoder object, which uses a codec.
@ -61,7 +63,7 @@ protected slots:
private:
VideoProcessor *_video_processor ;
QTimer *_timer ;
CvCapture *_capture_device ;
cv::VideoCapture *_capture_device ;
QVideoOutputDevice *_echo_output_device ;