Simplify AudioSplicer logic which slots buffers before or after a splice point.

media/base/stream_parser_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_STREAM_PARSER_BUFFER_H_
 #define MEDIA_BASE_STREAM_PARSER_BUFFER_H_
 
 #include <deque>
 
 #include "media/base/decoder_buffer.h"
@@ skipping 36 matching lines @@
   Type type() const { return type_; }
 
   // Gets the parser's track ID associated with this buffer. Value is
   // meaningless for EOS buffers.
   TrackId track_id() const { return track_id_; }
 
   // Converts this buffer to a splice buffer.  |pre_splice_buffers| must not
   // have any  EOS buffers and must not have any nested splice buffers.
   //
   // |pre_splice_buffers| will be deep copied and each copy's splice_timestamp()
-  // will be set to this buffer's splice_timestamp().  A copy of |this| will be
-  // added to the end of |splice_buffers_|.
+  // will be set to this buffer's splice_timestamp().  A copy of |this|, with a
+  // splice_timestamp() of kNoTimestamp(), will be added to the end of
+  // |splice_buffers_|.
   //
   // See the Audio Splice Frame Algorithm in the MSE specification for details.
   typedef StreamParser::BufferQueue BufferQueue;
   void ConvertToSpliceBuffer(const BufferQueue& pre_splice_buffers);
   const BufferQueue& get_splice_buffers() const { return splice_buffers_; }
 
  private:
   StreamParserBuffer(const uint8* data, int data_size,
                      const uint8* side_data, int side_data_size,
                      bool is_keyframe, Type type,
                      TrackId track_id);
   virtual ~StreamParserBuffer();
 
   bool is_keyframe_;
   base::TimeDelta decode_timestamp_;
   int config_id_;
   Type type_;
   TrackId track_id_;
 
   BufferQueue splice_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(StreamParserBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_BUFFER_H_