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 serialisation/transmission of video data

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-07-15 20:04:31 +00:00
parent 9006c567a1
commit 01c467c4c0
11 changed files with 149 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,8 +24,16 @@ bool VideoEncoder::addImage(const QImage& img)
encodeData(img) ;
if(_echo_output_device != NULL)
_echo_output_device->showFrame(img) ;
return true ;
}
bool VideoEncoder::nextPacket(RsVoipDataChunk& chunk)
{
if(_out_queue.empty())
return false ;
chunk = _out_queue.front() ;
_out_queue.pop_front() ;
return true ;
}
@ -40,7 +48,10 @@ QImage JPEGVideoDecoder::decodeData(const unsigned char *encoded_image_data,uint
QByteArray qb((char*)encoded_image_data,size) ;
QImage image ;
if(image.loadFromData(qb))
{
std::cerr << "image decoded successfully" << std::endl;
return image ;
}
else
return QImage() ;
}
@ -55,6 +66,13 @@ void JPEGVideoEncoder::encodeData(const QImage& image)
//destination_decoder->receiveEncodedData((unsigned char *)qb.data(),qb.size()) ;
std::cerr <<"sending encoded data. size = " << qb.size() << std::endl;
RsVoipDataChunk voip_chunk ;
voip_chunk.data = malloc(qb.size());
voip_chunk.size = qb.size() ;
voip_chunk.type = RsVoipDataChunk::RS_VOIP_DATA_TYPE_VIDEO ;
_out_queue.push_back(voip_chunk) ;
std::cerr << "sending encoded data. size = " << qb.size() << std::endl;
}