Skip to content

Commit

Permalink
Revert "Remove underscores from test names to follow GTest convention…
Browse files Browse the repository at this point in the history
…s //media." #12

This reverts commit dd89c95.

Reason: https://groups.google.com/a/chromium.org/g/chromium-dev/c/KxzyXKv7adQ

Based on the discussion here, I have decided to terminate this work.

Bug: 377144451
Change-Id: Ie8e944cc5ebdc29955b789a62bc5484f01a45fc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6065883
Reviewed-by: Colin Blundell <[email protected]>
Reviewed-by: Mark Foltz <[email protected]>
Commit-Queue: Ho Cheung <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1391364}
  • Loading branch information
hocheung-chromium authored and Chromium LUCI CQ committed Dec 4, 2024
1 parent 64b7850 commit 6405916
Show file tree
Hide file tree
Showing 19 changed files with 493 additions and 493 deletions.
6 changes: 3 additions & 3 deletions media/filters/audio_decoder_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -621,22 +621,22 @@ TEST_P(AudioDecoderTest, Initialize) {
ASSERT_NO_FATAL_FAILURE(Initialize());
}

TEST_P(AudioDecoderTest, ReinitializeAfterInitialize) {
TEST_P(AudioDecoderTest, Reinitialize_AfterInitialize) {
ASSERT_NO_FATAL_FAILURE(Initialize());
SetReinitializeParams();
ASSERT_NO_FATAL_FAILURE(Initialize());
Decode();
}

TEST_P(AudioDecoderTest, ReinitializeAfterDecode) {
TEST_P(AudioDecoderTest, Reinitialize_AfterDecode) {
ASSERT_NO_FATAL_FAILURE(Initialize());
Decode();
SetReinitializeParams();
ASSERT_NO_FATAL_FAILURE(Initialize());
Decode();
}

TEST_P(AudioDecoderTest, ReinitializeAfterReset) {
TEST_P(AudioDecoderTest, Reinitialize_AfterReset) {
ASSERT_NO_FATAL_FAILURE(Initialize());
Decode();
Reset();
Expand Down
50 changes: 25 additions & 25 deletions media/filters/audio_renderer_algorithm_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -450,30 +450,30 @@ TEST_F(AudioRendererAlgorithmTest, InitializeWithLargeParameters) {
EXPECT_LT(kBufferSize, algorithm_.QueueCapacity());
}

TEST_F(AudioRendererAlgorithmTest, FillBufferBitstream) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_Bitstream) {
Initialize(CHANNEL_LAYOUT_STEREO, kSampleFormatEac3, kSamplesPerSecond,
kSamplesPerSecond / 100);
TestPlaybackRate(1.0, kFrameSize, 16 * kFrameSize, /* dest_offset */ 0);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferNormalRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_NormalRate) {
Initialize();
TestPlaybackRate(1.0);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferNearlyNormalFasterRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_NearlyNormalFasterRate) {
Initialize();
TestPlaybackRate(1.0001);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferNearlyNormalSlowerRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_NearlyNormalSlowerRate) {
Initialize();
TestPlaybackRate(0.9999);
}

// This test verifies that the resampling based time stretch algorithms works.
// The range of playback rates in which we use resampling is [0.95, 1.06].
TEST_F(AudioRendererAlgorithmTest, FillBufferResamplingRates) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_ResamplingRates) {
Initialize();
// WSOLA.
TestPlaybackRate(0.50);
Expand All @@ -493,7 +493,7 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferResamplingRates) {

// This test verifies that we use the right underlying algorithms based on
// the preserves pitch flag and the playback rate.
TEST_F(AudioRendererAlgorithmTest, FillBufferFillModes) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_FillModes) {
Initialize();

// WSOLA.
Expand Down Expand Up @@ -530,7 +530,7 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferFillModes) {
AudioRendererAlgorithm::FillBufferMode::kResampler);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferWithOffset) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_WithOffset) {
Initialize();
const int kBufferSize = algorithm_.samples_per_second() / 10;
const int kOffset = kBufferSize / 10;
Expand All @@ -547,55 +547,55 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferWithOffset) {
TestPlaybackRate(1.25, kBufferSize, kFramesRequested, kOffset);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferUnderFlow) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_UnderFlow) {
Initialize();
TestResamplingWithUnderflow(0.75, true);
TestResamplingWithUnderflow(0.75, false);
TestResamplingWithUnderflow(1.25, true);
TestResamplingWithUnderflow(1.25, false);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferOneAndAQuarterRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_OneAndAQuarterRate) {
Initialize();
TestPlaybackRate(1.25);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferOneAndAHalfRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_OneAndAHalfRate) {
Initialize();
TestPlaybackRate(1.5);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferDoubleRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_DoubleRate) {
Initialize();
TestPlaybackRate(2.0);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferEightTimesRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_EightTimesRate) {
Initialize();
TestPlaybackRate(8.0);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferThreeQuartersRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_ThreeQuartersRate) {
Initialize();
TestPlaybackRate(0.75);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferHalfRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_HalfRate) {
Initialize();
TestPlaybackRate(0.5);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferQuarterRate) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_QuarterRate) {
Initialize();
TestPlaybackRate(0.25);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferPause) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_Pause) {
Initialize();
TestPlaybackRate(0.0);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferSlowDown) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_SlowDown) {
Initialize();
TestPlaybackRate(4.5);
TestPlaybackRate(3.0);
Expand All @@ -605,7 +605,7 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferSlowDown) {
TestPlaybackRate(0.25);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferSpeedUp) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_SpeedUp) {
Initialize();
TestPlaybackRate(0.25);
TestPlaybackRate(0.5);
Expand All @@ -615,7 +615,7 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferSpeedUp) {
TestPlaybackRate(4.5);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferJumpAroundSpeeds) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_JumpAroundSpeeds) {
Initialize();
TestPlaybackRate(2.1);
TestPlaybackRate(0.9);
Expand All @@ -624,7 +624,7 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferJumpAroundSpeeds) {
TestPlaybackRate(0.3);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferSmallBufferSize) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_SmallBufferSize) {
Initialize();
static const int kBufferSizeInFrames = 1;
static const int kFramesRequested = kOutputDurationInSec * kSamplesPerSecond;
Expand All @@ -633,22 +633,22 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferSmallBufferSize) {
TestPlaybackRate(1.5, kBufferSizeInFrames, kFramesRequested, 0);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferLargeBufferSize) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_LargeBufferSize) {
Initialize(CHANNEL_LAYOUT_STEREO, kSampleFormatS16, 44100, 441);
TestPlaybackRate(1.0);
TestPlaybackRate(0.5);
TestPlaybackRate(1.5);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferLowerQualityAudio) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_LowerQualityAudio) {
Initialize(CHANNEL_LAYOUT_MONO, kSampleFormatU8, kSamplesPerSecond,
kSamplesPerSecond / 100);
TestPlaybackRate(1.0);
TestPlaybackRate(0.5);
TestPlaybackRate(1.5);
}

