Remove VCM_*_PAYLOAD_TYPE constants.
These payload types aren't directly connected to any payload type, and
the payload type still has to be negotiated externally. As such these
constants are just a source of confusion.
BUG=
R=stefan@webrtc.org
Review URL: https://codereview.webrtc.org/1215603003
Cr-Commit-Position: refs/heads/master@{#9546}
diff --git a/webrtc/modules/video_coding/main/interface/video_coding_defines.h b/webrtc/modules/video_coding/main/interface/video_coding_defines.h
index 2a5fc0a..259e75e 100644
--- a/webrtc/modules/video_coding/main/interface/video_coding_defines.h
+++ b/webrtc/modules/video_coding/main/interface/video_coding_defines.h
@@ -36,13 +36,6 @@
#define VCM_ERROR_REQUEST_SLI -12
#define VCM_NOT_IMPLEMENTED -20
-#define VCM_RED_PAYLOAD_TYPE 96
-#define VCM_ULPFEC_PAYLOAD_TYPE 97
-#define VCM_VP8_PAYLOAD_TYPE 100
-#define VCM_VP9_PAYLOAD_TYPE 101
-#define VCM_I420_PAYLOAD_TYPE 124
-#define VCM_H264_PAYLOAD_TYPE 127
-
enum { kDefaultStartBitrateKbps = 300 };
enum VCMVideoProtection {
diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/main/source/codec_database.cc
index 49a018b..5f89936 100644
--- a/webrtc/modules/video_coding/main/source/codec_database.cc
+++ b/webrtc/modules/video_coding/main/source/codec_database.cc
@@ -31,6 +31,7 @@
namespace {
const size_t kDefaultPayloadSize = 1440;
+const uint8_t kDefaultPayloadType = 100;
}
namespace webrtc {
@@ -140,7 +141,7 @@
strncpy(settings->plName, "VP8", 4);
settings->codecType = kVideoCodecVP8;
// 96 to 127 dynamic payload types for video codecs.
- settings->plType = VCM_VP8_PAYLOAD_TYPE;
+ settings->plType = kDefaultPayloadType;
settings->startBitrate = kDefaultStartBitrateKbps;
settings->minBitrate = VCM_MIN_BITRATE;
settings->maxBitrate = 0;
@@ -158,7 +159,7 @@
strncpy(settings->plName, "VP9", 4);
settings->codecType = kVideoCodecVP9;
// 96 to 127 dynamic payload types for video codecs.
- settings->plType = VCM_VP9_PAYLOAD_TYPE;
+ settings->plType = kDefaultPayloadType;
settings->startBitrate = 100;
settings->minBitrate = VCM_MIN_BITRATE;
settings->maxBitrate = 0;
@@ -176,7 +177,7 @@
strncpy(settings->plName, "H264", 5);
settings->codecType = kVideoCodecH264;
// 96 to 127 dynamic payload types for video codecs.
- settings->plType = VCM_H264_PAYLOAD_TYPE;
+ settings->plType = kDefaultPayloadType;
settings->startBitrate = kDefaultStartBitrateKbps;
settings->minBitrate = VCM_MIN_BITRATE;
settings->maxBitrate = 0;
@@ -194,7 +195,7 @@
strncpy(settings->plName, "I420", 5);
settings->codecType = kVideoCodecI420;
// 96 to 127 dynamic payload types for video codecs.
- settings->plType = VCM_I420_PAYLOAD_TYPE;
+ settings->plType = kDefaultPayloadType;
// Bitrate needed for this size and framerate.
settings->startBitrate = 3 * VCM_DEFAULT_CODEC_WIDTH *
VCM_DEFAULT_CODEC_HEIGHT * 8 *
diff --git a/webrtc/modules/video_coding/main/test/video_rtp_play.cc b/webrtc/modules/video_coding/main/test/video_rtp_play.cc
index 1cf27c7..c1bc02f 100644
--- a/webrtc/modules/video_coding/main/test/video_rtp_play.cc
+++ b/webrtc/modules/video_coding/main/test/video_rtp_play.cc
@@ -24,7 +24,9 @@
const uint32_t kConfigRenderDelayMs = 0;
const uint32_t kConfigMinPlayoutDelayMs = 0;
const int64_t kConfigMaxRuntimeMs = -1;
-
+const uint8_t kDefaultUlpFecPayloadType = 97;
+const uint8_t kDefaultRedPayloadType = 96;
+const uint8_t kDefaultVp8PayloadType = 100;
} // namespace
int RtpPlay(const CmdArgs& args) {
@@ -35,11 +37,11 @@
webrtc::rtpplayer::PayloadTypes payload_types;
payload_types.push_back(webrtc::rtpplayer::PayloadCodecTuple(
- VCM_ULPFEC_PAYLOAD_TYPE, "ULPFEC", webrtc::kVideoCodecULPFEC));
+ kDefaultUlpFecPayloadType, "ULPFEC", webrtc::kVideoCodecULPFEC));
payload_types.push_back(webrtc::rtpplayer::PayloadCodecTuple(
- VCM_RED_PAYLOAD_TYPE, "RED", webrtc::kVideoCodecRED));
+ kDefaultRedPayloadType, "RED", webrtc::kVideoCodecRED));
payload_types.push_back(webrtc::rtpplayer::PayloadCodecTuple(
- VCM_VP8_PAYLOAD_TYPE, "VP8", webrtc::kVideoCodecVP8));
+ kDefaultVp8PayloadType, "VP8", webrtc::kVideoCodecVP8));
std::string output_file = args.outputFile;
if (output_file == "") {
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 50a33cb..dd9650d 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -252,7 +252,7 @@
VideoEncoderConfig* encoder_config) override {
send_config->encoder_settings.encoder = encoder_.get();
send_config->encoder_settings.payload_name = "VP9";
- send_config->encoder_settings.payload_type = VCM_VP9_PAYLOAD_TYPE;
+ send_config->encoder_settings.payload_type = 124;
encoder_config->streams[0].min_bitrate_bps = 50000;
encoder_config->streams[0].target_bitrate_bps =
encoder_config->streams[0].max_bitrate_bps = 2000000;
