| Index: webrtc/modules/video_coding/codec_database.cc
|
| diff --git a/webrtc/modules/video_coding/codec_database.cc b/webrtc/modules/video_coding/codec_database.cc
|
| index a5a7c1ea999ed6996f2dd75dde1c2231c8ae98a7..59fca1fa0debcf51661384f438708b2d529ae396 100644
|
| --- a/webrtc/modules/video_coding/codec_database.cc
|
| +++ b/webrtc/modules/video_coding/codec_database.cc
|
| @@ -16,7 +16,6 @@
|
| #include "webrtc/base/logging.h"
|
| #include "webrtc/engine_configurations.h"
|
| #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
| -#include "webrtc/modules/video_coding/codecs/i420/include/i420.h"
|
| #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
|
| #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
|
| #include "webrtc/modules/video_coding/internal_defines.h"
|
| @@ -165,21 +164,6 @@ void VCMCodecDataBase::Codec(VideoCodecType codec_type, VideoCodec* settings) {
|
| settings->codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings();
|
| return;
|
| case kVideoCodecI420:
|
| - strncpy(settings->plName, "I420", 5);
|
| - settings->codecType = kVideoCodecI420;
|
| - // 96 to 127 dynamic payload types for video codecs.
|
| - 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;
|
| - return;
|
| case kVideoCodecRED:
|
| case kVideoCodecULPFEC:
|
| case kVideoCodecGeneric:
|
| @@ -583,8 +567,6 @@ VCMGenericDecoder* VCMCodecDataBase::CreateDecoder(VideoCodecType type) const {
|
| return new VCMGenericDecoder(VP8Decoder::Create());
|
| case kVideoCodecVP9:
|
| return new VCMGenericDecoder(VP9Decoder::Create());
|
| - case kVideoCodecI420:
|
| - return new VCMGenericDecoder(new I420Decoder());
|
| case kVideoCodecH264:
|
| if (H264Decoder::IsSupported()) {
|
| return new VCMGenericDecoder(H264Decoder::Create());
|
|
|