Add support for partial append window end trimming.

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 "base/memory/scoped_ptr.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_bus.h"
 #include "media/base/audio_discard_helper.h"
 #include "media/base/buffers.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 311 matching lines @@
   scoped_refptr<AudioBuffer> decoded_buffer = CreateDecodedBuffer(kTestFrames);
 
   // Set a discard padding equivalent to half of the buffer.
   encoded_buffer->set_discard_padding(
       std::make_pair(kDuration / 2, base::TimeDelta()));
 
   // All of the first buffer should be discarded.
   ASSERT_FALSE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
   ASSERT_TRUE(discard_helper.initialized());
 
-  // Processing another buffer (with the same discard padding) should discard
-  // the back half of the buffer since kDecoderDelay is half a buffer.
+  // Processing another buffer should discard the back half of the buffer since
+  // kDecoderDelay is half a buffer.  The end padding should not be discarded
+  // until another buffer is processed.  kDuration / 4 is chosen for the end
+  // discard since it will force the end discard to start after position zero
+  // within the next decoded buffer.

[acolwell GONE FROM CHROMIUM, 2014/07/24 19:22:14]

I'm confused by this comment. Wasn't the decoder delay handled by the call
above. I thought we didn't get data for the first buffer because the first half
was discarded because of the discard_padding and the second half was discarded
because of the decoding delay.

Since the code below is specifying discarding half of the beginning and one
quarter at the end, shouldn't that mean I should expect a kDuration/4 buffer to
be returned?

I'm really having a hard time visualizing how this test is supposed to be
working.

[DaleCurtis, 2014/07/24 19:58:59]

Decoder delay is forever.  Remember it's not included in the timeline, so all
future buffers must be adjusted to compensate.

[DaleCurtis, 2014/07/29 01:35:09]

Per our offline conversation I've added diagrams explaining exactly what's
happening here.

   encoded_buffer->set_timestamp(kTimestamp + kDuration);
+  encoded_buffer->set_discard_padding(
+      std::make_pair(kDuration / 2, kDuration / 4));
   decoded_buffer = CreateDecodedBuffer(kTestFrames);
   ASSERT_FLOAT_EQ(0.0f, ExtractDecodedData(decoded_buffer, 0));
   ASSERT_NEAR(kDecoderDelay * kDataStep,
               ExtractDecodedData(decoded_buffer, kDecoderDelay),
               kDataStep * 1000);
   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());
 
   // Verify it was actually the latter half of the buffer that was removed.
   ASSERT_FLOAT_EQ(0.0f, ExtractDecodedData(decoded_buffer, 0));
+
+  // Verify the end discard padding is carried over to the next buffer.  Use
+  // kDuration / 2 so that the next buffer has its start entirely discarded.
+  encoded_buffer->set_timestamp(kTimestamp + kDuration);

[acolwell GONE FROM CHROMIUM, 2014/07/24 19:22:14]

Shouldn't you be using  + 2 * kDuration here so it doesn't overlap the buffer
added above?

[DaleCurtis, 2014/07/29 01:35:09]

Done.

+  encoded_buffer->set_discard_padding(
+      std::make_pair(base::TimeDelta(), kDuration / 2));
+  decoded_buffer = CreateDecodedBuffer(kTestFrames);
+  ASSERT_TRUE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
+  EXPECT_EQ(kTimestamp + kDuration / 2, decoded_buffer->timestamp());
+  EXPECT_EQ(3 * kDuration / 4, decoded_buffer->duration());
+  EXPECT_EQ(3 * kTestFrames / 4, decoded_buffer->frame_count());
+
+  // Verify it was actually the second quarter of the buffer that was removed.
+  const int kDiscardFrames = kTestFrames / 4;
+  ASSERT_FLOAT_EQ(0.0f, ExtractDecodedData(decoded_buffer, 0));
+  ASSERT_FLOAT_EQ(
+      kDiscardFrames * 2 * kDataStep,
+      ExtractDecodedData(decoded_buffer, kDecoderDelay - kDiscardFrames));
+
+  // One last test to ensure carryover discard from the start works.
+  encoded_buffer->set_timestamp(kTimestamp + kDuration * 2);

[acolwell GONE FROM CHROMIUM, 2014/07/24 19:22:14]

Shouldn't this be *3?

[DaleCurtis, 2014/07/29 01:35:09]

Done.

+  encoded_buffer->set_discard_padding(DecoderBuffer::DiscardPadding());
+  decoded_buffer = CreateDecodedBuffer(kTestFrames);
+  ASSERT_FLOAT_EQ(0.0f, ExtractDecodedData(decoded_buffer, 0));
+  ASSERT_TRUE(discard_helper.ProcessBuffers(encoded_buffer, decoded_buffer));
+  EXPECT_EQ(kTimestamp + kDuration / 2 + 3 * kDuration / 4,
+            decoded_buffer->timestamp());
+  EXPECT_EQ(kDuration / 2, decoded_buffer->duration());
+  EXPECT_EQ(kTestFrames / 2, decoded_buffer->frame_count());
+  ASSERT_FLOAT_EQ(kTestFrames / 2 * kDataStep,
+                  ExtractDecodedData(decoded_buffer, 0));
 }
 
 TEST(AudioDiscardHelperTest, DelayedDiscardInitialDiscardAndDiscardPadding) {
   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);
 
@@ skipping 115 matching lines @@
   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