From bb9f4c12521a680396daa1b76c60162f88455ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 21 Nov 2018 16:07:10 +0100 Subject: [PATCH] Delete ssrc book-keeping in NetEq The ssrc for a given NetEq instance shouldn't change. Bug: webrtc:7135 Change-Id: Iee0d4cd8bd5d917e819fa2ecf45a40e203c6d9c0 Reviewed-on: https://webrtc-review.googlesource.com/c/111661 Reviewed-by: Fredrik Solenberg Reviewed-by: Henrik Lundin Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#25825} --- modules/audio_coding/neteq/neteq_impl.cc | 7 +------ modules/audio_coding/neteq/neteq_impl.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc index 2a025f304e..436e60a7b3 100644 --- a/modules/audio_coding/neteq/neteq_impl.cc +++ b/modules/audio_coding/neteq/neteq_impl.cc @@ -102,7 +102,6 @@ NetEqImpl::NetEqImpl(const NetEq::Config& config, new_codec_(false), timestamp_(0), reset_decoder_(false), - ssrc_(0), first_packet_(true), enable_fast_accelerate_(config.enable_fast_accelerate), nack_enabled_(false), @@ -533,8 +532,7 @@ int NetEqImpl::InsertPacketInternal(const RTPHeader& rtp_header, return packet; }()); - bool update_sample_rate_and_channels = - first_packet_ || (rtp_header.ssrc != ssrc_); + bool update_sample_rate_and_channels = first_packet_; if (update_sample_rate_and_channels) { // Reset timestamp scaling. @@ -561,9 +559,6 @@ int NetEqImpl::InsertPacketInternal(const RTPHeader& rtp_header, packet_buffer_->Flush(); dtmf_buffer_->Flush(); - // Store new SSRC. - ssrc_ = rtp_header.ssrc; - // Update audio buffer timestamp. sync_buffer_->IncreaseEndTimestamp(main_timestamp - timestamp_); diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h index 525ae615d8..d035b9e55d 100644 --- a/modules/audio_coding/neteq/neteq_impl.h +++ b/modules/audio_coding/neteq/neteq_impl.h @@ -401,7 +401,6 @@ class NetEqImpl : public webrtc::NetEq { absl::optional current_rtp_payload_type_ RTC_GUARDED_BY(crit_sect_); absl::optional current_cng_rtp_payload_type_ RTC_GUARDED_BY(crit_sect_); - uint32_t ssrc_ RTC_GUARDED_BY(crit_sect_); bool first_packet_ RTC_GUARDED_BY(crit_sect_); bool enable_fast_accelerate_ RTC_GUARDED_BY(crit_sect_); std::unique_ptr nack_ RTC_GUARDED_BY(crit_sect_);