| OLD | NEW | 
|---|
| 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 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" | 11 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" | 
| 12 | 12 | 
| 13 #include <stdlib.h>  // srand | 13 #include <stdlib.h>  // srand | 
| 14 #include <utility> | 14 #include <utility> | 
| 15 | 15 | 
| 16 #include "webrtc/base/checks.h" | 16 #include "webrtc/base/checks.h" | 
|  | 17 #include "webrtc/base/logging.h" | 
| 17 #include "webrtc/base/trace_event.h" | 18 #include "webrtc/base/trace_event.h" | 
| 18 #include "webrtc/modules/rtp_rtcp/interface/rtp_cvo.h" | 19 #include "webrtc/modules/rtp_rtcp/interface/rtp_cvo.h" | 
| 19 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" | 20 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" | 
| 20 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" | 21 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" | 
| 21 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" | 22 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" | 
| 22 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 23 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 
| 23 #include "webrtc/system_wrappers/interface/logging.h" |  | 
| 24 #include "webrtc/system_wrappers/interface/tick_util.h" | 24 #include "webrtc/system_wrappers/interface/tick_util.h" | 
| 25 | 25 | 
| 26 namespace webrtc { | 26 namespace webrtc { | 
| 27 | 27 | 
| 28 // Max in the RFC 3550 is 255 bytes, we limit it to be modulus 32 for SRTP. | 28 // Max in the RFC 3550 is 255 bytes, we limit it to be modulus 32 for SRTP. | 
| 29 static const size_t kMaxPaddingLength = 224; | 29 static const size_t kMaxPaddingLength = 224; | 
| 30 static const int kSendSideDelayWindowMs = 1000; | 30 static const int kSendSideDelayWindowMs = 1000; | 
| 31 static const uint32_t kAbsSendTimeFraction = 18; | 31 static const uint32_t kAbsSendTimeFraction = 18; | 
| 32 | 32 | 
| 33 namespace { | 33 namespace { | 
| (...skipping 1868 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1902   CriticalSectionScoped lock(send_critsect_.get()); | 1902   CriticalSectionScoped lock(send_critsect_.get()); | 
| 1903 | 1903 | 
| 1904   RtpState state; | 1904   RtpState state; | 
| 1905   state.sequence_number = sequence_number_rtx_; | 1905   state.sequence_number = sequence_number_rtx_; | 
| 1906   state.start_timestamp = start_timestamp_; | 1906   state.start_timestamp = start_timestamp_; | 
| 1907 | 1907 | 
| 1908   return state; | 1908   return state; | 
| 1909 } | 1909 } | 
| 1910 | 1910 | 
| 1911 }  // namespace webrtc | 1911 }  // namespace webrtc | 
| OLD | NEW | 
|---|