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

Side by Side Diff: webrtc/modules/video_coding/jitter_buffer.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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
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 #include "webrtc/modules/video_coding/jitter_buffer.h" 10 #include "webrtc/modules/video_coding/jitter_buffer.h"
11 11
12 #include <assert.h> 12 #include <assert.h>
13 13
14 #include <algorithm> 14 #include <algorithm>
15 #include <limits> 15 #include <limits>
16 #include <utility> 16 #include <utility>
17 17
18 #include "webrtc/base/checks.h"
19 #include "webrtc/base/logging.h"
20 #include "webrtc/base/trace_event.h"
18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
22 #include "webrtc/modules/video_coding/include/video_coding.h"
19 #include "webrtc/modules/video_coding/frame_buffer.h" 23 #include "webrtc/modules/video_coding/frame_buffer.h"
20 #include "webrtc/modules/video_coding/include/video_coding.h"
21 #include "webrtc/modules/video_coding/inter_frame_delay.h" 24 #include "webrtc/modules/video_coding/inter_frame_delay.h"
22 #include "webrtc/modules/video_coding/internal_defines.h" 25 #include "webrtc/modules/video_coding/internal_defines.h"
23 #include "webrtc/modules/video_coding/jitter_buffer_common.h" 26 #include "webrtc/modules/video_coding/jitter_buffer_common.h"
24 #include "webrtc/modules/video_coding/jitter_estimator.h" 27 #include "webrtc/modules/video_coding/jitter_estimator.h"
25 #include "webrtc/modules/video_coding/packet.h" 28 #include "webrtc/modules/video_coding/packet.h"
26 #include "webrtc/rtc_base/checks.h"
27 #include "webrtc/rtc_base/logging.h"
28 #include "webrtc/rtc_base/trace_event.h"
29 #include "webrtc/system_wrappers/include/clock.h" 29 #include "webrtc/system_wrappers/include/clock.h"
30 #include "webrtc/system_wrappers/include/event_wrapper.h" 30 #include "webrtc/system_wrappers/include/event_wrapper.h"
31 #include "webrtc/system_wrappers/include/field_trial.h" 31 #include "webrtc/system_wrappers/include/field_trial.h"
32 #include "webrtc/system_wrappers/include/metrics.h" 32 #include "webrtc/system_wrappers/include/metrics.h"
33 33
34 namespace webrtc { 34 namespace webrtc {
35 // Interval for updating SS data. 35 // Interval for updating SS data.
36 static const uint32_t kSsCleanupIntervalSec = 60; 36 static const uint32_t kSsCleanupIntervalSec = 60;
37 37
38 // Use this rtt if no value has been reported. 38 // Use this rtt if no value has been reported.
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 } 1298 }
1299 return true; 1299 return true;
1300 } 1300 }
1301 1301
1302 void VCMJitterBuffer::RecycleFrameBuffer(VCMFrameBuffer* frame) { 1302 void VCMJitterBuffer::RecycleFrameBuffer(VCMFrameBuffer* frame) {
1303 frame->Reset(); 1303 frame->Reset();
1304 free_frames_.push_back(frame); 1304 free_frames_.push_back(frame);
1305 } 1305 }
1306 1306
1307 } // namespace webrtc 1307 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/jitter_buffer.h ('k') | webrtc/modules/video_coding/jitter_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698