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

Side by Side Diff: webrtc/common_video/include/incoming_video_stream.h

Issue 1613643004: Remove mutable from rtc::CriticalSection members. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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/call/congestion_controller.h ('k') | webrtc/modules/audio_coding/acm2/acm_receiver.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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 private: 70 private:
71 enum { kEventStartupTimeMs = 10 }; 71 enum { kEventStartupTimeMs = 10 };
72 enum { kEventMaxWaitTimeMs = 100 }; 72 enum { kEventMaxWaitTimeMs = 100 };
73 enum { kFrameRatePeriodMs = 1000 }; 73 enum { kFrameRatePeriodMs = 1000 };
74 74
75 void DeliverFrame(const VideoFrame& video_frame); 75 void DeliverFrame(const VideoFrame& video_frame);
76 76
77 uint32_t const stream_id_; 77 uint32_t const stream_id_;
78 const bool disable_prerenderer_smoothing_; 78 const bool disable_prerenderer_smoothing_;
79 // Critsects in allowed to enter order. 79 // Critsects in allowed to enter order.
80 mutable rtc::CriticalSection stream_critsect_; 80 rtc::CriticalSection stream_critsect_;
81 mutable rtc::CriticalSection thread_critsect_; 81 rtc::CriticalSection thread_critsect_;
82 mutable rtc::CriticalSection buffer_critsect_; 82 rtc::CriticalSection buffer_critsect_;
83 // TODO(pbos): Make plain member and stop resetting this thread, just 83 // TODO(pbos): Make plain member and stop resetting this thread, just
84 // start/stoping it is enough. 84 // start/stoping it is enough.
85 rtc::scoped_ptr<rtc::PlatformThread> incoming_render_thread_ 85 rtc::scoped_ptr<rtc::PlatformThread> incoming_render_thread_
86 GUARDED_BY(thread_critsect_); 86 GUARDED_BY(thread_critsect_);
87 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_; 87 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_;
88 88
89 bool running_ GUARDED_BY(stream_critsect_); 89 bool running_ GUARDED_BY(stream_critsect_);
90 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_); 90 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_);
91 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_); 91 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_);
92 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_ 92 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_
93 GUARDED_BY(buffer_critsect_); 93 GUARDED_BY(buffer_critsect_);
94 94
95 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_); 95 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_);
96 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_); 96 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_);
97 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_); 97 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_);
98 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_); 98 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_);
99 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_); 99 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_);
100 VideoFrame start_image_ GUARDED_BY(thread_critsect_); 100 VideoFrame start_image_ GUARDED_BY(thread_critsect_);
101 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_); 101 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_);
102 uint32_t timeout_time_ GUARDED_BY(thread_critsect_); 102 uint32_t timeout_time_ GUARDED_BY(thread_critsect_);
103 }; 103 };
104 104
105 } // namespace webrtc 105 } // namespace webrtc
106 106
107 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ 107 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/call/congestion_controller.h ('k') | webrtc/modules/audio_coding/acm2/acm_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698