Adding "rtp_timebase" variable in lieu of "frequency" for FrameReceiverConfig structure.

BUG=448025

Review URL: https://codereview.chromium.org/845993002

Cr-Commit-Position: refs/heads/master@{#311541}

4 files changed, 10 insertions, 10 deletions

diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc
index a38f2be..8ef123e 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/media/cast/test/cast_benchmarks.cc
@@ -254,7 +254,7 @@ class RunOneBenchmark {
     audio_receiver_config_.incoming_ssrc = audio_sender_config_.ssrc;
     audio_receiver_config_.rtp_payload_type =
         audio_sender_config_.rtp_payload_type;
-    audio_receiver_config_.frequency = audio_sender_config_.frequency;
+    audio_receiver_config_.rtp_timebase = audio_sender_config_.frequency;
     audio_receiver_config_.channels = kAudioChannels;
     audio_receiver_config_.target_frame_rate = 100;
     audio_receiver_config_.codec = audio_sender_config_.codec;
@@ -290,7 +290,7 @@ class RunOneBenchmark {
     video_receiver_config_.rtp_payload_type =
         video_sender_config_.rtp_payload_type;
     video_receiver_config_.codec = video_sender_config_.codec;
-    video_receiver_config_.frequency = kVideoFrequency;
+    video_receiver_config_.rtp_timebase = kVideoFrequency;
     video_receiver_config_.channels = 1;
     video_receiver_config_.target_frame_rate = 100;
     video_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 10cf377..46b5d71 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -486,13 +486,13 @@ class End2EndTest : public ::testing::Test {
     audio_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     audio_receiver_config_.rtp_payload_type =
         audio_sender_config_.rtp_payload_type;
-    audio_receiver_config_.frequency = audio_sender_config_.frequency;
+    audio_receiver_config_.rtp_timebase = audio_sender_config_.frequency;
     audio_receiver_config_.channels = kAudioChannels;
     audio_receiver_config_.target_frame_rate = 100;
     audio_receiver_config_.codec = audio_sender_config_.codec;
 
     test_receiver_audio_callback_->SetExpectedSamplingFrequency(
-        audio_receiver_config_.frequency);
+        audio_receiver_config_.rtp_timebase);
 
     video_sender_config_.ssrc = 3;
     video_sender_config_.receiver_ssrc = 4;
@@ -518,7 +518,7 @@ class End2EndTest : public ::testing::Test {
     video_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     video_receiver_config_.rtp_payload_type =
         video_sender_config_.rtp_payload_type;
-    video_receiver_config_.frequency = kVideoFrequency;
+    video_receiver_config_.rtp_timebase = kVideoFrequency;
     video_receiver_config_.channels = 1;
     video_receiver_config_.target_frame_rate =
         video_sender_config_.max_frame_rate;
diff --git a/media/cast/test/receiver.cc b/media/cast/test/receiver.cc
index e930034..4fd2650 100644
--- a/media/cast/test/receiver.cc
+++ b/media/cast/test/receiver.cc
@@ -152,10 +152,10 @@ FrameReceiverConfig GetVideoReceiverConfig() {
 }
 
 AudioParameters ToAudioParameters(const FrameReceiverConfig& config) {
-  const int samples_in_10ms = config.frequency / 100;
+  const int samples_in_10ms = config.rtp_timebase / 100;
   return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
                          GuessChannelLayout(config.channels),
-                         config.frequency, 32, samples_in_10ms);
+                         config.rtp_timebase, 32, samples_in_10ms);
 }
 
 // An InProcessReceiver that renders video frames to a LinuxOutputWindow and
diff --git a/media/cast/test/utility/default_config.cc b/media/cast/test/utility/default_config.cc
index 1becf60..39b9ae6 100644
--- a/media/cast/test/utility/default_config.cc
+++ b/media/cast/test/utility/default_config.cc
@@ -31,7 +31,7 @@ FrameReceiverConfig GetDefaultAudioReceiverConfig() {
   config.incoming_ssrc = 1;
   config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
   config.rtp_payload_type = 127;
-  config.frequency = 48000;
+  config.rtp_timebase = 48000;
   config.channels = 2;
   config.target_frame_rate = 100;  // 10ms of signal per frame
   config.codec = media::cast::CODEC_AUDIO_OPUS;
@@ -44,7 +44,7 @@ FrameReceiverConfig GetDefaultVideoReceiverConfig() {
   config.incoming_ssrc = 11;
   config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
   config.rtp_payload_type = 96;
-  config.frequency = kVideoFrequency;
+  config.rtp_timebase = kVideoFrequency;
   config.channels = 1;
   config.target_frame_rate = kDefaultMaxFrameRate;
   config.codec = media::cast::CODEC_VIDEO_VP8;
@@ -58,7 +58,7 @@ AudioSenderConfig GetDefaultAudioSenderConfig() {
   config.receiver_ssrc = recv_config.feedback_ssrc;
   config.rtp_payload_type = recv_config.rtp_payload_type;
   config.use_external_encoder = false;
-  config.frequency = recv_config.frequency;
+  config.frequency = recv_config.rtp_timebase;
   config.channels = recv_config.channels;
   config.bitrate = kDefaultAudioEncoderBitrate;
   config.codec = recv_config.codec;