pkasting@chromium.org
2014-11-20 22:28:14 +00:00
parent edc6e57a92
commit 4591fbd09f
341 changed files with 2610 additions and 2613 deletions

View File

@ -36,7 +36,7 @@ _oldStretchedHeight( 0),
_oldStretchedWidth( 0),
_buffer( 0),
_bufferSize( 0),
_incommingBufferSize( 0),
_incomingBufferSize( 0),
_bufferIsUpdated( false),
_numberOfStreams( 0),
_pixelFormat( GL_RGBA),
@ -150,7 +150,7 @@ int VideoChannelNSOpenGL::FrameSizeChange(int width, int height, int numberOfStr
_bufferSize = 0;
}
_incommingBufferSize = CalcBufferSize(kI420, _width, _height);
_incomingBufferSize = CalcBufferSize(kI420, _width, _height);
_bufferSize = CalcBufferSize(kARGB, _width, _height);
_buffer = new unsigned char [_bufferSize];
memset(_buffer, 0, _bufferSize * sizeof(unsigned char));
@ -215,8 +215,8 @@ int VideoChannelNSOpenGL::DeliverFrame(const I420VideoFrame& videoFrame) {
return 0;
}
int length = CalcBufferSize(kI420, videoFrame.width(), videoFrame.height());
if (length != _incommingBufferSize) {
if (CalcBufferSize(kI420, videoFrame.width(), videoFrame.height()) !=
_incomingBufferSize) {
_owner->UnlockAGLCntx();
return -1;
}