Refactoring StreamParser & StreamParserHost interfaces.

media/filters/chunk_demuxer.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_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <list>
 #include <string>
 
@@ skipping 69 matching lines @@
 
   void ChangeState_Locked(State new_state);
 
   // Reports an error and puts the demuxer in a state where it won't accept more
   // data.
   void ReportError_Locked(PipelineStatus error);
 
   void OnStreamParserInitDone(bool success, base::TimeDelta duration);
 
   // StreamParserHost implementation.
-  virtual bool OnNewAudioConfig(const AudioDecoderConfig& config) OVERRIDE;
-  virtual bool OnNewVideoConfig(const VideoDecoderConfig& config) OVERRIDE;
+  virtual bool OnNewConfigs(const AudioDecoderConfig& audio_config,
+                            const VideoDecoderConfig& video_config) OVERRIDE;
   virtual bool OnAudioBuffers(const BufferQueue& buffer) OVERRIDE;
   virtual bool OnVideoBuffers(const BufferQueue& buffer) OVERRIDE;
 
   base::Lock lock_;
   State state_;
 
   DemuxerHost* host_;
   ChunkDemuxerClient* client_;
   PipelineStatusCB init_cb_;
   PipelineStatusCB seek_cb_;
 
   scoped_refptr<ChunkDemuxerStream> audio_;
   scoped_refptr<ChunkDemuxerStream> video_;
 
   int64 buffered_bytes_;
 
   base::TimeDelta duration_;
 
   scoped_ptr<StreamParser> stream_parser_;
 
   // Should a Seek() call wait for more data before calling the
   // callback.
   bool seek_waits_for_data_;
 
-  ByteQueue byte_queue_;
-
   // TODO(acolwell): Remove this when fixing http://crbug.com/122909
   std::string source_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_