mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
2b742f7eaa
This reverts commit d93b7b91e0.
Reason for revert: Breaks downstream tests
Original change's description:
> Unifying the handling of the events in NetEqInput.
>
> Bug: webrtc:14763
> Change-Id: I9615a9ce41c9b577c4ebd4cdcc9885bfbc5dac48
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293040
> Reviewed-by: Sam Zackrisson <saza@webrtc.org>
> Commit-Queue: Jesus de Vicente Pena <devicentepena@webrtc.org>
> Reviewed-by: Björn Terelius <terelius@webrtc.org>
> Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#39706}
Bug: webrtc:14763
Change-Id: If076c8fc59a38f011dfa20829f2dd91dd2f914b2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299420
Owners-Override: Björn Terelius <terelius@webrtc.org>
Auto-Submit: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#39711}
105 lines
2.8 KiB
C++
105 lines
2.8 KiB
C++
/*
|
|
* Copyright (c) 2017 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.
|
|
*/
|
|
|
|
#include "modules/audio_coding/neteq/tools/neteq_input.h"
|
|
|
|
#include "rtc_base/strings/string_builder.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
NetEqInput::PacketData::PacketData() = default;
|
|
NetEqInput::PacketData::~PacketData() = default;
|
|
|
|
std::string NetEqInput::PacketData::ToString() const {
|
|
rtc::StringBuilder ss;
|
|
ss << "{"
|
|
"time_ms: "
|
|
<< static_cast<int64_t>(time_ms)
|
|
<< ", "
|
|
"header: {"
|
|
"pt: "
|
|
<< static_cast<int>(header.payloadType)
|
|
<< ", "
|
|
"sn: "
|
|
<< header.sequenceNumber
|
|
<< ", "
|
|
"ts: "
|
|
<< header.timestamp
|
|
<< ", "
|
|
"ssrc: "
|
|
<< header.ssrc
|
|
<< "}, "
|
|
"payload bytes: "
|
|
<< payload.size() << "}";
|
|
return ss.Release();
|
|
}
|
|
|
|
TimeLimitedNetEqInput::TimeLimitedNetEqInput(std::unique_ptr<NetEqInput> input,
|
|
int64_t duration_ms)
|
|
: input_(std::move(input)),
|
|
start_time_ms_(input_->NextEventTime()),
|
|
duration_ms_(duration_ms) {}
|
|
|
|
TimeLimitedNetEqInput::~TimeLimitedNetEqInput() = default;
|
|
|
|
absl::optional<int64_t> TimeLimitedNetEqInput::NextPacketTime() const {
|
|
return ended_ ? absl::nullopt : input_->NextPacketTime();
|
|
}
|
|
|
|
absl::optional<int64_t> TimeLimitedNetEqInput::NextOutputEventTime() const {
|
|
return ended_ ? absl::nullopt : input_->NextOutputEventTime();
|
|
}
|
|
|
|
absl::optional<NetEqInput::SetMinimumDelayInfo>
|
|
TimeLimitedNetEqInput::NextSetMinimumDelayInfo() const {
|
|
return ended_ ? absl::nullopt : input_->NextSetMinimumDelayInfo();
|
|
}
|
|
|
|
std::unique_ptr<NetEqInput::PacketData> TimeLimitedNetEqInput::PopPacket() {
|
|
if (ended_) {
|
|
return std::unique_ptr<PacketData>();
|
|
}
|
|
auto packet = input_->PopPacket();
|
|
MaybeSetEnded();
|
|
return packet;
|
|
}
|
|
|
|
void TimeLimitedNetEqInput::AdvanceOutputEvent() {
|
|
if (!ended_) {
|
|
input_->AdvanceOutputEvent();
|
|
MaybeSetEnded();
|
|
}
|
|
}
|
|
|
|
void TimeLimitedNetEqInput::AdvanceSetMinimumDelay() {
|
|
if (!ended_) {
|
|
input_->AdvanceSetMinimumDelay();
|
|
MaybeSetEnded();
|
|
}
|
|
}
|
|
|
|
bool TimeLimitedNetEqInput::ended() const {
|
|
return ended_ || input_->ended();
|
|
}
|
|
|
|
absl::optional<RTPHeader> TimeLimitedNetEqInput::NextHeader() const {
|
|
return ended_ ? absl::nullopt : input_->NextHeader();
|
|
}
|
|
|
|
void TimeLimitedNetEqInput::MaybeSetEnded() {
|
|
if (NextEventTime() && start_time_ms_ &&
|
|
*NextEventTime() - *start_time_ms_ > duration_ms_) {
|
|
ended_ = true;
|
|
}
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|