diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 23:02:41 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 23:02:41 +0000 |
| commit | f2333df090cf3f00846d2ce3ffe41119718d3cc8 (patch) | |
| tree | f0c381736c9e123e33a3289a06689028268be1bf /remoting/client/chromoting_view_unittest.cc | |
| parent | c64eb4096d30f3018ccd75d076fb90304f0143b7 (diff) | |
| download | chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.zip chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.tar.gz chromium_src-f2333df090cf3f00846d2ce3ffe41119718d3cc8.tar.bz2 | |
Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8.
1. Moved video-related protobuf messages from event.proto to video.proto. Removed those that we don't need anymore
2. Fixed naming for enums and some types.
3. Reenabled VP8.
4. Proper RGB-YUV converter for VP8 encoder.
5. Changed the capturer_fake to show more meaningful picture.
BUG=57374
TEST=unittests
Review URL: http://codereview.chromium.org/4136010
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/4255001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/chromoting_view_unittest.cc')
| -rw-r--r-- | remoting/client/chromoting_view_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/client/chromoting_view_unittest.cc b/remoting/client/chromoting_view_unittest.cc index a57962e..4b31435 100644 --- a/remoting/client/chromoting_view_unittest.cc +++ b/remoting/client/chromoting_view_unittest.cc @@ -26,7 +26,7 @@ class MockDecoder : public Decoder { MOCK_METHOD1(PartialDecode, bool(ChromotingHostMessage* message)); MOCK_METHOD0(EndDecode, void()); - MOCK_METHOD0(Encoding, VideoPacketFormat::Encoding()); + MOCK_METHOD0(Encoding, UpdateStreamEncoding()); MOCK_METHOD0(IsStarted, bool()); private: @@ -64,7 +64,7 @@ class FakeView : public ChromotingView { } // Testing wrappers for private setup/startup decoder routines. - bool setup_decoder(VideoPacketFormat::Encoding encoding) { + bool setup_decoder(UpdateStreamEncoding encoding) { return SetupDecoder(encoding); } bool begin_decoding(Task* partial_decode_done, Task* decode_done) { |