Commit 07c7facb authored by Ken MacKay's avatar Ken MacKay Committed by Commit Bot

Reland "[Chromecast] Update mixer unittests"

This reverts commit d0ca87de.

Added ifdef guard for death tests.

Bug: internal b/71559266
Change-Id: I204a00d7a1759a4a18407f5162843366e9229da5
Reviewed-on: https://chromium-review.googlesource.com/941789Reviewed-by: default avatarScott Graham <scottmg@chromium.org>
Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Commit-Queue: Kenneth MacKay <kmackay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539976}
parent 928bb078
...@@ -175,11 +175,11 @@ cast_source_set("for_mixer_audio") { ...@@ -175,11 +175,11 @@ cast_source_set("for_mixer_audio") {
test("cast_audio_backend_unittests") { test("cast_audio_backend_unittests") {
testonly = true testonly = true
sources = [ sources = [
"audio_fader_unittest.cc",
"filter_group_unittest.cc", "filter_group_unittest.cc",
"mock_mixer_source.cc", "mock_mixer_source.cc",
"mock_mixer_source.h", "mock_mixer_source.h",
"stream_mixer_unittest.cc",
# "stream_mixer_unittest.cc",
] ]
deps = [ deps = [
......
...@@ -84,7 +84,8 @@ void AudioFader::CompleteFill(::media::AudioBus* buffer, int filled_frames) { ...@@ -84,7 +84,8 @@ void AudioFader::CompleteFill(::media::AudioBus* buffer, int filled_frames) {
case State::kFadingOut: case State::kFadingOut:
// Fade back in. // Fade back in.
state_ = State::kFadingIn; state_ = State::kFadingIn;
fade_frames_remaining_ = fade_frames_ - fade_frames_remaining_; fade_frames_remaining_ =
std::max(0, fade_frames_ - fade_frames_remaining_ - 1);
break; break;
} }
FadeIn(buffer, filled_frames); FadeIn(buffer, filled_frames);
...@@ -100,7 +101,8 @@ void AudioFader::IncompleteFill(::media::AudioBus* buffer, int filled_frames) { ...@@ -100,7 +101,8 @@ void AudioFader::IncompleteFill(::media::AudioBus* buffer, int filled_frames) {
case State::kFadingIn: case State::kFadingIn:
// Fade back out. // Fade back out.
state_ = State::kFadingOut; state_ = State::kFadingOut;
fade_frames_remaining_ = fade_frames_ - fade_frames_remaining_; fade_frames_remaining_ =
std::max(0, fade_frames_ - fade_frames_remaining_ - 1);
break; break;
case State::kPlaying: case State::kPlaying:
// Fade out. // Fade out.
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment