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 |
(...skipping 1854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1865 StreamDataCountersCallback* RTPSender::GetRtpStatisticsCallback() const { | 1865 StreamDataCountersCallback* RTPSender::GetRtpStatisticsCallback() const { |
1866 CriticalSectionScoped cs(statistics_crit_.get()); | 1866 CriticalSectionScoped cs(statistics_crit_.get()); |
1867 return rtp_stats_callback_; | 1867 return rtp_stats_callback_; |
1868 } | 1868 } |
1869 | 1869 |
1870 uint32_t RTPSender::BitrateSent() const { | 1870 uint32_t RTPSender::BitrateSent() const { |
1871 return total_bitrate_sent_.BitrateLast(); | 1871 return total_bitrate_sent_.BitrateLast(); |
1872 } | 1872 } |
1873 | 1873 |
1874 void RTPSender::SetRtpState(const RtpState& rtp_state) { | 1874 void RTPSender::SetRtpState(const RtpState& rtp_state) { |
1875 SetStartTimestamp(rtp_state.start_timestamp, true); | |
1876 CriticalSectionScoped lock(send_critsect_.get()); | 1875 CriticalSectionScoped lock(send_critsect_.get()); |
1877 sequence_number_ = rtp_state.sequence_number; | 1876 sequence_number_ = rtp_state.sequence_number; |
1878 sequence_number_forced_ = true; | 1877 sequence_number_forced_ = true; |
1879 timestamp_ = rtp_state.timestamp; | 1878 timestamp_ = rtp_state.timestamp; |
1880 capture_time_ms_ = rtp_state.capture_time_ms; | 1879 capture_time_ms_ = rtp_state.capture_time_ms; |
1881 last_timestamp_time_ms_ = rtp_state.last_timestamp_time_ms; | 1880 last_timestamp_time_ms_ = rtp_state.last_timestamp_time_ms; |
1882 media_has_been_sent_ = rtp_state.media_has_been_sent; | 1881 media_has_been_sent_ = rtp_state.media_has_been_sent; |
1883 } | 1882 } |
1884 | 1883 |
1885 RtpState RTPSender::GetRtpState() const { | 1884 RtpState RTPSender::GetRtpState() const { |
(...skipping 19 matching lines...) Expand all Loading... |
1905 CriticalSectionScoped lock(send_critsect_.get()); | 1904 CriticalSectionScoped lock(send_critsect_.get()); |
1906 | 1905 |
1907 RtpState state; | 1906 RtpState state; |
1908 state.sequence_number = sequence_number_rtx_; | 1907 state.sequence_number = sequence_number_rtx_; |
1909 state.start_timestamp = start_timestamp_; | 1908 state.start_timestamp = start_timestamp_; |
1910 | 1909 |
1911 return state; | 1910 return state; |
1912 } | 1911 } |
1913 | 1912 |
1914 } // namespace webrtc | 1913 } // namespace webrtc |
OLD | NEW |