| 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 <algorithm> |
| 14 #include <utility> | 15 #include <utility> |
| 15 | 16 |
| 16 #include "webrtc/base/checks.h" | 17 #include "webrtc/base/checks.h" |
| 17 #include "webrtc/base/logging.h" | 18 #include "webrtc/base/logging.h" |
| 18 #include "webrtc/base/trace_event.h" | 19 #include "webrtc/base/trace_event.h" |
| 19 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" | 20 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" |
| 20 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" | 21 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" |
| 21 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" | 22 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" |
| 22 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" | 23 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" |
| 23 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 24 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
| (...skipping 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1905 CriticalSectionScoped lock(send_critsect_.get()); | 1906 CriticalSectionScoped lock(send_critsect_.get()); |
| 1906 | 1907 |
| 1907 RtpState state; | 1908 RtpState state; |
| 1908 state.sequence_number = sequence_number_rtx_; | 1909 state.sequence_number = sequence_number_rtx_; |
| 1909 state.start_timestamp = start_timestamp_; | 1910 state.start_timestamp = start_timestamp_; |
| 1910 | 1911 |
| 1911 return state; | 1912 return state; |
| 1912 } | 1913 } |
| 1913 | 1914 |
| 1914 } // namespace webrtc | 1915 } // namespace webrtc |
| OLD | NEW |