Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 22:55:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactored video processing classes, to allow multiple codecs. Not working yet.

Browse source
This commit is contained in:
csoler 2015-08-14 16:44:20 -04:00
parent 3bda2c2660
commit cd97fd9682
8 changed files with 284 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/VOIP/gui/QVideoDevice.cpp
View file

@ -11,7 +11,7 @@ QVideoInputDevice::QVideoInputDevice(QWidget *parent)
{
_timer = NULL ;
_capture_device = NULL ;
_video_encoder = NULL ;
_video_processor = NULL ;
_echo_output_device = NULL ;
_estimated_bw = 0 ;
_total_encoded_size = 0 ;
@ -78,11 +78,11 @@ void QVideoInputDevice::grabFrame()
QImage image = QImage(img_rgb.data,img_rgb.cols,img_rgb.rows,QImage::Format_RGB888);
if(_video_encoder != NULL)
if(_video_processor != NULL)
{
uint32_t encoded_size ;
_video_encoder->addImage(image,0,encoded_size) ;
_video_processor->processImage(image,0,encoded_size) ;
std::cerr << "Encoded size = " << encoded_size << std::endl;
_total_encoded_size += encoded_size ;
@ -107,8 +107,8 @@ void QVideoInputDevice::grabFrame()
bool QVideoInputDevice::getNextEncodedPacket(RsVOIPDataChunk& chunk)
{
if(_video_encoder)
return _video_encoder->nextPacket(chunk) ;
if(_video_processor)
return _video_processor->nextEncodedPacket(chunk) ;
else
return false ;
}