| OLD | NEW | 
|    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 <string.h> |   11 #include <string.h> | 
|   12  |   12  | 
|   13 #include <map> |   13 #include <map> | 
|   14 #include <vector> |   14 #include <vector> | 
|   15  |   15  | 
|   16 #include "webrtc/audio/audio_receive_stream.h" |   16 #include "webrtc/audio/audio_receive_stream.h" | 
|   17 #include "webrtc/audio/audio_send_stream.h" |   17 #include "webrtc/audio/audio_send_stream.h" | 
|   18 #include "webrtc/audio/audio_state.h" |   18 #include "webrtc/audio/audio_state.h" | 
|   19 #include "webrtc/audio/scoped_voe_interface.h" |   19 #include "webrtc/audio/scoped_voe_interface.h" | 
|   20 #include "webrtc/base/checks.h" |   20 #include "webrtc/base/checks.h" | 
|   21 #include "webrtc/base/logging.h" |   21 #include "webrtc/base/logging.h" | 
|   22 #include "webrtc/base/scoped_ptr.h" |   22 #include "webrtc/base/scoped_ptr.h" | 
|   23 #include "webrtc/base/thread_annotations.h" |   23 #include "webrtc/base/thread_annotations.h" | 
|   24 #include "webrtc/base/thread_checker.h" |   24 #include "webrtc/base/thread_checker.h" | 
|   25 #include "webrtc/base/trace_event.h" |   25 #include "webrtc/base/trace_event.h" | 
|   26 #include "webrtc/call.h" |   26 #include "webrtc/call.h" | 
|   27 #include "webrtc/call/bitrate_allocator.h" |   27 #include "webrtc/call/bitrate_allocator.h" | 
|   28 #include "webrtc/call/congestion_controller.h" |  | 
|   29 #include "webrtc/call/rtc_event_log.h" |   28 #include "webrtc/call/rtc_event_log.h" | 
|   30 #include "webrtc/config.h" |   29 #include "webrtc/config.h" | 
|   31 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" |   30 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" | 
 |   31 #include "webrtc/modules/congestion_controller/include/congestion_controller.h" | 
|   32 #include "webrtc/modules/pacing/paced_sender.h" |   32 #include "webrtc/modules/pacing/paced_sender.h" | 
|   33 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" |   33 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" | 
|   34 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" |   34 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" | 
|   35 #include "webrtc/modules/utility/include/process_thread.h" |   35 #include "webrtc/modules/utility/include/process_thread.h" | 
|   36 #include "webrtc/system_wrappers/include/cpu_info.h" |   36 #include "webrtc/system_wrappers/include/cpu_info.h" | 
|   37 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |   37 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 
|   38 #include "webrtc/system_wrappers/include/metrics.h" |   38 #include "webrtc/system_wrappers/include/metrics.h" | 
|   39 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" |   39 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" | 
|   40 #include "webrtc/system_wrappers/include/trace.h" |   40 #include "webrtc/system_wrappers/include/trace.h" | 
|   41 #include "webrtc/video/call_stats.h" |   41 #include "webrtc/video/call_stats.h" | 
| (...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  742   // thread. Then this check can be enabled. |  742   // thread. Then this check can be enabled. | 
|  743   // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); |  743   // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); | 
|  744   if (RtpHeaderParser::IsRtcp(packet, length)) |  744   if (RtpHeaderParser::IsRtcp(packet, length)) | 
|  745     return DeliverRtcp(media_type, packet, length); |  745     return DeliverRtcp(media_type, packet, length); | 
|  746  |  746  | 
|  747   return DeliverRtp(media_type, packet, length, packet_time); |  747   return DeliverRtp(media_type, packet, length, packet_time); | 
|  748 } |  748 } | 
|  749  |  749  | 
|  750 }  // namespace internal |  750 }  // namespace internal | 
|  751 }  // namespace webrtc |  751 }  // namespace webrtc | 
| OLD | NEW |