[Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig.

media/cast/audio_receiver/audio_receiver.h

Index: media/cast/audio_receiver/audio_receiver.h
diff --git a/media/cast/audio_receiver/audio_receiver.h b/media/cast/audio_receiver/audio_receiver.h
index 454a62fdf4817dfbf3b8940f8a24ec0bbe97a6c9..87c5147b50b83b5e382ee89a84b687d3a6e1f882 100644
--- a/media/cast/audio_receiver/audio_receiver.h
+++ b/media/cast/audio_receiver/audio_receiver.h
@@ -56,7 +56,7 @@ class AudioReceiver : public RtpReceiver,
                       public base::SupportsWeakPtr<AudioReceiver> {
  public:
   AudioReceiver(scoped_refptr<CastEnvironment> cast_environment,
-                const AudioReceiverConfig& audio_config,
+                const FrameReceiverConfig& audio_config,
                 transport::PacedPacketSender* const packet_sender);
 
   virtual ~AudioReceiver();
@@ -157,6 +157,9 @@ class AudioReceiver : public RtpReceiver,
   // etc.).
   const base::TimeDelta target_playout_delay_;
 
+  // Hack: This is used in logic that determines whether to skip frames.
+  const base::TimeDelta expected_frame_duration_;

[Alpha Left Google, 2014/05/29 02:35:11]

Is this hack going to stay?

[miu, 2014/05/29 19:03:10]

No.  This was added to make AudioReceiver "the same" as VideoReceiver so the
upcoming merge is easier.  After the receivers are merged, we will be in a great
position to revisit this.

+
   // Set to false initially, then set to true after scheduling the periodic
   // sending of reports back to the sender.  Reports are first scheduled just
   // after receiving a first packet (since the first packet identifies the