summaryrefslogtreecommitdiffstats
path: root/remoting/client/chromoting_view_unittest.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 01:08:19 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 01:08:19 +0000
commit04b36141e7b2b1540b1b84a039f6d078ca770442 (patch)
treeae3b109a5c603c3382a5ae5555d599599a59d03f /remoting/client/chromoting_view_unittest.cc
parent21a7127af3e46e81d1f2eccf9dccfb8b394d8688 (diff)
downloadchromium_src-04b36141e7b2b1540b1b84a039f6d078ca770442.zip
chromium_src-04b36141e7b2b1540b1b84a039f6d078ca770442.tar.gz
chromium_src-04b36141e7b2b1540b1b84a039f6d078ca770442.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/chromoting_view_unittest.cc')
-rw-r--r--remoting/client/chromoting_view_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/client/chromoting_view_unittest.cc b/remoting/client/chromoting_view_unittest.cc
index 4b31435..a57962e 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, UpdateStreamEncoding());
+ MOCK_METHOD0(Encoding, VideoPacketFormat::Encoding());
MOCK_METHOD0(IsStarted, bool());
private:
@@ -64,7 +64,7 @@ class FakeView : public ChromotingView {
}
// Testing wrappers for private setup/startup decoder routines.
- bool setup_decoder(UpdateStreamEncoding encoding) {
+ bool setup_decoder(VideoPacketFormat::Encoding encoding) {
return SetupDecoder(encoding);
}
bool begin_decoding(Task* partial_decode_done, Task* decode_done) {