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

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

Issue 1652983002: Remove mutable from rtc::CriticalSections. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
« no previous file with comments | « webrtc/video/call_stats.h ('k') | webrtc/video/payload_router.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 protected: 48 protected:
49 // Called by EncoderStateFeedbackObserver when a new key frame is requested. 49 // Called by EncoderStateFeedbackObserver when a new key frame is requested.
50 void OnReceivedIntraFrameRequest(uint32_t ssrc); 50 void OnReceivedIntraFrameRequest(uint32_t ssrc);
51 void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id); 51 void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id);
52 void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id); 52 void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id);
53 void OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc); 53 void OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc);
54 54
55 private: 55 private:
56 typedef std::map<uint32_t, ViEEncoder*> SsrcEncoderMap; 56 typedef std::map<uint32_t, ViEEncoder*> SsrcEncoderMap;
57 57
58 mutable rtc::CriticalSection crit_; 58 rtc::CriticalSection crit_;
59 59
60 // Instance registered at the class requesting new key frames. 60 // Instance registered at the class requesting new key frames.
61 rtc::scoped_ptr<EncoderStateFeedbackObserver> observer_; 61 rtc::scoped_ptr<EncoderStateFeedbackObserver> observer_;
62 62
63 // Maps a unique ssrc to the given encoder. 63 // Maps a unique ssrc to the given encoder.
64 SsrcEncoderMap encoders_; 64 SsrcEncoderMap encoders_;
65 65
66 RTC_DISALLOW_COPY_AND_ASSIGN(EncoderStateFeedback); 66 RTC_DISALLOW_COPY_AND_ASSIGN(EncoderStateFeedback);
67 }; 67 };
68 68
69 } // namespace webrtc 69 } // namespace webrtc
70 70
71 #endif // WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_ 71 #endif // WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_
OLDNEW
« no previous file with comments | « webrtc/video/call_stats.h ('k') | webrtc/video/payload_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698