diff --git a/common_types.cc b/common_types.cc index a8a660622d..fafc7d1ca2 100644 --- a/common_types.cc +++ b/common_types.cc @@ -117,9 +117,6 @@ static const char* kPayloadNameVp8 = "VP8"; static const char* kPayloadNameVp9 = "VP9"; static const char* kPayloadNameH264 = "H264"; static const char* kPayloadNameI420 = "I420"; -static const char* kPayloadNameRED = "RED"; -static const char* kPayloadNameULPFEC = "ULPFEC"; -static const char* kPayloadNameFlexfec = "flexfec-03"; static const char* kPayloadNameGeneric = "Generic"; static const char* kPayloadNameMultiplex = "Multiplex"; @@ -137,12 +134,6 @@ const char* CodecTypeToPayloadString(VideoCodecType type) { return kPayloadNameH264; case kVideoCodecI420: return kPayloadNameI420; - case kVideoCodecRED: - return kPayloadNameRED; - case kVideoCodecULPFEC: - return kPayloadNameULPFEC; - case kVideoCodecFlexfec: - return kPayloadNameFlexfec; // Other codecs default to generic. case kVideoCodecMultiplex: case kVideoCodecGeneric: @@ -161,12 +152,6 @@ VideoCodecType PayloadStringToCodecType(const std::string& name) { return kVideoCodecH264; if (CodecNamesEq(name.c_str(), kPayloadNameI420)) return kVideoCodecI420; - if (CodecNamesEq(name.c_str(), kPayloadNameRED)) - return kVideoCodecRED; - if (CodecNamesEq(name.c_str(), kPayloadNameULPFEC)) - return kVideoCodecULPFEC; - if (CodecNamesEq(name.c_str(), kPayloadNameFlexfec)) - return kVideoCodecFlexfec; if (CodecNamesEq(name.c_str(), kPayloadNameMultiplex)) return kVideoCodecMultiplex; return kVideoCodecGeneric; diff --git a/common_types.h b/common_types.h index dee1343fc4..cbdd927904 100644 --- a/common_types.h +++ b/common_types.h @@ -412,9 +412,6 @@ enum VideoCodecType { kVideoCodecVP9, kVideoCodecH264, kVideoCodecI420, - kVideoCodecRED, - kVideoCodecULPFEC, - kVideoCodecFlexfec, kVideoCodecGeneric, kVideoCodecMultiplex, diff --git a/common_video/video_frame.cc b/common_video/video_frame.cc index f4ebac8c9e..518bac0e4d 100644 --- a/common_video/video_frame.cc +++ b/common_video/video_frame.cc @@ -31,9 +31,6 @@ size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) { case kVideoCodecH264: return kBufferPaddingBytesH264; case kVideoCodecI420: - case kVideoCodecRED: - case kVideoCodecULPFEC: - case kVideoCodecFlexfec: case kVideoCodecGeneric: case kVideoCodecMultiplex: case kVideoCodecUnknown: diff --git a/modules/rtp_rtcp/source/rtp_payload_registry.cc b/modules/rtp_rtcp/source/rtp_payload_registry.cc index 953bff4156..688efbaf37 100644 --- a/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -54,9 +54,6 @@ RtpVideoCodecTypes ConvertToRtpVideoCodecType(VideoCodecType type) { case kVideoCodecVP9: case kVideoCodecH264: return type; - case kVideoCodecRED: - case kVideoCodecULPFEC: - return kVideoCodecUnknown; default: return kVideoCodecGeneric; } diff --git a/modules/video_coding/encoder_database.cc b/modules/video_coding/encoder_database.cc index a514e14fb8..3df0a9daa8 100644 --- a/modules/video_coding/encoder_database.cc +++ b/modules/video_coding/encoder_database.cc @@ -159,9 +159,6 @@ bool VCMEncoderDataBase::RequiresEncoderReset( break; // Known codecs without payload-specifics case kVideoCodecI420: - case kVideoCodecRED: - case kVideoCodecULPFEC: - case kVideoCodecFlexfec: case kVideoCodecMultiplex: break; // Unknown codec type, reset just to be sure. diff --git a/modules/video_coding/rtp_frame_reference_finder.cc b/modules/video_coding/rtp_frame_reference_finder.cc index 296ff04888..8afdb026e4 100644 --- a/modules/video_coding/rtp_frame_reference_finder.cc +++ b/modules/video_coding/rtp_frame_reference_finder.cc @@ -83,11 +83,6 @@ void RtpFrameReferenceFinder::RetryStashedFrames() { RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameInternal(RtpFrameObject* frame) { switch (frame->codec_type()) { - case kVideoCodecFlexfec: - case kVideoCodecULPFEC: - case kVideoCodecRED: - RTC_NOTREACHED(); - break; case kVideoCodecVP8: return ManageFrameVp8(frame); case kVideoCodecVP9: diff --git a/test/video_codec_settings.h b/test/video_codec_settings.h index c02bdcc887..f09b0b1e55 100644 --- a/test/video_codec_settings.h +++ b/test/video_codec_settings.h @@ -69,9 +69,6 @@ static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) { 3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2; settings->maxBitrate = settings->startBitrate; return; - case kVideoCodecRED: - case kVideoCodecULPFEC: - case kVideoCodecFlexfec: case kVideoCodecMultiplex: case kVideoCodecGeneric: case kVideoCodecUnknown: