Refactor MSE implementation on Android to simplify the logic and improve the performance

content/renderer/media/android/media_source_delegate.h

 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 79 matching lines @@
   // process when this method is called.
   // If |is_browser_seek| is true, then this is a short-term hack browser
   // seek.
   // TODO(wolenetz): Instead of doing browser seek, browser player should replay
   // cached data since last keyframe. See http://crbug.com/304234.
   void Seek(const base::TimeDelta& seek_time, bool is_browser_seek);
 
   // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
   void OnReadFromDemuxer(media::DemuxerStream::Type type);
 
-  // Called when the player needs the new config data from ChunkDemuxer.
-  void OnMediaConfigRequest();
-
   // Called by the Destroyer to destroy an instance of this object.
   void Destroy();
 
   // Called on the main thread to check whether the video stream is encrypted.
   bool IsVideoEncrypted();
 
  private:
   // This is private to enforce use of the Destroyer.
   virtual ~MediaSourceDelegate();
 
@@ skipping 60 matching lines @@
   bool IsSeeking() const;
 
   // Returns |seek_time| if it is still buffered or if there is no currently
   // buffered range including or soon after |seek_time|. If |seek_time| is not
   // buffered, but there is a later range buffered near to |seek_time|, returns
   // next buffered range's start time instead. Only call this for browser seeks.
   // |seeking_lock_| must be held by caller.
   base::TimeDelta FindBufferedBrowserSeekTime_Locked(
       const base::TimeDelta& seek_time) const;
 
+  // Gets the demuxer configs from audio/video stream.
+  void GetDeumuxerConfigFromStream(

[wolenetz, 2014/04/25 23:13:13]

nit: s/Deumuxer/Demuxer

[qinmin, 2014/04/26 01:30:11]

Done.

+      media::DemuxerConfigs* configs, bool is_audio);
+
   RendererDemuxerAndroid* demuxer_client_;
   int demuxer_client_id_;
 
   scoped_refptr<media::MediaLog> media_log_;
   UpdateNetworkStateCB update_network_state_cb_;
   DurationChangeCB duration_change_cb_;
 
   scoped_ptr<media::ChunkDemuxer> chunk_demuxer_;
   bool is_demuxer_ready_;
 
@@ skipping 44 matching lines @@
   base::WeakPtrFactory<MediaSourceDelegate> main_weak_factory_;
   base::WeakPtrFactory<MediaSourceDelegate> media_weak_factory_;
   base::WeakPtr<MediaSourceDelegate> main_weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_