Add config change handling to SourceBufferStream & ChunkDemuxer

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 "media/base/decoder_buffer.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 class MEDIA_EXPORT StreamParserBuffer : public DecoderBuffer {
  public:
   static scoped_refptr<StreamParserBuffer> CreateEOSBuffer();
   static scoped_refptr<StreamParserBuffer> CopyFrom(
       const uint8* data, int data_size, bool is_keyframe);
   bool IsKeyframe() const { return is_keyframe_; }
 
   // Decode timestamp. If not explicitly set, or set to kNoTimestamp(), the
   // value will be taken from the normal timestamp.
   base::TimeDelta GetDecodeTimestamp() const;
   void SetDecodeTimestamp(const base::TimeDelta& timestamp);
 
+  // Gets/sets the ID of the decoder config associated with this
+  // buffer.
+  int GetConfigID() const;
+  void SetConfigID(int config_id);

[xhwang, 2012/07/12 18:09:12]

Here and above, should we follow the style guide and make these
accessors/mutators lower case, e.g
config_id()
set_config_id()

The style guide also suggests inline accessors/mutators in .h file (as in
IsKeyframe()).

[acolwell GONE FROM CHROMIUM, 2012/07/12 23:07:58]

These match the style of getter/setter's in DecoderBuffer. We could change both
classes, but I think that might be better in a separate CL since that will cause
a large number of changes. I'd rather keep a consistent style, though
non-conforming, until both classes can be changed.

+
  private:
   StreamParserBuffer(const uint8* data, int data_size, bool is_keyframe);
   virtual ~StreamParserBuffer();
 
   bool is_keyframe_;
   base::TimeDelta decode_timestamp_;
+  int config_id_;

[xhwang, 2012/07/12 18:09:12]

Add comment? e.g. -1 means an invalid id?

[acolwell GONE FROM CHROMIUM, 2012/07/12 23:07:58]

Done. Created a named constant to document the meaning of this value.

   DISALLOW_COPY_AND_ASSIGN(StreamParserBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_BUFFER_H_