Refactoring: Use enum for RtpPayloadType.

chrome/renderer/media/cast_rtp_stream.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 "chrome/renderer/media/cast_rtp_stream.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 48 matching lines @@
 // The maximum number of milliseconds that should elapse since the last video
 // frame was received from the video source, before requesting refresh frames.
 const int kRefreshIntervalMilliseconds = 250;
 
 // The maximum number of refresh video frames to request/receive.  After this
 // limit (60 * 250ms = 15 seconds), refresh frame requests will stop being made.
 const int kMaxConsecutiveRefreshFrames = 60;
 
 CastRtpPayloadParams DefaultOpusPayload() {
   CastRtpPayloadParams payload;
-  payload.payload_type = media::cast::kDefaultRtpAudioPayloadType;
+  payload.payload_type = media::cast::RtpPayloadType::AUDIO_OPUS;
   payload.max_latency_ms = media::cast::kDefaultRtpMaxDelayMs;
   payload.ssrc = 1;
   payload.feedback_ssrc = 2;
   payload.clock_rate = media::cast::kDefaultAudioSamplingRate;
   // The value is 0 which means VBR.
   payload.min_bitrate = payload.max_bitrate =
       media::cast::kDefaultAudioEncoderBitrate;
   payload.channels = 2;
   payload.max_frame_rate = 100;  // 10 ms audio frames
   payload.codec_name = kCodecNameOpus;
   return payload;
 }
 
 CastRtpPayloadParams DefaultVp8Payload() {
   CastRtpPayloadParams payload;
-  payload.payload_type = media::cast::kDefaultRtpVideoPayloadType;
+  payload.payload_type = media::cast::RtpPayloadType::VIDEO_VP8;
   payload.max_latency_ms = media::cast::kDefaultRtpMaxDelayMs;
   payload.ssrc = 11;
   payload.feedback_ssrc = 12;
   payload.clock_rate = media::cast::kVideoFrequency;
   payload.max_bitrate = media::cast::kDefaultMaxVideoKbps;
   payload.min_bitrate = media::cast::kDefaultMinVideoKbps;
   payload.channels = 1;
   payload.max_frame_rate = media::cast::kDefaultMaxFrameRate;
   payload.codec_name = kCodecNameVp8;
   return payload;
 }
 
 CastRtpPayloadParams DefaultH264Payload() {
   CastRtpPayloadParams payload;
-  payload.payload_type = 96;
+  payload.payload_type = media::cast::RtpPayloadType::VIDEO_H264;
   payload.max_latency_ms = media::cast::kDefaultRtpMaxDelayMs;
   payload.ssrc = 11;
   payload.feedback_ssrc = 12;
   payload.clock_rate = media::cast::kVideoFrequency;
   payload.max_bitrate = media::cast::kDefaultMaxVideoKbps;
   payload.min_bitrate = media::cast::kDefaultMinVideoKbps;
   payload.channels = 1;
   payload.max_frame_rate = media::cast::kDefaultMaxFrameRate;
   payload.codec_name = kCodecNameH264;
   return payload;
@@ skipping 485 matching lines @@
 };
 
 CastRtpParams::CastRtpParams(const CastRtpPayloadParams& payload_params)
     : payload(payload_params) {}
 
 CastCodecSpecificParams::CastCodecSpecificParams() {}
 
 CastCodecSpecificParams::~CastCodecSpecificParams() {}
 
 CastRtpPayloadParams::CastRtpPayloadParams()
-    : payload_type(0),
+    : payload_type(media::cast::RtpPayloadType::UNKNOWN),
       max_latency_ms(0),
       min_latency_ms(0),
       ssrc(0),
       feedback_ssrc(0),
       clock_rate(0),
       max_bitrate(0),
       min_bitrate(0),
       channels(0),
-      max_frame_rate(0.0) {
-}
+      max_frame_rate(0.0) {}
 
 CastRtpPayloadParams::CastRtpPayloadParams(const CastRtpPayloadParams& other) =
     default;
 
 CastRtpPayloadParams::~CastRtpPayloadParams() {}
 
 CastRtpParams::CastRtpParams() {}
 
 CastRtpParams::CastRtpParams(const CastRtpParams& other) = default;
 
@@ skipping 108 matching lines @@
   DCHECK(content::RenderThread::Get());
   DVLOG(1) << "CastRtpStream::DidEncounterError(" << message << ") = "
            << (IsAudio() ? "audio" : "video");
   // Save the WeakPtr first because the error callback might delete this object.
   base::WeakPtr<CastRtpStream> ptr = weak_factory_.GetWeakPtr();
   error_callback_.Run(message);
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&CastRtpStream::Stop, ptr));
 }