generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Account for header inside I420Encoder::InitEncode.

Browse Source 
Also verify that the header is part of the received payload inside
I420Decoder::Decode.

BUG=

Review URL: https://webrtc-codereview.appspot.com/1211005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3690 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-03-19 11:39:03 +00:00
parent 3d0b0d6902
commit 8685090060
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/codecs/i420/main/interface/i420.h
View File

@ -18,6 +18,8 @@
namespace webrtc {
enum { kI420HeaderSize = 4 };
class I420Encoder : public VideoEncoder {
public:
I420Encoder();

14
webrtc/modules/video_coding/codecs/i420/main/source/i420.cc
View File

@ -55,7 +55,8 @@ int I420Encoder::InitEncode(const VideoCodec* codecSettings,
}
const uint32_t newSize = CalcBufferSize(kI420,
codecSettings->width,
codecSettings->height);
codecSettings->height)
+ kI420HeaderSize;
uint8_t* newBuffer = new uint8_t[newSize];
if (newBuffer == NULL) {
return WEBRTC_VIDEO_CODEC_MEMORY;
@ -94,7 +95,6 @@ int I420Encoder::Encode(const I420VideoFrame& inputImage,
return WEBRTC_VIDEO_CODEC_ERR_SIZE;
}
const size_t kI420HeaderSize = 4;
int req_length = CalcBufferSize(kI420, inputImage.width(),
inputImage.height()) + kI420HeaderSize;
if (_encodedImage._size > static_cast<unsigned int>(req_length)) {
@ -182,6 +182,10 @@ int I420Decoder::Decode(const EncodedImage& inputImage, bool /*missingFrames*/,
if (!_inited) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
if (inputImage._length < kI420HeaderSize) {
return WEBRTC_VIDEO_CODEC_ERROR;
}
const uint8_t* buffer = inputImage._buffer;
uint16_t width, height;
@ -190,8 +194,10 @@ int I420Decoder::Decode(const EncodedImage& inputImage, bool /*missingFrames*/,
_height = height;
// Verify that the available length is sufficient:
int req_length = CalcBufferSize(kI420, _width, _height);
if (req_length > static_cast<int>(inputImage._length)) {
uint32_t req_length = CalcBufferSize(kI420, _width, _height)
+ kI420HeaderSize;
if (req_length > inputImage._length) {
return WEBRTC_VIDEO_CODEC_ERROR;
}
// Set decoded image parameters.