| 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/base/checks.h" | 17 #include "webrtc/base/checks.h" |
| 17 #include "webrtc/base/scoped_ptr.h" | 18 #include "webrtc/base/scoped_ptr.h" |
| 18 #include "webrtc/base/thread_annotations.h" | 19 #include "webrtc/base/thread_annotations.h" |
| 19 #include "webrtc/call.h" | 20 #include "webrtc/call.h" |
| 21 #include "webrtc/call/rtc_event_log.h" |
| 20 #include "webrtc/common.h" | 22 #include "webrtc/common.h" |
| 21 #include "webrtc/config.h" | 23 #include "webrtc/config.h" |
| 22 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" | 24 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" |
| 23 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" | 25 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" |
| 24 #include "webrtc/modules/utility/interface/process_thread.h" | 26 #include "webrtc/modules/utility/interface/process_thread.h" |
| 25 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" | |
| 26 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" | |
| 27 #include "webrtc/modules/video_render/include/video_render.h" | |
| 28 #include "webrtc/system_wrappers/interface/cpu_info.h" | 27 #include "webrtc/system_wrappers/interface/cpu_info.h" |
| 29 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 28 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" |
| 30 #include "webrtc/system_wrappers/interface/logging.h" | 29 #include "webrtc/system_wrappers/interface/logging.h" |
| 31 #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" | 30 #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" |
| 32 #include "webrtc/system_wrappers/interface/trace.h" | 31 #include "webrtc/system_wrappers/interface/trace.h" |
| 33 #include "webrtc/system_wrappers/interface/trace_event.h" | 32 #include "webrtc/system_wrappers/interface/trace_event.h" |
| 34 #include "webrtc/video/audio_receive_stream.h" | |
| 35 #include "webrtc/video/rtc_event_log.h" | |
| 36 #include "webrtc/video/video_receive_stream.h" | 33 #include "webrtc/video/video_receive_stream.h" |
| 37 #include "webrtc/video/video_send_stream.h" | 34 #include "webrtc/video/video_send_stream.h" |
| 38 #include "webrtc/voice_engine/include/voe_codec.h" | 35 #include "webrtc/voice_engine/include/voe_codec.h" |
| 39 | 36 |
| 40 namespace webrtc { | 37 namespace webrtc { |
| 41 | 38 |
| 42 const int Call::Config::kDefaultStartBitrateBps = 300000; | 39 const int Call::Config::kDefaultStartBitrateBps = 300000; |
| 43 | 40 |
| 44 namespace internal { | 41 namespace internal { |
| 45 | 42 |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 size_t length, | 540 size_t length, |
| 544 const PacketTime& packet_time) { | 541 const PacketTime& packet_time) { |
| 545 if (RtpHeaderParser::IsRtcp(packet, length)) | 542 if (RtpHeaderParser::IsRtcp(packet, length)) |
| 546 return DeliverRtcp(media_type, packet, length); | 543 return DeliverRtcp(media_type, packet, length); |
| 547 | 544 |
| 548 return DeliverRtp(media_type, packet, length, packet_time); | 545 return DeliverRtp(media_type, packet, length, packet_time); |
| 549 } | 546 } |
| 550 | 547 |
| 551 } // namespace internal | 548 } // namespace internal |
| 552 } // namespace webrtc | 549 } // namespace webrtc |
| OLD | NEW |