Convert media constants to constexpr.

media/base/audio_discard_helper_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/audio_discard_helper.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 12 matching lines @@
 static scoped_refptr<DecoderBuffer> CreateEncodedBuffer(
     base::TimeDelta timestamp,
     base::TimeDelta duration) {
   scoped_refptr<DecoderBuffer> result(new DecoderBuffer(1));
   result->set_timestamp(timestamp);
   result->set_duration(duration);
   return result;
 }
 
 static scoped_refptr<AudioBuffer> CreateDecodedBuffer(int frames) {
-  return MakeAudioBuffer(kSampleFormatPlanarF32,
-                         CHANNEL_LAYOUT_MONO,
-                         1,
-                         kSampleRate,
-                         0.0f,
-                         kDataStep,
-                         frames,
-                         kNoTimestamp());
+  return MakeAudioBuffer(kSampleFormatPlanarF32, CHANNEL_LAYOUT_MONO, 1,
+                         kSampleRate, 0.0f, kDataStep, frames, kNoTimestamp);
 }
 
 static float ExtractDecodedData(const scoped_refptr<AudioBuffer>& buffer,
                                 int index) {
   // This is really inefficient, but we can't access the raw AudioBuffer if any
   // start trimming has been applied.
   std::unique_ptr<AudioBus> temp_bus =
       AudioBus::Create(buffer->channel_count(), 1);
   buffer->ReadFrames(1, index, 0, temp_bus.get());
   return temp_bus->channel(0)[0];
@@ skipping 410 matching lines @@
   ASSERT_FALSE(discard_helper.initialized());
 
   const base::TimeDelta kTimestamp = base::TimeDelta();
   const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(10);
   const int kTestFrames = discard_helper.TimeDeltaToFrames(kDuration);
   discard_helper.Reset(0);
 
   scoped_refptr<DecoderBuffer> encoded_buffer =
       CreateEncodedBuffer(kTimestamp, kDuration);
   encoded_buffer->set_discard_padding(
-      std::make_pair(kInfiniteDuration(), base::TimeDelta()));
+      std::make_pair(kInfiniteDuration, base::TimeDelta()));
   scoped_refptr<AudioBuffer> decoded_buffer = CreateDecodedBuffer(kTestFrames);
 
   // Verify all of the first buffer is discarded.
   ASSERT_FALSE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
   ASSERT_TRUE(discard_helper.initialized());
   encoded_buffer->set_timestamp(kTimestamp + kDuration);
   encoded_buffer->set_discard_padding(DecoderBuffer::DiscardPadding());
 
   // Verify a second buffer goes through untouched.
   decoded_buffer = CreateDecodedBuffer(kTestFrames / 2);
   ASSERT_TRUE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
   EXPECT_EQ(kTimestamp, decoded_buffer->timestamp());
   EXPECT_EQ(kDuration / 2, decoded_buffer->duration());
   EXPECT_EQ(kTestFrames / 2, decoded_buffer->frame_count());
   ASSERT_FLOAT_EQ(0.0f, ExtractDecodedData(decoded_buffer, 0));
 }
 
 TEST(AudioDiscardHelperTest, CompleteDiscardWithDelayedDiscard) {
   AudioDiscardHelper discard_helper(kSampleRate, 0);
   ASSERT_FALSE(discard_helper.initialized());
 
   const base::TimeDelta kTimestamp = base::TimeDelta();
   const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(10);
   const int kTestFrames = discard_helper.TimeDeltaToFrames(kDuration);
   discard_helper.Reset(0);
 
   scoped_refptr<DecoderBuffer> encoded_buffer =
       CreateEncodedBuffer(kTimestamp, kDuration);
   encoded_buffer->set_discard_padding(
-      std::make_pair(kInfiniteDuration(), base::TimeDelta()));
+      std::make_pair(kInfiniteDuration, base::TimeDelta()));
   scoped_refptr<AudioBuffer> decoded_buffer = CreateDecodedBuffer(kTestFrames);
 
   // Setup a delayed discard.
   ASSERT_FALSE(discard_helper.ProcessBuffers(encoded_buffer, NULL));
   ASSERT_TRUE(discard_helper.initialized());
 
   // Verify the first output buffer is dropped.
   encoded_buffer->set_timestamp(kTimestamp + kDuration);
   encoded_buffer->set_discard_padding(DecoderBuffer::DiscardPadding());
   ASSERT_FALSE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
@@ skipping 15 matching lines @@
   ASSERT_FALSE(discard_helper.initialized());
   discard_helper.Reset(kDecoderDelay);
 
   const base::TimeDelta kTimestamp = base::TimeDelta();
   const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(10);
   const int kTestFrames = discard_helper.TimeDeltaToFrames(kDuration);
 
   scoped_refptr<DecoderBuffer> encoded_buffer =
       CreateEncodedBuffer(kTimestamp, kDuration);
   encoded_buffer->set_discard_padding(
-      std::make_pair(kInfiniteDuration(), base::TimeDelta()));
+      std::make_pair(kInfiniteDuration, base::TimeDelta()));
   scoped_refptr<AudioBuffer> decoded_buffer = CreateDecodedBuffer(kTestFrames);
 
   // Verify all of the first buffer is discarded.
   ASSERT_FALSE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
   ASSERT_TRUE(discard_helper.initialized());
   encoded_buffer->set_timestamp(kTimestamp + kDuration);
   encoded_buffer->set_discard_padding(DecoderBuffer::DiscardPadding());
 
   // Verify 5ms off the front of the second buffer is discarded.
   decoded_buffer = CreateDecodedBuffer(kTestFrames * 2);
   ASSERT_TRUE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
   EXPECT_EQ(kTimestamp, decoded_buffer->timestamp());
   EXPECT_EQ(kDuration * 2 - kDuration / 2, decoded_buffer->duration());
   EXPECT_EQ(kTestFrames * 2 - kDecoderDelay, decoded_buffer->frame_count());
   ASSERT_FLOAT_EQ(kDecoderDelay * kDataStep,
                   ExtractDecodedData(decoded_buffer, 0));
 }
 
 }  // namespace media