summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/message_decoder_unittest.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 22:23:08 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 22:23:08 +0000
commit4e758b649512b9e6ab5c6c67f38572894062139d (patch)
tree5322a791926a0218d78c8d41afe03705a8a95e54 /remoting/protocol/message_decoder_unittest.cc
parent715126056fa8080cd3c5b21e513dd417ddd6c66f (diff)
downloadchromium_src-4e758b649512b9e6ab5c6c67f38572894062139d.zip
chromium_src-4e758b649512b9e6ab5c6c67f38572894062139d.tar.gz
chromium_src-4e758b649512b9e6ab5c6c67f38572894062139d.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@64672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/message_decoder_unittest.cc')
-rw-r--r--remoting/protocol/message_decoder_unittest.cc35
1 files changed, 7 insertions, 28 deletions
diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc
index a2d4b20..90c6680 100644
--- a/remoting/protocol/message_decoder_unittest.cc
+++ b/remoting/protocol/message_decoder_unittest.cc
@@ -41,18 +41,8 @@ static void PrepareData(uint8** buffer, int* size) {
// Then append 10 update sequences to the data.
for (int i = 0; i < 10; ++i) {
- msg.mutable_begin_update_stream();
- AppendMessage(msg, &encoded_data);
- msg.Clear();
-
- msg.mutable_update_stream_packet()->mutable_rect_data()->
- set_sequence_number(0);
- msg.mutable_update_stream_packet()->mutable_rect_data()->
- set_data(kTestData);
- AppendMessage(msg, &encoded_data);
- msg.Clear();
-
- msg.mutable_end_update_stream();
+ msg.mutable_video_packet()->set_sequence_number(0);
+ msg.mutable_video_packet()->set_data(kTestData);
AppendMessage(msg, &encoded_data);
msg.Clear();
}
@@ -90,30 +80,19 @@ void SimulateReadSequence(const int read_sequence[], int sequence_size) {
}
// Then verify the decoded messages.
- EXPECT_EQ(31u, message_list.size());
+ EXPECT_EQ(11u, message_list.size());
EXPECT_TRUE(message_list.front()->has_init_client());
delete message_list.front();
message_list.pop_front();
- int index = 0;
for (std::list<ChromotingHostMessage*>::iterator it =
message_list.begin();
it != message_list.end(); ++it) {
ChromotingHostMessage* message = *it;
- int type = index % 3;
- ++index;
- if (type == 0) {
- // Begin update stream.
- EXPECT_TRUE(message->has_begin_update_stream());
- } else if (type == 1) {
- // Partial update stream.
- EXPECT_TRUE(message->has_update_stream_packet());
- EXPECT_EQ(kTestData,
- message->update_stream_packet().rect_data().data());
- } else if (type == 2) {
- // End update stream.
- EXPECT_TRUE(message->has_end_update_stream());
- }
+ // Partial update stream.
+ EXPECT_TRUE(message->has_video_packet());
+ EXPECT_EQ(kTestData,
+ message->video_packet().data().data());
}
STLDeleteElements(&message_list);
}