From 87da937789aeb91e694ecbba436c0f4b44461218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 19 Dec 2018 11:42:25 +0100 Subject: [PATCH] Delete unused constant kVideoCodecI420 Followup to cl https://webrtc-review.googlesource.com/c/112596. Bug: webrtc:5791 Change-Id: Ie0375fa9e47dddd9e78d26fd63b8a349bacf5903 Reviewed-on: https://webrtc-review.googlesource.com/c/114983 Reviewed-by: Sebastian Jansson Reviewed-by: Rasmus Brandt Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#26211} --- api/video/video_codec_type.h | 1 - api/video_codecs/video_codec.cc | 5 ----- test/video_codec_settings.h | 6 ------ 3 files changed, 12 deletions(-) diff --git a/api/video/video_codec_type.h b/api/video/video_codec_type.h index 447723cf08..2e406c0755 100644 --- a/api/video/video_codec_type.h +++ b/api/video/video_codec_type.h @@ -21,7 +21,6 @@ enum VideoCodecType { kVideoCodecVP8, kVideoCodecVP9, kVideoCodecH264, - kVideoCodecI420, kVideoCodecMultiplex, }; diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc index ab73426d13..f376d882f4 100644 --- a/api/video_codecs/video_codec.cc +++ b/api/video_codecs/video_codec.cc @@ -109,7 +109,6 @@ const VideoCodecH264& VideoCodec::H264() const { static const char* kPayloadNameVp8 = "VP8"; static const char* kPayloadNameVp9 = "VP9"; static const char* kPayloadNameH264 = "H264"; -static const char* kPayloadNameI420 = "I420"; static const char* kPayloadNameGeneric = "Generic"; static const char* kPayloadNameMultiplex = "Multiplex"; @@ -121,8 +120,6 @@ const char* CodecTypeToPayloadString(VideoCodecType type) { return kPayloadNameVp9; case kVideoCodecH264: return kPayloadNameH264; - case kVideoCodecI420: - return kPayloadNameI420; // Other codecs default to generic. default: return kPayloadNameGeneric; @@ -136,8 +133,6 @@ VideoCodecType PayloadStringToCodecType(const std::string& name) { return kVideoCodecVP9; if (absl::EqualsIgnoreCase(name, kPayloadNameH264)) return kVideoCodecH264; - if (absl::EqualsIgnoreCase(name, kPayloadNameI420)) - return kVideoCodecI420; if (absl::EqualsIgnoreCase(name, kPayloadNameMultiplex)) return kVideoCodecMultiplex; return kVideoCodecGeneric; diff --git a/test/video_codec_settings.h b/test/video_codec_settings.h index f7ae48cf05..1557fc9a0e 100644 --- a/test/video_codec_settings.h +++ b/test/video_codec_settings.h @@ -59,12 +59,6 @@ static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) { // TODO(brandtr): Set |qpMax| here, when the OpenH264 wrapper supports it. *(settings->H264()) = VideoEncoder::GetDefaultH264Settings(); return; - case kVideoCodecI420: - // Bitrate needed for this size and framerate. - settings->startBitrate = - 3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2; - settings->maxBitrate = settings->startBitrate; - return; default: return; }