Fix incorrect opus seek preroll and flaky pre-skip removal.

media/base/audio_discard_helper.cc

Index: media/base/audio_discard_helper.cc
diff --git a/media/base/audio_discard_helper.cc b/media/base/audio_discard_helper.cc
index f7c645cc20e6b2098e2b90764eb4ff75ee5424e7..12c8e347d2c203f3f294ff07c9a1a5df905d7e26 100644
--- a/media/base/audio_discard_helper.cc
+++ b/media/base/audio_discard_helper.cc
@@ -104,11 +104,8 @@ bool AudioDiscardHelper::ProcessBuffers(
 
     // If everything would be discarded, indicate a new buffer is required.
     if (frames_to_discard == decoded_frames) {
-      // For simplicity disallow cases where a buffer with discard padding is
-      // present.  Doing so allows us to avoid complexity around tracking
-      // discards across buffers.
-      DCHECK(current_discard_padding.first == base::TimeDelta());
-      DCHECK(current_discard_padding.second == base::TimeDelta());
+      // For simplicity, we just drop any discard padding if |discard_frames_|
+      // consumes the entire buffer.

[chcunningham, 2015/07/31 19:48:44]

What about the case where current_discard_padding is swapped into
delayed_discard_padding_? Is it right to still use the padding in a delayed
fashion when we would otherwise drop the discard in the not-delayed case?

[DaleCurtis, 2015/08/03 22:49:53]

That would still be correct, as the initial discard only applies to what's
already been decoded; whereas with delayed discard we haven't decoded the next
buffer just yet.

       return false;
     }