Rename MediaPlayerHostMsg_{DemuxerReady,ReadFromDemuxerAck}_Params to Media{Configs,Data}.

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 "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "media/base/decryptor.h"
 #include "media/base/demuxer.h"
 #include "media/base/media_keys.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/ranges.h"
 #include "media/base/text_track.h"
 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
 
 namespace media {
 class ChunkDemuxer;
 class DecoderBuffer;
 class DecryptingDemuxerStream;
 class DemuxerStream;
 class MediaLog;
-struct MediaPlayerHostMsg_DemuxerReady_Params;
-struct MediaPlayerHostMsg_ReadFromDemuxerAck_Params;
+struct MediaConfigs;
+struct MediaData;
 }
 
 namespace content {
 
 class WebMediaPlayerProxyAndroid;
 
 class MediaSourceDelegate : public media::DemuxerHost {
  public:
   typedef base::Callback<void(WebKit::WebMediaSource*)>
       MediaSourceOpenedCB;
@@ skipping 46 matching lines @@
   // 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();
 
  private:
-  typedef base::Callback<void(
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params)>
-          ReadFromDemuxerAckCB;
-  typedef base::Callback<void(
-      scoped_ptr<media::MediaPlayerHostMsg_DemuxerReady_Params> params)>
-          DemuxerReadyCB;
+  typedef base::Callback<void(scoped_ptr<media::MediaData> data)>
+      ReadFromDemuxerAckCB;
+  typedef base::Callback<void(scoped_ptr<media::MediaConfigs> configs)>
+      DemuxerReadyCB;
 
   // This is private to enforce use of the Destroyer.
   virtual ~MediaSourceDelegate();
 
   // Methods inherited from DemuxerHost.
   virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
   virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE;
   virtual void AddBufferedTimeRange(base::TimeDelta start,
                                     base::TimeDelta end) OVERRIDE;
   virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
@@ skipping 29 matching lines @@
   void OnDemuxerStopDone();
   void OnDemuxerOpened();
   void OnNeedKey(const std::string& type,
                  const std::string& session_id,
                  const std::vector<uint8>& init_data);
   scoped_ptr<media::TextTrack> OnAddTextTrack(media::TextKind kind,
                                               const std::string& label,
                                               const std::string& language);
   void NotifyDemuxerReady();
   bool CanNotifyDemuxerReady();
-  void SendDemuxerReady(
-      scoped_ptr<media::MediaPlayerHostMsg_DemuxerReady_Params> params);
+  void SendDemuxerReady(scoped_ptr<media::MediaConfigs> configs);
 
   void StopDemuxer();
   void InitializeDemuxer();
   void SeekInternal(base::TimeDelta time, unsigned seek_request_id);
   void OnReadFromDemuxerInternal(media::DemuxerStream::Type type);
   // Reads an access unit from the demuxer stream |stream| and stores it in
   // the |index|th access unit in |params|.
-  void ReadFromDemuxerStream(
-      media::DemuxerStream::Type type,
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params,
-      size_t index);
-  void OnBufferReady(
-      media::DemuxerStream::Type type,
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params,
-      size_t index,
-      media::DemuxerStream::Status status,
-      const scoped_refptr<media::DecoderBuffer>& buffer);
+  void ReadFromDemuxerStream(media::DemuxerStream::Type type,
+                             scoped_ptr<media::MediaData> data,
+                             size_t index);
+  void OnBufferReady(media::DemuxerStream::Type type,
+                     scoped_ptr<media::MediaData> data,
+                     size_t index,
+                     media::DemuxerStream::Status status,
+                     const scoped_refptr<media::DecoderBuffer>& buffer);
 
-  void SendReadFromDemuxerAck(
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params);
+  void SendReadFromDemuxerAck(scoped_ptr<media::MediaData> data);
 
   // Helper function for calculating duration.
   int GetDurationMs();
 
   bool HasEncryptedStream();
 
   void SetSeeking(bool seeking);
   bool IsSeeking() const;
 
   // Weak pointer must be dereferenced and invalidated on the same thread.
@@ skipping 60 matching lines @@
   std::string key_system_;
 
   size_t access_unit_size_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_