Refactor StreamParser creation & enforce configs matching expected stream types.

media/filters/source_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_FILTERS_SOURCE_BUFFER_H_
 #define MEDIA_FILTERS_SOURCE_BUFFER_H_
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/stream_parser.h"
 #include "media/base/video_decoder_config.h"
 
 namespace media {
 
 // SourceBuffer will store media segments and initialization segments that are
 // dynamically appended to a particular source ID, hand them to a StreamParser
 // to be parsed, and provide buffers to ChunkDemuxerStreams during playback.
 class MEDIA_EXPORT SourceBuffer {
  public:
   SourceBuffer();
   ~SourceBuffer();
 
   typedef base::Callback<void(bool, base::TimeDelta)> InitCB;
   typedef base::Callback<bool(const AudioDecoderConfig&,
                               const VideoDecoderConfig&)> NewConfigCB;
   typedef base::Callback<bool(const StreamParser::BufferQueue&)> NewBuffersCB;
   typedef base::Callback<bool(scoped_array<uint8>, int)> KeyNeededCB;
 
-  void Init(const InitCB& init_cb,
+  void Init(scoped_ptr<StreamParser> parser,
+            const InitCB& init_cb,
             const NewConfigCB& config_cb,
             const NewBuffersCB& audio_cb,
             const NewBuffersCB& video_cb,
             const KeyNeededCB& key_needed_cb);
 
   // Add buffers to this source.  Incoming data will be parsed and then stored
   // in SourceBufferStreams, which will handle ordering and overlap resolution.
   // Returns true if data was successfully appended, false if the parse failed.
   bool AppendData(const uint8* data, size_t length);
 
@@ skipping 17 matching lines @@
   NewBuffersCB audio_cb_;
   NewBuffersCB video_cb_;
   KeyNeededCB key_needed_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_H_