TEST_F(AudioRendererAlgorithmTest, FillBufferHigherQualityAudio) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_HigherQualityAudio) {
Initialize(CHANNEL_LAYOUT_STEREO, kSampleFormatS32, kSamplesPerSecond,
kSamplesPerSecond / 100);
TestPlaybackRate(1.0);
Expand Down Expand Up @@ -839,7 +839,7 @@ TEST_F(AudioRendererAlgorithmTest, QuadraticInterpolation) {
EXPECT_FLOAT_EQ(y_star, extremum_value);
}

TEST_F(AudioRendererAlgorithmTest, QuadraticInterpolationColinear) {
TEST_F(AudioRendererAlgorithmTest, QuadraticInterpolation_Colinear) {
float y_values[3];
y_values[0] = 1.0;
y_values[1] = 1.0;
Expand Down Expand Up @@ -887,7 +887,7 @@ TEST_F(AudioRendererAlgorithmTest, FillBufferOffset) {
}
}

TEST_F(AudioRendererAlgorithmTest, FillBufferChannelMask) {
TEST_F(AudioRendererAlgorithmTest, FillBuffer_ChannelMask) {
// Setup a quad channel layout where even channels are always muted.
Initialize(CHANNEL_LAYOUT_QUAD, kSampleFormatS16, 44100, 441,
{true, false, true, false});
Expand Down
Loading

0 comments on commit 6405916

Please sign in to comment.