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

Side by Side Diff: webrtc/video/picture_id_tests.cc

Issue 3012853002: Update thread annotiation macros to use RTC_ prefix (Closed)
Patch Set: Rebase Created 3 years, 3 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 | « webrtc/video/payload_router.h ('k') | webrtc/video/receive_statistics_proxy.h » ('j') | 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #include "webrtc/media/engine/internalencoderfactory.h" 10 #include "webrtc/media/engine/internalencoderfactory.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 observed_ssrcs_.insert(ssrc); 117 observed_ssrcs_.insert(ssrc);
118 if (observed_ssrcs_.size() == num_ssrcs_to_observe_) { 118 if (observed_ssrcs_.size() == num_ssrcs_to_observe_) {
119 observation_complete_.Set(); 119 observation_complete_.Set();
120 } 120 }
121 } 121 }
122 122
123 return SEND_PACKET; 123 return SEND_PACKET;
124 } 124 }
125 125
126 rtc::CriticalSection crit_; 126 rtc::CriticalSection crit_;
127 std::map<uint32_t, uint32_t> last_observed_timestamp_ GUARDED_BY(crit_); 127 std::map<uint32_t, uint32_t> last_observed_timestamp_ RTC_GUARDED_BY(crit_);
128 std::map<uint32_t, uint16_t> last_observed_picture_id_ GUARDED_BY(crit_); 128 std::map<uint32_t, uint16_t> last_observed_picture_id_ RTC_GUARDED_BY(crit_);
129 std::map<uint32_t, size_t> num_packets_sent_ GUARDED_BY(crit_); 129 std::map<uint32_t, size_t> num_packets_sent_ RTC_GUARDED_BY(crit_);
130 int max_expected_picture_id_gap_ GUARDED_BY(crit_); 130 int max_expected_picture_id_gap_ RTC_GUARDED_BY(crit_);
131 size_t num_ssrcs_to_observe_ GUARDED_BY(crit_); 131 size_t num_ssrcs_to_observe_ RTC_GUARDED_BY(crit_);
132 std::set<uint32_t> observed_ssrcs_ GUARDED_BY(crit_); 132 std::set<uint32_t> observed_ssrcs_ RTC_GUARDED_BY(crit_);
133 }; 133 };
134 134
135 class PictureIdTest : public test::CallTest { 135 class PictureIdTest : public test::CallTest {
136 public: 136 public:
137 PictureIdTest() {} 137 PictureIdTest() {}
138 138
139 virtual ~PictureIdTest() { 139 virtual ~PictureIdTest() {
140 EXPECT_EQ(nullptr, video_send_stream_); 140 EXPECT_EQ(nullptr, video_send_stream_);
141 EXPECT_TRUE(video_receive_streams_.empty()); 141 EXPECT_TRUE(video_receive_streams_.empty());
142 142
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 cricket::InternalEncoderFactory internal_encoder_factory; 347 cricket::InternalEncoderFactory internal_encoder_factory;
348 SimulcastEncoderAdapter simulcast_encoder_adapter(&internal_encoder_factory); 348 SimulcastEncoderAdapter simulcast_encoder_adapter(&internal_encoder_factory);
349 // Make sure that that the picture id is not reset if the stream count goes 349 // Make sure that that the picture id is not reset if the stream count goes
350 // down and then up. 350 // down and then up.
351 std::vector<int> ssrc_counts = {3, 1, 3}; 351 std::vector<int> ssrc_counts = {3, 1, 3};
352 SetupEncoder(&simulcast_encoder_adapter); 352 SetupEncoder(&simulcast_encoder_adapter);
353 TestPictureIdContinuousAfterReconfigure(ssrc_counts); 353 TestPictureIdContinuousAfterReconfigure(ssrc_counts);
354 } 354 }
355 355
356 } // namespace webrtc 356 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/payload_router.h ('k') | webrtc/video/receive_statistics_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698