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

Side by Side Diff: webrtc/video/payload_router.h

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/overuse_frame_detector.h ('k') | webrtc/video/picture_id_tests.cc » ('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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // Implements EncodedImageCallback. 42 // Implements EncodedImageCallback.
43 // Returns 0 if the packet was routed / sent, -1 otherwise. 43 // Returns 0 if the packet was routed / sent, -1 otherwise.
44 EncodedImageCallback::Result OnEncodedImage( 44 EncodedImageCallback::Result OnEncodedImage(
45 const EncodedImage& encoded_image, 45 const EncodedImage& encoded_image,
46 const CodecSpecificInfo* codec_specific_info, 46 const CodecSpecificInfo* codec_specific_info,
47 const RTPFragmentationHeader* fragmentation) override; 47 const RTPFragmentationHeader* fragmentation) override;
48 48
49 void OnBitrateAllocationUpdated(const BitrateAllocation& bitrate); 49 void OnBitrateAllocationUpdated(const BitrateAllocation& bitrate);
50 50
51 private: 51 private:
52 void UpdateModuleSendingState() EXCLUSIVE_LOCKS_REQUIRED(crit_); 52 void UpdateModuleSendingState() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
53 53
54 rtc::CriticalSection crit_; 54 rtc::CriticalSection crit_;
55 bool active_ GUARDED_BY(crit_); 55 bool active_ RTC_GUARDED_BY(crit_);
56 56
57 // Rtp modules are assumed to be sorted in simulcast index order. Not owned. 57 // Rtp modules are assumed to be sorted in simulcast index order. Not owned.
58 const std::vector<RtpRtcp*> rtp_modules_; 58 const std::vector<RtpRtcp*> rtp_modules_;
59 const int payload_type_; 59 const int payload_type_;
60 60
61 RTC_DISALLOW_COPY_AND_ASSIGN(PayloadRouter); 61 RTC_DISALLOW_COPY_AND_ASSIGN(PayloadRouter);
62 }; 62 };
63 63
64 } // namespace webrtc 64 } // namespace webrtc
65 65
66 #endif // WEBRTC_VIDEO_PAYLOAD_ROUTER_H_ 66 #endif // WEBRTC_VIDEO_PAYLOAD_ROUTER_H_
OLDNEW
« no previous file with comments | « webrtc/video/overuse_frame_detector.h ('k') | webrtc/video/picture_id_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698