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

media/base/android/media_source_player.h

 // Copyright (c) 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 MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 40 matching lines @@
   virtual int GetVideoWidth() OVERRIDE;
   virtual int GetVideoHeight() OVERRIDE;
   virtual base::TimeDelta GetCurrentTime() OVERRIDE;
   virtual base::TimeDelta GetDuration() OVERRIDE;
   virtual bool IsPlaying() OVERRIDE;
   virtual bool CanPause() OVERRIDE;
   virtual bool CanSeekForward() OVERRIDE;
   virtual bool CanSeekBackward() OVERRIDE;
   virtual bool IsPlayerReady() OVERRIDE;
   virtual void OnSeekRequestAck(unsigned seek_request_id) OVERRIDE;
-  virtual void DemuxerReady(
-      const MediaPlayerHostMsg_DemuxerReady_Params& params) OVERRIDE;
-  virtual void ReadFromDemuxerAck(
-      const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) OVERRIDE;
+  virtual void DemuxerReady(const MediaConfigs& configs) OVERRIDE;
+  virtual void ReadFromDemuxerAck(const MediaData& data) OVERRIDE;
   virtual void DurationChanged(const base::TimeDelta& duration) OVERRIDE;
   virtual void SetDrmBridge(MediaDrmBridge* drm_bridge) OVERRIDE;
 
  private:
   // Update the current timestamp.
   void UpdateTimestamps(const base::TimeDelta& presentation_timestamp,
                         size_t audio_output_bytes);
 
   // Helper function for starting media playback.
   void StartInternal();
@@ skipping 110 matching lines @@
   bool reconfig_audio_decoder_;
   bool reconfig_video_decoder_;
 
   // These variables keep track of the current decoding data.
   // TODO(qinmin): remove these variables when we no longer relies on IPC for
   // data passing.
   size_t audio_access_unit_index_;
   size_t video_access_unit_index_;
   bool waiting_for_audio_data_;
   bool waiting_for_video_data_;
-  MediaPlayerHostMsg_ReadFromDemuxerAck_Params received_audio_;
-  MediaPlayerHostMsg_ReadFromDemuxerAck_Params received_video_;
+  MediaData received_audio_;
+  MediaData received_video_;
 
   // A cancelable task that is posted when the audio decoder starts requesting
   // new data. This callback runs if no data arrives before the timeout period
   // elapses.
   base::CancelableClosure decoder_starvation_callback_;
 
   // Whether the audio and video decoder jobs should resync with each other.
   bool sync_decoder_jobs_;
 
   // Object to calculate the current audio timestamp for A/V sync.
   scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_;
 
   // Weak pointer passed to media decoder jobs for callbacks.
   base::WeakPtrFactory<MediaSourcePlayer> weak_this_;
 
   MediaDrmBridge* drm_bridge_;
 
   friend class MediaSourcePlayerTest;
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_