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

Side by Side Diff: webrtc/media/base/videoengine_unittest.h

Issue 2815203002: Don't add stuff to namespace std (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 static const uint32_t kSsrcs4[] = {1, 2, 3, 4}; 52 static const uint32_t kSsrcs4[] = {1, 2, 3, 4};
53 static const int kVideoWidth = 640; 53 static const int kVideoWidth = 640;
54 static const int kVideoHeight = 360; 54 static const int kVideoHeight = 360;
55 static const int kFramerate = 30; 55 static const int kFramerate = 30;
56 56
57 inline bool IsEqualCodec(const cricket::VideoCodec& a, 57 inline bool IsEqualCodec(const cricket::VideoCodec& a,
58 const cricket::VideoCodec& b) { 58 const cricket::VideoCodec& b) {
59 return a.id == b.id && a.name == b.name; 59 return a.id == b.id && a.name == b.name;
60 } 60 }
61 61
62 namespace std { 62 namespace cricket {
63 inline std::ostream& operator<<(std::ostream& s, const cricket::VideoCodec& c) { 63 inline std::ostream& operator<<(std::ostream& s, const VideoCodec& c) {
magjed_webrtc 2017/04/13 09:56:02 This function is not used so just remove it instea
kwiberg-webrtc 2017/04/13 11:22:31 Done.
64 s << "{" << c.name << "(" << c.id << ")" 64 s << "{" << c.name << "(" << c.id << ")"
65 << "}"; 65 << "}";
66 return s; 66 return s;
67 } 67 }
68 } // namespace std 68 } // namespace cricket
69 69
70 template<class E, class C> 70 template<class E, class C>
71 class VideoMediaChannelTest : public testing::Test, 71 class VideoMediaChannelTest : public testing::Test,
72 public sigslot::has_slots<> { 72 public sigslot::has_slots<> {
73 protected: 73 protected:
74 VideoMediaChannelTest<E, C>() 74 VideoMediaChannelTest<E, C>()
75 : call_(webrtc::Call::Create(webrtc::Call::Config(&event_log_))) {} 75 : call_(webrtc::Call::Create(webrtc::Call::Config(&event_log_))) {}
76 76
77 virtual cricket::VideoCodec DefaultCodec() = 0; 77 virtual cricket::VideoCodec DefaultCodec() = 0;
78 78
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 std::unique_ptr<C> channel_; 944 std::unique_ptr<C> channel_;
945 cricket::FakeNetworkInterface network_interface_; 945 cricket::FakeNetworkInterface network_interface_;
946 cricket::FakeVideoRenderer renderer_; 946 cricket::FakeVideoRenderer renderer_;
947 cricket::VideoMediaChannel::Error media_error_; 947 cricket::VideoMediaChannel::Error media_error_;
948 948
949 // Used by test cases where 2 streams are run on the same channel. 949 // Used by test cases where 2 streams are run on the same channel.
950 cricket::FakeVideoRenderer renderer2_; 950 cricket::FakeVideoRenderer renderer2_;
951 }; 951 };
952 952
953 #endif // WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT 953 #endif // WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698