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

media/cast/audio_receiver/audio_receiver.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 MEDIA_CAST_AUDIO_RECEIVER_AUDIO_RECEIVER_H_
 #define MEDIA_CAST_AUDIO_RECEIVER_AUDIO_RECEIVER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 38 matching lines @@
 // outstanding requests (perhaps to just one or two).
 //
 // This class is not thread safe.  Should only be called from the Main cast
 // thread.
 class AudioReceiver : public RtpReceiver,
                       public RtpPayloadFeedback,
                       public base::NonThreadSafe,
                       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();
 
   // Request a decoded audio frame.  The audio signal data returned in the
   // callback will have the sampling rate and number of channels as requested in
   // the configuration that was passed to the ctor.
   //
   // The given |callback| is guaranteed to be run at some point in the future,
   // even if to respond with NULL at shutdown time.
@@ skipping 80 matching lines @@
   const int frequency_;
 
   // The total amount of time between a frame's capture/recording on the sender
   // and its playback on the receiver (i.e., shown to a user).  This is fixed as
   // a value large enough to give the system sufficient time to encode,
   // transmit/retransmit, receive, decode, and render; given its run-time
   // environment (sender/receiver hardware performance, network conditions,
   // 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_;
+
   // 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
   // sender for the remainder of the session).
   bool reports_are_scheduled_;
 
   // Assembles packets into frames, providing this receiver with complete,
   // decodable EncodedFrames.
   Framer framer_;
 
@@ skipping 28 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<AudioReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioReceiver);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_AUDIO_RECEIVER_AUDIO_RECEIVER_H_