Merge 279817 "Don't crash on splice frame failure with bad content."

media/base/audio_splicer.h

Index: media/base/audio_splicer.h
===================================================================
--- media/base/audio_splicer.h	(revision 284451)
+++ media/base/audio_splicer.h	(working copy)
@@ -27,6 +27,12 @@
   enum {
     // The number of ms to crossfade before trimming when buffers overlap.
     kCrossfadeDurationInMilliseconds = 5,
+
+    // Largest gap or overlap allowed between buffers.  Anything larger than
+    // this will trigger an error.  This is an arbitrary value, but the initial
+    // selection of 50ms roughly represents the duration of 2 compressed AAC or
+    // MP3 frames.
+    kMaxTimeDeltaInMilliseconds = 50,
   };
 
   // Resets the splicer state by clearing the output buffers queue and resetting