diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 21:53:14 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 21:53:14 +0000 |
commit | c97969289cc189c0b14381f19b38fdc8989ce68f (patch) | |
tree | 590ecac4fb84d500070769156df427c818d11eb3 /remoting/base | |
parent | 510607c735571c67d0ceb0461b0fc797d08abbcd (diff) | |
download | chromium_src-c97969289cc189c0b14381f19b38fdc8989ce68f.zip chromium_src-c97969289cc189c0b14381f19b38fdc8989ce68f.tar.gz chromium_src-c97969289cc189c0b14381f19b38fdc8989ce68f.tar.bz2 |
Changed test video dimension from 1x1 to 32x32
Latest eider branch libvpx runs in infinite loop with dimension smaller than 32x32.
BUG=None
TEST=remoting_unittets runs
Review URL: https://chromiumcodereview.appspot.com/10802057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
-rw-r--r-- | remoting/base/encoder_vp8.cc | 3 | ||||
-rw-r--r-- | remoting/base/encoder_vp8_unittest.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/remoting/base/encoder_vp8.cc b/remoting/base/encoder_vp8.cc index 83fbffe..937e607 100644 --- a/remoting/base/encoder_vp8.cc +++ b/remoting/base/encoder_vp8.cc @@ -225,6 +225,9 @@ void EncoderVp8::PrepareActiveMap(const SkRegion& updated_region) { void EncoderVp8::Encode(scoped_refptr<CaptureData> capture_data, bool key_frame, const DataAvailableCallback& data_available_callback) { + DCHECK_LE(32, capture_data->size().width()); + DCHECK_LE(32, capture_data->size().height()); + if (!initialized_ || (capture_data->size() != size_)) { bool ret = Init(capture_data->size()); // TODO(hclam): Handle error better. diff --git a/remoting/base/encoder_vp8_unittest.cc b/remoting/base/encoder_vp8_unittest.cc index 3f7f11c..635284b 100644 --- a/remoting/base/encoder_vp8_unittest.cc +++ b/remoting/base/encoder_vp8_unittest.cc @@ -73,8 +73,8 @@ class EncoderDpiCallback { // Test that the DPI information is correctly propagated from the CaptureData // to the VideoPacket. TEST(EncoderVp8Test, TestDpiPropagation) { - int height = 1; - int width = 1; + int height = 32; + int width = 32; const int kBytesPerPixel = 4; EncoderVp8 encoder; |