Support start trimming post-decoding. Use it with FFmpegDemuxer.

media/base/audio_discard_helper.h

 // 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.
 
 #ifndef MEDIA_BASE_AUDIO_DISCARD_HELPER_H_
 #define MEDIA_BASE_AUDIO_DISCARD_HELPER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/buffers.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 class AudioBuffer;
 class DecoderBuffer;
 
 // Helper class for managing timestamps and discard events around decoding.
 class MEDIA_EXPORT AudioDiscardHelper {
  public:
-  explicit AudioDiscardHelper(int sample_rate);
+  // |sample_rate| is the sample rate of decode data which will be handed into

[acolwell GONE FROM CHROMIUM, 2014/05/01 01:08:34]

nit: s/decode/decoded/ ?

[DaleCurtis, 2014/05/01 19:21:27]

Done. I've also renamed codec_delay to decoder_delay and added some docs about
exactly what that means.

+  // the ProcessBuffers() call.
+  //
+  // |codec_delay| is used to figure out the the start of decoded data from each
+  // corresponding encoded buffer.  End discard is only supported when there is
+  // no |codec_delay|.
+  AudioDiscardHelper(int sample_rate, size_t codec_delay);
   ~AudioDiscardHelper();
 
   // Converts a TimeDelta to a frame count based on the constructed sample rate.
   // |duration| must be positive.
   size_t TimeDeltaToFrames(base::TimeDelta duration) const;
 
   // Resets internal state and indicates that |initial_discard| of upcoming
   // frames should be discarded.
   void Reset(size_t initial_discard);
 
@@ skipping 10 matching lines @@
   bool ProcessBuffers(const scoped_refptr<DecoderBuffer>& encoded_buffer,
                       const scoped_refptr<AudioBuffer>& decoded_buffer);
 
   // Whether any buffers have been processed.
   bool initialized() const {
     return timestamp_helper_.base_timestamp() != kNoTimestamp();
   }
 
  private:
   const int sample_rate_;
+  const size_t codec_delay_;
   AudioTimestampHelper timestamp_helper_;
 
   size_t discard_frames_;
   base::TimeDelta last_input_timestamp_;
+  scoped_refptr<DecoderBuffer> delayed_discard_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioDiscardHelper);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_DISCARD_HELPER_H_