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

Side by Side Diff: webrtc/video_engine/vie_remb.h

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 years 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_engine/vie_receiver.cc ('k') | webrtc/video_engine/vie_remb.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) 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
11 #ifndef WEBRTC_VIDEO_VIE_REMB_H_ 11 #ifndef WEBRTC_VIDEO_ENGINE_VIE_REMB_H_
12 #define WEBRTC_VIDEO_VIE_REMB_H_ 12 #define WEBRTC_VIDEO_ENGINE_VIE_REMB_H_
13 13
14 #include <list> 14 #include <list>
15 #include <utility> 15 #include <utility>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/modules/include/module.h" 19 #include "webrtc/modules/include/module.h"
20 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" 20 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
22 22
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 // All modules that can send REMB RTCP. 69 // All modules that can send REMB RTCP.
70 RtpModules rtcp_sender_; 70 RtpModules rtcp_sender_;
71 71
72 // The last bitrate update. 72 // The last bitrate update.
73 unsigned int bitrate_; 73 unsigned int bitrate_;
74 }; 74 };
75 75
76 } // namespace webrtc 76 } // namespace webrtc
77 77
78 #endif // WEBRTC_VIDEO_VIE_REMB_H_ 78 #endif // WEBRTC_VIDEO_ENGINE_VIE_REMB_H_
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_receiver.cc ('k') | webrtc/video_engine/vie_remb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698