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

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

Issue 1417773002: Remove system_wrappers/interface/trace_event.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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.cc ('k') | webrtc/video_engine/vie_encoder.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 #include "webrtc/video/video_send_stream.h" 11 #include "webrtc/video/video_send_stream.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <sstream> 14 #include <sstream>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
19 #include "webrtc/base/trace_event.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 20 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/modules/pacing/include/packet_router.h" 21 #include "webrtc/modules/pacing/include/packet_router.h"
21 #include "webrtc/system_wrappers/interface/logging.h" 22 #include "webrtc/system_wrappers/interface/logging.h"
22 #include "webrtc/system_wrappers/interface/trace_event.h"
23 #include "webrtc/video/video_capture_input.h" 23 #include "webrtc/video/video_capture_input.h"
24 #include "webrtc/video_engine/call_stats.h" 24 #include "webrtc/video_engine/call_stats.h"
25 #include "webrtc/video_engine/payload_router.h" 25 #include "webrtc/video_engine/payload_router.h"
26 #include "webrtc/video_engine/vie_channel.h" 26 #include "webrtc/video_engine/vie_channel.h"
27 #include "webrtc/video_engine/vie_channel_group.h" 27 #include "webrtc/video_engine/vie_channel_group.h"
28 #include "webrtc/video_engine/vie_defines.h" 28 #include "webrtc/video_engine/vie_defines.h"
29 #include "webrtc/video_engine/vie_encoder.h" 29 #include "webrtc/video_engine/vie_encoder.h"
30 #include "webrtc/video_send_stream.h" 30 #include "webrtc/video_send_stream.h"
31 31
32 namespace webrtc { 32 namespace webrtc {
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 vie_channel_->IsSendingFecEnabled()); 549 vie_channel_->IsSendingFecEnabled());
550 550
551 // Restart the media flow 551 // Restart the media flow
552 vie_encoder_->Restart(); 552 vie_encoder_->Restart();
553 553
554 return true; 554 return true;
555 } 555 }
556 556
557 } // namespace internal 557 } // namespace internal
558 } // namespace webrtc 558 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_capture_input.cc ('k') | webrtc/video_engine/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698