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

fixed bug in differential frame encoding

Browse Source
This commit is contained in:
csoler 2015-08-14 20:15:44 -04:00
parent cd97fd9682
commit 5aac92fc97
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/VOIP/gui/VideoProcessor.cpp
View File

@ -12,6 +12,7 @@ VideoProcessor::VideoProcessor()
:_encoded_frame_size(256,256) :_encoded_frame_size(256,256)
{ {
_decoded_output_device = NULL ; _decoded_output_device = NULL ;
_encoding_current_codec = VIDEO_PROCESSOR_CODEC_ID_JPEG_VIDEO;
} }
bool VideoProcessor::processImage(const QImage& img,uint32_t size_hint,uint32_t& encoded_size) bool VideoProcessor::processImage(const QImage& img,uint32_t size_hint,uint32_t& encoded_size)
@ -47,7 +48,10 @@ bool VideoProcessor::processImage(const QImage& img,uint32_t size_hint,uint32_t&
return true ; return true ;
} }
else else
{
std::cerr << "No codec for codec ID = " << _encoding_current_codec << ". Please call VideoProcessor::setCurrentCodec()" << std::endl;
return false ; return false ;
}
} }
bool VideoProcessor::nextEncodedPacket(RsVOIPDataChunk& chunk) bool VideoProcessor::nextEncodedPacket(RsVOIPDataChunk& chunk)
@ -120,7 +124,7 @@ void VideoProcessor::setMaximumFrameRate(uint32_t bytes_per_sec)
////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////
JPEGVideo::JPEGVideo() JPEGVideo::JPEGVideo()
: _encoded_ref_frame_max_distance(50),_encoded_ref_frame_count(50) : _encoded_ref_frame_max_distance(10),_encoded_ref_frame_count(10)
{ {
} }
@ -146,19 +150,25 @@ bool JPEGVideo::decodeData(const RsVOIPDataChunk& chunk,QImage& image)
if(flags & JPEG_VIDEO_FLAGS_DIFFERENTIAL_FRAME) if(flags & JPEG_VIDEO_FLAGS_DIFFERENTIAL_FRAME)
{ {
if(_decoded_reference_frame.size() != image.size()) if(_decoded_reference_frame.size() != image.size())
{ {
std::cerr << "Bad reference frame!" << std::endl; std::cerr << "Bad reference frame!" << std::endl;
return false ; return false ;
} }
QImage res = _decoded_reference_frame ; QImage res = _decoded_reference_frame ;
for(uint32_t i=0;i<image.byteCount();++i) for(uint32_t i=0;i<image.byteCount();++i)
res.bits()[i] += (image.bits()[i] - 128) & 0xff ; // it should be -128, but we're doing modulo 256 arithmetic {
int new_val = (int)res.bits()[i] + ((int)image.bits()[i] - 128) ;
res.bits()[i] = std::max(0,std::min(255,new_val)) ;
}
image = res ; image = res ;
} }
else
_decoded_reference_frame = image ;
return true ; return true ;
} }
@ -176,9 +186,12 @@ bool JPEGVideo::encodeData(const QImage& image,uint32_t /* size_hint */,RsVOIPDa
encoded_frame = image ; encoded_frame = image ;
for(uint32_t i=0;i<image.byteCount();++i) for(uint32_t i=0;i<image.byteCount();++i)
encoded_frame.bits()[i] = (image.bits()[i] - _encoded_reference_frame.bits()[i]) + 128; {
int diff = ( (int)image.bits()[i] - (int)_encoded_reference_frame.bits()[i]) + 128;
differential_frame = true ; encoded_frame.bits()[i] = (unsigned char)std::max(0,std::min(255,diff)) ;
}
differential_frame = true ;
} }
else else
{ {