Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/fake_media_source.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.
 
 // A fake media source that generates video and audio frames to a cast
 // sender.
 // This class can transcode a WebM file using FFmpeg. It can also
 // generate an animation and audio of fixed frequency.
 
 #ifndef MEDIA_CAST_TEST_FAKE_MEDIA_SOURCE_H_
@@ skipping 37 matching lines @@
 
 class FakeMediaSource : public media::AudioConverter::InputCallback {
  public:
   // |task_runner| is to schedule decoding tasks.
   // |clock| is used by this source but is not owned.
   // |audio_config| is the desired audio config.
   // |video_config| is the desired video config.
   // |keep_frames| is true if all VideoFrames are saved in a queue.
   FakeMediaSource(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
                   base::TickClock* clock,
-                  const FrameSenderConfig& audio_config,
-                  const FrameSenderConfig& video_config,
+                  const AudioSenderConfig& audio_config,
+                  const VideoSenderConfig& video_config,
                   bool keep_frames);
   ~FakeMediaSource() final;
 
   // Transcode this file as the source of video and audio frames.
   // If |final_fps| is non zero then the file is played at the desired rate.
   void SetSourceFile(const base::FilePath& video_file, int final_fps);
 
   // Set to true to randomly change the frame size at random points in time.
   // Only applies when SetSourceFile() is not used.
   void SetVariableFrameSizeMode(bool enabled);
 
   void Start(scoped_refptr<AudioFrameInput> audio_frame_input,
              scoped_refptr<VideoFrameInput> video_frame_input);
 
-  const FrameSenderConfig& get_video_config() const { return video_config_; }
+  const VideoSenderConfig& get_video_config() const { return video_config_; }
 
   scoped_refptr<media::VideoFrame> PopOldestInsertedVideoFrame();
 
  private:
   bool is_transcoding_audio() const { return audio_stream_index_ >= 0; }
   bool is_transcoding_video() const { return video_stream_index_ >= 0; }
 
   void SendNextFrame();
   void SendNextFakeFrame();
 
@@ skipping 26 matching lines @@
   double ProvideInput(media::AudioBus* output_bus,
                       uint32_t frames_delayed) final;
 
   AVStream* av_audio_stream();
   AVStream* av_video_stream();
   AVCodecContext* av_audio_context();
   AVCodecContext* av_video_context();
 
   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   const media::AudioParameters output_audio_params_;
-  const FrameSenderConfig video_config_;
+  const VideoSenderConfig video_config_;
   const bool keep_frames_;
   bool variable_frame_size_mode_;
   gfx::Size current_frame_size_;
   base::TimeTicks next_frame_size_change_time_;
   scoped_refptr<AudioFrameInput> audio_frame_input_;
   scoped_refptr<VideoFrameInput> video_frame_input_;
   uint8_t synthetic_count_;
   base::TickClock* const clock_;  // Not owned by this class.
 
   // Time when the stream starts.
@@ skipping 37 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FakeMediaSource> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeMediaSource);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif // MEDIA_CAST_TEST_FAKE_MEDIA_SOURCE_H_