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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine.h

Issue 3007363002: Remove definitions of thread annotation macros without 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 | « no previous file | webrtc/rtc_base/thread_annotations.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) 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 const RTC_EXCLUSIVE_LOCKS_REQUIRED(&thread_checker_); 320 const RTC_EXCLUSIVE_LOCKS_REQUIRED(&thread_checker_);
321 321
322 rtc::ThreadChecker thread_checker_; 322 rtc::ThreadChecker thread_checker_;
323 rtc::AsyncInvoker invoker_; 323 rtc::AsyncInvoker invoker_;
324 rtc::Thread* worker_thread_; 324 rtc::Thread* worker_thread_;
325 const std::vector<uint32_t> ssrcs_ RTC_ACCESS_ON(&thread_checker_); 325 const std::vector<uint32_t> ssrcs_ RTC_ACCESS_ON(&thread_checker_);
326 const std::vector<SsrcGroup> ssrc_groups_ RTC_ACCESS_ON(&thread_checker_); 326 const std::vector<SsrcGroup> ssrc_groups_ RTC_ACCESS_ON(&thread_checker_);
327 webrtc::Call* const call_; 327 webrtc::Call* const call_;
328 const bool enable_cpu_overuse_detection_; 328 const bool enable_cpu_overuse_detection_;
329 rtc::VideoSourceInterface<webrtc::VideoFrame>* source_ 329 rtc::VideoSourceInterface<webrtc::VideoFrame>* source_
330 ACCESS_ON(&thread_checker_); 330 RTC_ACCESS_ON(&thread_checker_);
331 const EncoderFactoryAdapter* const encoder_factory_ 331 const EncoderFactoryAdapter* const encoder_factory_
332 ACCESS_ON(&thread_checker_); 332 RTC_ACCESS_ON(&thread_checker_);
333 333
334 webrtc::VideoSendStream* stream_ RTC_ACCESS_ON(&thread_checker_); 334 webrtc::VideoSendStream* stream_ RTC_ACCESS_ON(&thread_checker_);
335 rtc::VideoSinkInterface<webrtc::VideoFrame>* encoder_sink_ 335 rtc::VideoSinkInterface<webrtc::VideoFrame>* encoder_sink_
336 RTC_ACCESS_ON(&thread_checker_); 336 RTC_ACCESS_ON(&thread_checker_);
337 // Contains settings that are the same for all streams in the MediaChannel, 337 // Contains settings that are the same for all streams in the MediaChannel,
338 // such as codecs, header extensions, and the global bitrate limit for the 338 // such as codecs, header extensions, and the global bitrate limit for the
339 // entire channel. 339 // entire channel.
340 VideoSendStreamParameters parameters_ RTC_ACCESS_ON(&thread_checker_); 340 VideoSendStreamParameters parameters_ RTC_ACCESS_ON(&thread_checker_);
341 // Contains settings that are unique for each stream, such as max_bitrate. 341 // Contains settings that are unique for each stream, such as max_bitrate.
342 // Does *not* contain codecs, however. 342 // Does *not* contain codecs, however.
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 const std::string codec_name_; 519 const std::string codec_name_;
520 const int max_qp_; 520 const int max_qp_;
521 const int max_framerate_; 521 const int max_framerate_;
522 const bool is_screencast_; 522 const bool is_screencast_;
523 const bool conference_mode_; 523 const bool conference_mode_;
524 }; 524 };
525 525
526 } // namespace cricket 526 } // namespace cricket
527 527
528 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ 528 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/rtc_base/thread_annotations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698