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

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

Issue 1613053003: Swap use of CriticalSectionWrapper for rtc::CriticalSection in webrtc/video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase? 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/video/video_capture_input_unittest.cc ('k') | webrtc/video/video_send_stream_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) 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 10
11 #ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 11 #ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
12 #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 12 #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
13 13
14 #include <map> 14 #include <map>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/call.h" 17 #include "webrtc/call.h"
18 #include "webrtc/call/transport_adapter.h" 18 #include "webrtc/call/transport_adapter.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
21 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
22 #include "webrtc/video/encoded_frame_callback_adapter.h" 21 #include "webrtc/video/encoded_frame_callback_adapter.h"
23 #include "webrtc/video/send_statistics_proxy.h" 22 #include "webrtc/video/send_statistics_proxy.h"
24 #include "webrtc/video/video_capture_input.h" 23 #include "webrtc/video/video_capture_input.h"
25 #include "webrtc/video_receive_stream.h" 24 #include "webrtc/video_receive_stream.h"
26 #include "webrtc/video_send_stream.h" 25 #include "webrtc/video_send_stream.h"
27 26
28 namespace webrtc { 27 namespace webrtc {
29 28
30 class BitrateAllocator; 29 class BitrateAllocator;
31 class CallStats; 30 class CallStats;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 93
95 // Used as a workaround to indicate that we should be using the configured 94 // Used as a workaround to indicate that we should be using the configured
96 // start bitrate initially, instead of the one reported by VideoEngine (which 95 // start bitrate initially, instead of the one reported by VideoEngine (which
97 // defaults to too high). 96 // defaults to too high).
98 bool use_config_bitrate_; 97 bool use_config_bitrate_;
99 }; 98 };
100 } // namespace internal 99 } // namespace internal
101 } // namespace webrtc 100 } // namespace webrtc
102 101
103 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 102 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_capture_input_unittest.cc ('k') | webrtc/video/video_send_stream_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698