2013-01-29 12:09:21 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#ifndef MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
|
|
|
|
|
#define MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
|
2013-01-29 12:09:21 +00:00
|
|
|
|
2019-02-21 15:42:31 +01:00
|
|
|
#include <algorithm>
|
2013-01-29 12:09:21 +00:00
|
|
|
|
2019-02-21 15:42:31 +01:00
|
|
|
#include "modules/audio_coding/neteq/delay_manager.h"
|
|
|
|
|
#include "modules/audio_coding/neteq/histogram.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "test/gmock.h"
|
2013-01-29 12:09:21 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
class MockDelayManager : public DelayManager {
|
|
|
|
|
public:
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
MockDelayManager(size_t max_packets_in_buffer,
|
2018-11-27 15:45:20 +01:00
|
|
|
int base_min_target_delay_ms,
|
2019-02-06 15:37:50 +01:00
|
|
|
bool enable_rtx_handling,
|
2016-04-28 23:19:20 -07:00
|
|
|
DelayPeakDetector* peak_detector,
|
2019-02-21 15:42:31 +01:00
|
|
|
const TickTimer* tick_timer,
|
|
|
|
|
std::unique_ptr<Histogram> histogram)
|
2018-11-27 15:45:20 +01:00
|
|
|
: DelayManager(max_packets_in_buffer,
|
|
|
|
|
base_min_target_delay_ms,
|
2019-02-06 15:37:50 +01:00
|
|
|
enable_rtx_handling,
|
2018-11-27 15:45:20 +01:00
|
|
|
peak_detector,
|
2019-02-21 15:42:31 +01:00
|
|
|
tick_timer,
|
|
|
|
|
std::move(histogram)) {}
|
2013-01-29 12:09:21 +00:00
|
|
|
virtual ~MockDelayManager() { Die(); }
|
|
|
|
|
MOCK_METHOD0(Die, void());
|
|
|
|
|
MOCK_METHOD3(Update,
|
|
|
|
|
int(uint16_t sequence_number,
|
|
|
|
|
uint32_t timestamp,
|
|
|
|
|
int sample_rate_hz));
|
2019-01-10 10:28:23 +01:00
|
|
|
MOCK_METHOD2(CalculateTargetLevel, int(int iat_packets, bool reordered));
|
2013-01-29 12:09:21 +00:00
|
|
|
MOCK_METHOD1(SetPacketAudioLength, int(int length_ms));
|
|
|
|
|
MOCK_METHOD0(Reset, void());
|
|
|
|
|
MOCK_CONST_METHOD0(PeakFound, bool());
|
|
|
|
|
MOCK_METHOD1(UpdateCounters, void(int elapsed_time_ms));
|
|
|
|
|
MOCK_METHOD0(ResetPacketIatCount, void());
|
|
|
|
|
MOCK_CONST_METHOD2(BufferLimits, void(int* lower_limit, int* higher_limit));
|
2019-02-05 13:49:26 +01:00
|
|
|
MOCK_METHOD1(SetBaseMinimumDelay, bool(int delay_ms));
|
|
|
|
|
MOCK_CONST_METHOD0(GetBaseMinimumDelay, int());
|
2013-01-29 12:09:21 +00:00
|
|
|
MOCK_CONST_METHOD0(TargetLevel, int());
|
Handle padded audio packets correctly
RTP packets can be padded with extra data at the end of the payload. The usable
payload length of the packet should then be reduced with the padding length,
since the padding must be discarded. This was not the case; instead, the entire
payload, including padding data, was forwarded to the audio channel and in the
end to the decoder.
A special case of padding is packets which are empty except for the padding.
That is, they carry no usable payload. These packets are sometimes used for
probing the network and were discarded in
RTPReceiverAudio::ParseAudioCodecSpecific. The result is that NetEq never sees
those empty packets, just the holes in the sequence number series; this can
throw off the target buffer calculations.
With this change, the empty (after removing the padding) packets are let through,
all the way down to NetEq, to a new method called NetEq::InsertEmptyPacket. This
method notifies the DelayManager that an empty packet was received.
BUG=webrtc:7610, webrtc:7625
Review-Url: https://codereview.webrtc.org/2870043003
Cr-Commit-Position: refs/heads/master@{#18083}
2017-05-10 07:38:01 -07:00
|
|
|
MOCK_METHOD0(RegisterEmptyPacket, void());
|
2013-01-29 12:09:21 +00:00
|
|
|
MOCK_METHOD1(set_extra_delay_ms, void(int16_t delay));
|
|
|
|
|
MOCK_CONST_METHOD0(base_target_level, int());
|
|
|
|
|
MOCK_METHOD1(set_streaming_mode, void(bool value));
|
|
|
|
|
MOCK_CONST_METHOD0(last_pack_cng_or_dtmf, int());
|
|
|
|
|
MOCK_METHOD1(set_last_pack_cng_or_dtmf, void(int value));
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|
2017-09-15 06:47:31 +02:00
|
|
|
#endif // MODULES_AUDIO_CODING_NETEQ_MOCK_MOCK_DELAY_MANAGER_H_
|