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

added bandwidth measurement for video. Still needs codec to accound for it

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-07-20 20:50:36 +00:00
parent 9c3266fdd9
commit c6103b7535
15 changed files with 157 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,21 +7,13 @@
#include "VideoProcessor.h"
#include "QVideoDevice.h"
//bool VideoDecoder::getNextImage(QImage& image)
//{
// if(_image_queue.empty())
// return false ;
//
// image = _image_queue.front() ;
// _image_queue.pop_front() ;
//
// return true ;
//}
VideoDecoder::VideoDecoder()
{
_output_device = NULL ;
}
bool VideoEncoder::addImage(const QImage& img)
{
std::cerr << "VideoEncoder: adding image." << std::endl;
encodeData(img) ;
return true ;
@ -48,10 +40,7 @@ QImage JPEGVideoDecoder::decodeData(const unsigned char *encoded_image_data,uint
QByteArray qb((char*)encoded_image_data,size) ;
QImage image ;
if(image.loadFromData(qb,"JPEG"))
{
std::cerr << "image decoded successfully" << std::endl;
return image ;
}
else
{
std::cerr << "image.loadFromData(): returned an error.: " << std::endl;
@ -59,6 +48,12 @@ QImage JPEGVideoDecoder::decodeData(const unsigned char *encoded_image_data,uint
}
}
void VideoEncoder::setMaximumFrameRate(uint32_t bytes_per_sec)
{
std::cerr << "Video Encoder: maximum frame rate is set to " << bytes_per_sec << " Bps" << std::endl;
}
void JPEGVideoEncoder::encodeData(const QImage& image)
{
QByteArray qb ;
@ -67,8 +62,6 @@ void JPEGVideoEncoder::encodeData(const QImage& image)
buffer.open(QIODevice::WriteOnly) ;
image.save(&buffer,"JPEG") ;
//destination_decoder->receiveEncodedData((unsigned char *)qb.data(),qb.size()) ;
RsVoipDataChunk voip_chunk ;
voip_chunk.data = malloc(qb.size());
memcpy(voip_chunk.data,qb.data(),qb.size()) ;
@ -76,7 +69,5 @@ void JPEGVideoEncoder::encodeData(const QImage& image)
voip_chunk.type = RsVoipDataChunk::RS_VOIP_DATA_TYPE_VIDEO ;
_out_queue.push_back(voip_chunk) ;
std::cerr << "sending encoded data. size = " << std::dec << qb.size() << std::endl;
}