Enhance AudioSplicer to crossfade marked splice frames.

media/base/decoder_buffer.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_DECODER_BUFFER_H_
 #define MEDIA_BASE_DECODER_BUFFER_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 112 matching lines @@
   void set_decrypt_config(scoped_ptr<DecryptConfig> decrypt_config) {
     DCHECK(!end_of_stream());
     decrypt_config_ = decrypt_config.Pass();
   }
 
   // If there's no data in this buffer, it represents end of stream.
   bool end_of_stream() const {
     return data_ == NULL;
   }
 
+  // Is this buffer preroll before a splice frame?
+  bool splice_preroll() const {
+    DCHECK(!end_of_stream());
+    return splice_preroll_;
+  }
+
+  void set_splice_preroll(bool splice_preroll) {
+    DCHECK(!end_of_stream());
+    splice_preroll_ = splice_preroll;
+  }
+
   // Returns a human-readable string describing |*this|.
   std::string AsHumanReadableString();
 
  protected:
   friend class base::RefCountedThreadSafe<DecoderBuffer>;
 
   // Allocates a buffer of size |size| >= 0 and copies |data| into it.  Buffer
   // will be padded and aligned as necessary.  If |data| is NULL then |data_| is
   // set to NULL and |buffer_size_| to 0.
   DecoderBuffer(const uint8* data, int size,
                 const uint8* side_data, int side_data_size);
   virtual ~DecoderBuffer();
 
  private:
   base::TimeDelta timestamp_;
   base::TimeDelta duration_;
 
   int size_;
   scoped_ptr<uint8, base::ScopedPtrAlignedFree> data_;
   int side_data_size_;
   scoped_ptr<uint8, base::ScopedPtrAlignedFree> side_data_;
   scoped_ptr<DecryptConfig> decrypt_config_;
   base::TimeDelta discard_padding_;
+  bool splice_preroll_;
 
   // Constructor helper method for memory allocations.
   void Initialize();
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECODER_BUFFER_H_