Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2024-05-20 13:08:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Video Recorder: Fixed camstudio codec problems when picture width was not a multiple of 4

Browse source
This commit is contained in:
Souryo 2017-04-27 17:44:56 -04:00
parent 51be9b825d
commit 8a2f09b0fd
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Utilities/CamstudioCodec.cpp
View file

@ -33,22 +33,25 @@ CamstudioCodec::~CamstudioCodec()
bool CamstudioCodec::SetupCompress(int width, int height, uint32_t compressionLevel)
{
_compressionLevel = compressionLevel;
_orgHeight = height;
_orgWidth = width;
_width = (width + 3) & ~3;
_height = (height + 3) & ~3;
if(width % 4 != 0) {
_rowStride = ((int)((width * 24 + 31) / 32 * 4));
} else {
_rowStride = width*3;
}
_height = height;
_prevFrame = new uint8_t[_width*_height*3]; //24-bit RGB
_currentFrame = new uint8_t[_width*height*3]; //24-bit RGB
_buffer = new uint8_t[_width*height*3]; //24-bit RGB
_prevFrame = new uint8_t[_rowStride*_height]; //24-bit RGB
_currentFrame = new uint8_t[_rowStride*_height]; //24-bit RGB
_buffer = new uint8_t[_rowStride*_height]; //24-bit RGB
_compressBufferLength = compressBound(_width*_height * 3) + 2;
_compressBufferLength = compressBound(_rowStride*_height) + 2;
_compressBuffer = new uint8_t[_compressBufferLength];
memset(_prevFrame, 0, _width * _height * 3);
memset(_currentFrame, 0, _width * _height * 3);
memset(_buffer, 0, _width * _height * 3);
memset(_prevFrame, 0, _rowStride * _height);
memset(_currentFrame, 0, _rowStride * _height);
memset(_buffer, 0, _rowStride * _height);
memset(_compressBuffer, 0, _compressBufferLength);
deflateInit(&_compressor, compressionLevel);
@ -79,26 +82,22 @@ int CamstudioCodec::CompressFrame(bool isKeyFrame, uint8_t *frameData, uint8_t**
uint8_t* rowBuffer = _currentFrame;
for(int y = 0; y < _height; y++) {
if(y < _height - _orgHeight) {
memset(rowBuffer, 0, _width * 3);
} else {
LoadRow(frameData + (_height - y - 1) * _orgWidth * 4, rowBuffer);
}
rowBuffer += _width * 3;
LoadRow(frameData + (_height - y - 1) * _orgWidth * 4, rowBuffer);
rowBuffer += _rowStride;
}
if(isKeyFrame) {
_compressor.next_in = _currentFrame;
} else {
for(int i = 0, len = _width * _height * 3; i < len; i++) {
for(int i = 0, len = _rowStride * _height; i < len; i++) {
_buffer[i] = _currentFrame[i] - _prevFrame[i];
}
_compressor.next_in = _buffer;
}
memcpy(_prevFrame, _currentFrame, _width*_height*3);
memcpy(_prevFrame, _currentFrame, _rowStride*_height);
_compressor.avail_in = _height * _width * 3;
_compressor.avail_in = _height * _rowStride;
deflate(&_compressor, MZ_FINISH);
*compressedData = _compressBuffer;

3
Utilities/CamstudioCodec.h
View file

@ -16,8 +16,7 @@ private:
int _compressionLevel = 0;
int _orgWidth = 0;
int _orgHeight = 0;
int _width = 0;
int _rowStride = 0;
int _height = 0;
void LoadRow(uint8_t* inPointer, uint8_t* outPointer);