Fix unit test failures with estimated durations and splice frames.

media/base/audio_splicer.cc

 // 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.
 
 #include "media/base/audio_splicer.h"
 
 #include <cstdlib>
 #include <deque>
 
 #include "base/logging.h"
@@ skipping 26 matching lines @@
   buffer->set_timestamp(timestamp_helper.GetTimestamp());
   buffer->set_duration(
       timestamp_helper.GetFrameDuration(buffer->frame_count()));
 }
 
 // AudioBuffer::TrimEnd() is not as accurate as the timestamp helper, so
 // manually adjust the duration after trimming.
 static void AccurateTrimEnd(int frames_to_trim,
                             const scoped_refptr<AudioBuffer> buffer,
                             const AudioTimestampHelper& timestamp_helper) {
-  DCHECK(buffer->timestamp() == timestamp_helper.GetTimestamp());
+  DCHECK_LT(std::abs(timestamp_helper.GetFramesToTarget(buffer->timestamp())),
+            kMinGapSize);
   buffer->TrimEnd(frames_to_trim);
   buffer->set_duration(
       timestamp_helper.GetFrameDuration(buffer->frame_count()));
 }
 
 // Returns an AudioBus whose frame buffer is backed by the provided AudioBuffer.
 static scoped_ptr<AudioBus> CreateAudioBufferWrapper(
     const scoped_refptr<AudioBuffer>& buffer) {
   scoped_ptr<AudioBus> wrapper =
       AudioBus::CreateWrapper(buffer->channel_count());
@@ skipping 452 matching lines @@
     AccurateTrimStart(frames_to_trim, remainder, output_ts_helper);
     CHECK(output_sanitizer_->AddInput(remainder));
   }
 
   // Transfer all remaining buffers out and reset once empty.
   CHECK(post_splice_sanitizer_->DrainInto(output_sanitizer_.get()));
   post_splice_sanitizer_->Reset();
 }
 
 }  // namespace media