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

media/base/audio_splicer.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_BASE_AUDIO_SPLICER_H_
 #define MEDIA_BASE_AUDIO_SPLICER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/buffers.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 class AudioBuffer;
 class AudioBus;
 class AudioStreamSanitizer;
 
 // Helper class that handles filling gaps and resolving overlaps.
 class MEDIA_EXPORT AudioSplicer {
  public:
   explicit AudioSplicer(int samples_per_second);
   ~AudioSplicer();
 
   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
   // the timestamp helper.
   void Reset();
 
   // Adds a new buffer full of samples or end of stream buffer to the splicer.
   // Returns true if the buffer was accepted.  False is returned if an error
   // occurred.
   bool AddInput(const scoped_refptr<AudioBuffer>& input);
@@ skipping 69 matching lines @@
   // Whether all buffers which should go into |pre_splice_sanitizer_| have been
   // received.  If true, buffers should now be put in |post_splice_sanitizer_|.
   bool have_all_pre_splice_buffers_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSplicer);
 };
 
 }  // namespace media
 
 #endif