Adding "target_frame_rate" variable in lieu of "max_frame_rate" for FrameReceiverConfig

media/cast/receiver/frame_receiver_unittest.cc

 // 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.
 
 #include <deque>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 87 matching lines @@
 
     receiver_.reset(new FrameReceiver(
         cast_environment_, config_, AUDIO_EVENT, &mock_transport_));
   }
 
   void CreateFrameReceiverOfVideo() {
     config_ = GetDefaultVideoReceiverConfig();
     config_.rtp_max_delay_ms = kPlayoutDelayMillis;
     // Note: Frame rate must divide 1000 without remainder so the test code
     // doesn't have to account for rounding errors.
-    config_.max_frame_rate = 25;
+    config_.target_frame_rate = 25;
 
     receiver_.reset(new FrameReceiver(
         cast_environment_, config_, VIDEO_EVENT, &mock_transport_));
   }
 
   void FeedOneFrameIntoReceiver() {
     // Note: For testing purposes, a frame consists of only a single packet.
     receiver_->ProcessParsedPacket(
         rtp_header_, &payload_[0], payload_.size());
   }
@@ skipping 91 matching lines @@
 TEST_F(FrameReceiverTest, ReceivesFramesSkippingWhenAppropriate) {
   CreateFrameReceiverOfAudio();
 
   SimpleEventSubscriber event_subscriber;
   cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber);
 
   EXPECT_CALL(mock_transport_, SendRtcpFromRtpReceiver(_, _, _, _, _, _, _))
       .WillRepeatedly(testing::Return());
 
   const uint32 rtp_advance_per_frame =
-      config_.frequency / config_.max_frame_rate;
+      config_.frequency / config_.target_frame_rate;
   const base::TimeDelta time_advance_per_frame =
-      base::TimeDelta::FromSeconds(1) / config_.max_frame_rate;
+      base::TimeDelta::FromSeconds(1) / config_.target_frame_rate;
 
   // Feed and process lip sync in receiver.
   FeedLipSyncInfoIntoReceiver();
   task_runner_->RunTasks();
   const base::TimeTicks first_frame_capture_time = testing_clock_->NowTicks();
 
   // Enqueue a request for a frame.
   const ReceiveEncodedFrameCallback frame_encoded_callback =
       base::Bind(&FakeFrameClient::DeliverEncodedFrame,
                  base::Unretained(&frame_client_));
@@ skipping 80 matching lines @@
 TEST_F(FrameReceiverTest, ReceivesFramesRefusingToSkipAny) {
   CreateFrameReceiverOfVideo();
 
   SimpleEventSubscriber event_subscriber;
   cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber);
 
   EXPECT_CALL(mock_transport_, SendRtcpFromRtpReceiver(_, _, _, _, _, _, _))
       .WillRepeatedly(testing::Return());
 
   const uint32 rtp_advance_per_frame =
-      config_.frequency / config_.max_frame_rate;
+      config_.frequency / config_.target_frame_rate;
   const base::TimeDelta time_advance_per_frame =
-      base::TimeDelta::FromSeconds(1) / config_.max_frame_rate;
+      base::TimeDelta::FromSeconds(1) / config_.target_frame_rate;
 
   // Feed and process lip sync in receiver.
   FeedLipSyncInfoIntoReceiver();
   task_runner_->RunTasks();
   const base::TimeTicks first_frame_capture_time = testing_clock_->NowTicks();
 
   // Enqueue a request for a frame.
   const ReceiveEncodedFrameCallback frame_encoded_callback =
       base::Bind(&FakeFrameClient::DeliverEncodedFrame,
                  base::Unretained(&frame_client_));
@@ skipping 75 matching lines @@
     EXPECT_GE(kFirstFrameId + 3, frame_events[i].frame_id);
     const int frame_offset = frame_events[i].frame_id - kFirstFrameId;
     EXPECT_EQ(frame_offset * rtp_advance_per_frame,
               frame_events[i].rtp_timestamp);
   }
   cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
 }
 
 }  // namespace cast
 }  // namespace media