Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/receiver.cc

 // 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.
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <climits>
@@ skipping 41 matching lines @@
 
 namespace media {
 namespace cast {
 
 // Settings chosen to match default sender settings.
 #define DEFAULT_SEND_PORT "0"
 #define DEFAULT_RECEIVE_PORT "2344"
 #define DEFAULT_SEND_IP "0.0.0.0"
 #define DEFAULT_AUDIO_FEEDBACK_SSRC "2"
 #define DEFAULT_AUDIO_INCOMING_SSRC "1"
-#define DEFAULT_AUDIO_PAYLOAD_TYPE "127"
 #define DEFAULT_VIDEO_FEEDBACK_SSRC "12"
 #define DEFAULT_VIDEO_INCOMING_SSRC "11"
-#define DEFAULT_VIDEO_PAYLOAD_TYPE "96"
 
 #if defined(USE_X11)
 const char* kVideoWindowWidth = "1280";
 const char* kVideoWindowHeight = "720";
 #endif  // defined(USE_X11)
 
 void GetPorts(uint16_t* tx_port, uint16_t* rx_port) {
   test::InputBuilder tx_input(
       "Enter send port.", DEFAULT_SEND_PORT, 1, 65535);
   *tx_port = static_cast<uint16_t>(tx_input.GetIntInput());
@@ skipping 41 matching lines @@
       "Choose window width.", kVideoWindowWidth, 144, 1920);
   *width = input_w.GetIntInput();
 
   test::InputBuilder input_h(
       "Choose window height.", kVideoWindowHeight, 176, 1080);
   *height = input_h.GetIntInput();
 }
 #endif  // defined(USE_X11)
 
 void GetAudioPayloadtype(FrameReceiverConfig* audio_config) {
-  test::InputBuilder input("Choose audio receiver payload type.",
-                           DEFAULT_AUDIO_PAYLOAD_TYPE,
-                           kDefaultRtpVideoPayloadType  /* low_range */,
-                           kDefaultRtpAudioPayloadType  /* high_range */);
-  audio_config->rtp_payload_type = input.GetIntInput();
+  test::InputBuilder input(
+      "Choose audio receiver payload type.",
+      std::to_string(static_cast<int>(RtpPayloadType::AUDIO_OPUS)),
+      static_cast<int>(RtpPayloadType::AUDIO_OPUS) /* low_range */,
+      static_cast<int>(RtpPayloadType::AUDIO_LAST) /* high_range */);
+  audio_config->rtp_payload_type =
+      static_cast<RtpPayloadType>(input.GetIntInput());
 }
 
 FrameReceiverConfig GetAudioReceiverConfig() {
   FrameReceiverConfig audio_config = GetDefaultAudioReceiverConfig();
   GetAudioSsrcs(&audio_config);
   GetAudioPayloadtype(&audio_config);
   audio_config.rtp_max_delay_ms = 300;
   return audio_config;
 }
 
 void GetVideoPayloadtype(FrameReceiverConfig* video_config) {
-  test::InputBuilder input("Choose video receiver payload type.",
-                           DEFAULT_VIDEO_PAYLOAD_TYPE,
-                           kDefaultRtpVideoPayloadType  /* low_range */,
-                           kDefaultRtpAudioPayloadType  /* high_range */);
-  video_config->rtp_payload_type = input.GetIntInput();
+  test::InputBuilder input(
+      "Choose video receiver payload type.",
+      std::to_string(static_cast<int>(RtpPayloadType::VIDEO_VP8)),
+      static_cast<int>(RtpPayloadType::VIDEO_VP8) /* low_range */,
+      static_cast<int>(RtpPayloadType::LAST) /* high_range */);
+  video_config->rtp_payload_type =
+      static_cast<RtpPayloadType>(input.GetIntInput());
 }
 
 FrameReceiverConfig GetVideoReceiverConfig() {
   FrameReceiverConfig video_config = GetDefaultVideoReceiverConfig();
   GetVideoSsrcs(&video_config);
   GetVideoPayloadtype(&video_config);
   video_config.rtp_max_delay_ms = 300;
   return video_config;
 }
 
@@ skipping 441 matching lines @@
                                   audio_config,
                                   video_config,
                                   window_width,
                                   window_height);
   player.Start();
 
   message_loop.Run();  // Run forever (i.e., until SIGTERM).
   NOTREACHED();
   return 0;
 }