wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 919979 - Crash when calling WebrtcVideoConduit::SendVideoFrame() with very small resolution. r=derf

Browse Source
This commit is contained in:
Shian-Yow Wu 2013-12-04 13:34:59 +08:00
parent a44ebb9296
commit fc563255ca
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
media/webrtc/signaling/test/mediaconduit_unittests.cpp
View File

@ -830,17 +830,23 @@ class TransportConduitTest : public ::testing::Test
ASSERT_EQ(width, 80);
ASSERT_EQ(height, 4);
// Extremely small width and height(see bug 919979).
cerr << "Test with extremely small width and height" << endl;
orig_width = 2;
orig_height = 2;
max_fs = 5;
GetVideoResolutionWithMaxFs(orig_width, orig_height, max_fs, &width, &height);
DumpMaxFs(orig_width, orig_height, max_fs, width, height);
ASSERT_EQ(width, 2);
ASSERT_EQ(height, 2);
// Random values.
cerr << "Test with random values" << endl;
for (int i = 0; i < 30; i++) {
cerr << ".";
max_fs = rand() % 1000;
orig_width = ((rand() % 2000) & ~1) + 2;
orig_height = ((rand() % 2000) & ~1) + 2;
// Potential crash on small resolution, see bug 919979.
if (orig_width * orig_height <= 20) {
cerr << "Temporarily skip resolution " << orig_width << "x" <<
orig_height << endl;
continue;
}
GetVideoResolutionWithMaxFs(orig_width, orig_height, max_fs,
&width, &height);
@ -854,6 +860,7 @@ class TransportConduitTest : public ::testing::Test
ADD_FAILURE();
}
}
cerr << endl;
}
private:

4
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
View File

@ -171,7 +171,9 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst,
if (encoded_image_._buffer != NULL) {
delete [] encoded_image_._buffer;
}
encoded_image_._size = CalcBufferSize(kI420, codec_.width, codec_.height);
// Reserve 100 extra bytes for overhead at small resolutions.
encoded_image_._size = CalcBufferSize(kI420, codec_.width, codec_.height)
+ 100;
encoded_image_._buffer = new uint8_t[encoded_image_._size];
encoded_image_._completeFrame = true;