Remove VCM_*_PAYLOAD_TYPE constants.

webrtc/modules/video_coding/main/source/codec_database.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 13 matching lines @@
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #endif
 #ifdef VIDEOCODEC_VP9
 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
 #endif
 #include "webrtc/modules/video_coding/main/source/internal_defines.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 
 namespace {
 const size_t kDefaultPayloadSize = 1440;
+const uint8_t kDefaultPayloadType = 100;
 }
 
 namespace webrtc {
 
 VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() {
   VideoCodecVP8 vp8_settings;
   memset(&vp8_settings, 0, sizeof(vp8_settings));
 
   vp8_settings.resilience = kResilientStream;
   vp8_settings.numberOfTemporalLayers = 1;
@@ skipping 89 matching lines @@
   if (list_id >= VCM_NUM_VIDEO_CODECS_AVAILABLE) {
     return false;
   }
   memset(settings, 0, sizeof(VideoCodec));
   switch (list_id) {
 #ifdef VIDEOCODEC_VP8
     case VCM_VP8_IDX: {
       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;
       settings->maxFramerate = VCM_DEFAULT_FRAME_RATE;
       settings->width = VCM_DEFAULT_CODEC_WIDTH;
       settings->height = VCM_DEFAULT_CODEC_HEIGHT;
       settings->numberOfSimulcastStreams = 0;
       settings->qpMax = 56;
       settings->codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings();
       return true;
     }
 #endif
 #ifdef VIDEOCODEC_VP9
     case VCM_VP9_IDX: {
       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;
       settings->maxFramerate = VCM_DEFAULT_FRAME_RATE;
       settings->width = VCM_DEFAULT_CODEC_WIDTH;
       settings->height = VCM_DEFAULT_CODEC_HEIGHT;
       settings->numberOfSimulcastStreams = 0;
       settings->qpMax = 56;
       settings->codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings();
       return true;
     }
 #endif
 #ifdef VIDEOCODEC_H264
     case VCM_H264_IDX: {
       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;
       settings->maxFramerate = VCM_DEFAULT_FRAME_RATE;
       settings->width = VCM_DEFAULT_CODEC_WIDTH;
       settings->height = VCM_DEFAULT_CODEC_HEIGHT;
       settings->numberOfSimulcastStreams = 0;
       settings->qpMax = 56;
       settings->codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings();
       return true;
     }
 #endif
 #ifdef VIDEOCODEC_I420
     case VCM_I420_IDX: {
       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 *
                                VCM_DEFAULT_FRAME_RATE / 1000 / 2;
       settings->maxBitrate = settings->startBitrate;
       settings->maxFramerate = VCM_DEFAULT_FRAME_RATE;
       settings->width = VCM_DEFAULT_CODEC_WIDTH;
       settings->height = VCM_DEFAULT_CODEC_HEIGHT;
       settings->minBitrate = VCM_MIN_BITRATE;
       settings->numberOfSimulcastStreams = 0;
@@ skipping 521 matching lines @@
 
 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem(
     uint8_t payload_type) const {
   ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type);
   if (it != dec_external_map_.end()) {
     return (*it).second;
   }
   return NULL;
 }
 }  // namespace webrtc