Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Side by Side Diff: remoting/protocol/content_description_unittest.cc

Issue 850983002: Implement video frame acknowledgements in the chromoting protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/content_description.h" 5 #include "remoting/protocol/content_description.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "remoting/protocol/authenticator.h" 10 #include "remoting/protocol/authenticator.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 " <video transport=\"stream\" version=\"2\" codec=\"vp8\"/>" 46 " <video transport=\"stream\" version=\"2\" codec=\"vp8\"/>"
47 " <authentication/>" 47 " <authentication/>"
48 "</description>"; 48 "</description>";
49 scoped_ptr<buzz::XmlElement> xml(buzz::XmlElement::ForStr(kTestDescription)); 49 scoped_ptr<buzz::XmlElement> xml(buzz::XmlElement::ForStr(kTestDescription));
50 scoped_ptr<ContentDescription> parsed( 50 scoped_ptr<ContentDescription> parsed(
51 ContentDescription::ParseXml(xml.get())); 51 ContentDescription::ParseXml(xml.get()));
52 ASSERT_TRUE(parsed.get()); 52 ASSERT_TRUE(parsed.get());
53 EXPECT_EQ(1U, parsed->config()->event_configs().size()); 53 EXPECT_EQ(1U, parsed->config()->event_configs().size());
54 EXPECT_TRUE(parsed->config()->event_configs().front() == 54 EXPECT_TRUE(parsed->config()->event_configs().front() ==
55 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, 55 ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
56 kDefaultStreamVersion, 56 kEventStreamVersion,
57 ChannelConfig::CODEC_UNDEFINED)); 57 ChannelConfig::CODEC_UNDEFINED));
58 } 58 }
59 59
60 // Verify that we can parse configs with none transport without version and 60 // Verify that we can parse configs with none transport without version and
61 // codec. 61 // codec.
62 TEST(ContentDescriptionTest, NoneTransport) { 62 TEST(ContentDescriptionTest, NoneTransport) {
63 std::string kTestDescription = 63 std::string kTestDescription =
64 "<description xmlns=\"google:remoting\">" 64 "<description xmlns=\"google:remoting\">"
65 " <control transport=\"stream\" version=\"2\"/>" 65 " <control transport=\"stream\" version=\"2\"/>"
66 " <event transport=\"stream\" version=\"2\"/>" 66 " <event transport=\"stream\" version=\"2\"/>"
(...skipping 26 matching lines...) Expand all
93 scoped_ptr<ContentDescription> parsed( 93 scoped_ptr<ContentDescription> parsed(
94 ContentDescription::ParseXml(xml.get())); 94 ContentDescription::ParseXml(xml.get()));
95 ASSERT_TRUE(parsed.get()); 95 ASSERT_TRUE(parsed.get());
96 EXPECT_EQ(1U, parsed->config()->audio_configs().size()); 96 EXPECT_EQ(1U, parsed->config()->audio_configs().size());
97 EXPECT_TRUE(parsed->config()->audio_configs().front() == ChannelConfig()); 97 EXPECT_TRUE(parsed->config()->audio_configs().front() == ChannelConfig());
98 } 98 }
99 99
100 } // namespace protocol 100 } // namespace protocol
101 } // namespace remoting 101 } // namespace remoting
102 102
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698