Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/sender/external_video_encoder.h

 // Copyright 2014 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_CAST_SENDER_EXTERNAL_VIDEO_ENCODER_H_
 #define MEDIA_CAST_SENDER_EXTERNAL_VIDEO_ENCODER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 10 matching lines @@
 namespace media {
 namespace cast {
 
 // Cast MAIN thread proxy to the internal media::VideoEncodeAccelerator
 // implementation running on a separate thread.  Encodes media::VideoFrames and
 // emits media::cast::EncodedFrames.
 class ExternalVideoEncoder : public VideoEncoder {
  public:
   // Returns true if the current platform and system configuration supports
   // using ExternalVideoEncoder with the given |video_config|.
-  static bool IsSupported(const FrameSenderConfig& video_config);
+  static bool IsSupported(const VideoSenderConfig& video_config);
 
   ExternalVideoEncoder(
       const scoped_refptr<CastEnvironment>& cast_environment,
-      const FrameSenderConfig& video_config,
+      const VideoSenderConfig& video_config,
       const gfx::Size& frame_size,
       FrameId first_frame_id,
       const StatusChangeCallback& status_change_cb,
       const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
       const CreateVideoEncodeMemoryCallback& create_video_encode_memory_cb);
 
   ~ExternalVideoEncoder() final;
 
   // VideoEncoder implementation.
   bool EncodeVideoFrame(
       const scoped_refptr<media::VideoFrame>& video_frame,
       const base::TimeTicks& reference_time,
       const FrameEncodedCallback& frame_encoded_callback) final;
   void SetBitRate(int new_bit_rate) final;
   void GenerateKeyFrame() final;
 
  private:
   class VEAClientImpl;
 
   // Method invoked by the CreateVideoEncodeAcceleratorCallback to construct a
   // VEAClientImpl to own and interface with a new |vea|.  Upon return,
   // |client_| holds a reference to the new VEAClientImpl.
   void OnCreateVideoEncodeAccelerator(
-      const FrameSenderConfig& video_config,
+      const VideoSenderConfig& video_config,
       FrameId first_frame_id,
       const StatusChangeCallback& status_change_cb,
       scoped_refptr<base::SingleThreadTaskRunner> encoder_task_runner,
       std::unique_ptr<media::VideoEncodeAccelerator> vea);
 
   const scoped_refptr<CastEnvironment> cast_environment_;
   const CreateVideoEncodeMemoryCallback create_video_encode_memory_cb_;
 
   // The size of the visible region of the video frames to be encoded.
   const gfx::Size frame_size_;
 
   int bit_rate_;
   bool key_frame_requested_;
 
   scoped_refptr<VEAClientImpl> client_;
 
   // Provides a weak pointer for the OnCreateVideoEncoderAccelerator() callback.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<ExternalVideoEncoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalVideoEncoder);
 };
 
 // An implementation of SizeAdaptableVideoEncoderBase to proxy for
 // ExternalVideoEncoder instances.
 class SizeAdaptableExternalVideoEncoder : public SizeAdaptableVideoEncoderBase {
  public:
   SizeAdaptableExternalVideoEncoder(
       const scoped_refptr<CastEnvironment>& cast_environment,
-      const FrameSenderConfig& video_config,
+      const VideoSenderConfig& video_config,
       const StatusChangeCallback& status_change_cb,
       const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
       const CreateVideoEncodeMemoryCallback& create_video_encode_memory_cb);
 
   ~SizeAdaptableExternalVideoEncoder() final;
 
  protected:
   std::unique_ptr<VideoEncoder> CreateEncoder() final;
 
  private:
@@ skipping 57 matching lines @@
   std::unique_ptr<uint8_t[]> last_frame_pixel_buffer_;
   gfx::Size last_frame_size_;
 
   DISALLOW_COPY_AND_ASSIGN(QuantizerEstimator);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_SENDER_EXTERNAL_VIDEO_ENCODER_H_