generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert r9359 "Implement NetEq's CurrentDelay function"

Browse Source 
This reverts commit d8a03facf6, since it
broke the Chrome build. Will have to swap to using base/logging.h in
neteq_impl.cc before re-landing this change.

TBR=kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/50219004

Cr-Commit-Position: refs/heads/master@{#9360}
This commit is contained in:
Henrik Lundin 2015-06-03 12:58:46 +02:00
parent d8a03facf6
commit 5abd3e1f98
5 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_coding/neteq/interface/neteq.h
View File

@ -210,8 +210,8 @@ class NetEq {
// Not implemented.
virtual int TargetDelay() = 0;
// Returns the current total delay (packet buffer and sync buffer) in ms.
virtual int CurrentDelayMs() const = 0;
// Not implemented.
virtual int CurrentDelay() = 0;
// Sets the playout mode to |mode|.
// Deprecated. Set the mode in the Config struct passed to the constructor.

16
webrtc/modules/audio_coding/neteq/neteq_impl.cc
View File

@ -15,7 +15,6 @@
#include <algorithm>
#include "webrtc/base/checks.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
#include "webrtc/modules/audio_coding/neteq/accelerate.h"
@ -292,19 +291,8 @@ int NetEqImpl::TargetDelay() {
return kNotImplemented;
}
int NetEqImpl::CurrentDelayMs() const {
CriticalSectionScoped lock(crit_sect_.get());
if (fs_hz_ == 0)
return 0;
// Sum up the samples in the packet buffer with the future length of the sync
// buffer, and divide the sum by the sample rate.
const int delay_samples =
packet_buffer_->NumSamplesInBuffer(decoder_database_.get(),
decoder_frame_length_) +
static_cast<int>(sync_buffer_->FutureLength());
// The division below will truncate.
const int delay_ms = delay_samples / rtc::CheckedDivExact(fs_hz_, 1000);
return delay_ms;
int NetEqImpl::CurrentDelay() {
return kNotImplemented;
}
// Deprecated.

2
webrtc/modules/audio_coding/neteq/neteq_impl.h
View File

@ -138,7 +138,7 @@ class NetEqImpl : public webrtc::NetEq {
int TargetDelay() override;
int CurrentDelayMs() const override;
int CurrentDelay() override;
// Sets the playout mode to |mode|.
// Deprecated.

3
webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
View File

@ -170,9 +170,6 @@ struct NetEqNetworkStatsCheck {
CHECK_NETEQ_NETWORK_STATS(added_zero_samples);
#undef CHECK_NETEQ_NETWORK_STATS
// Compare with CurrentDelay, which should be identical.
EXPECT_EQ(stats.current_buffer_size_ms, neteq()->CurrentDelayMs());
}
void RunTest(int num_loops, NetEqNetworkStatsCheck expects) {

2
webrtc/modules/audio_coding/neteq/neteq_unittest.cc
View File

@ -404,8 +404,6 @@ void NetEqDecodingTest::DecodeAndCompare(const std::string& rtp_file,
ASSERT_EQ(0, neteq_->NetworkStatistics(&network_stats));
ASSERT_NO_FATAL_FAILURE(
network_stat_files.ProcessReference(network_stats));
// Compare with CurrentDelay, which should be identical.
EXPECT_EQ(network_stats.current_buffer_size_ms, neteq_->CurrentDelayMs());
// Process RTCPstat.
RtcpStatistics rtcp_stats;