From 9cccf85314c04145ea8de2802878c3de2e0e3a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 4 Dec 2018 11:01:26 +0100 Subject: [PATCH] Delete unused video coding error codes. Bug: webrtc:8064 Change-Id: I0fb714acc1bd86e230139eb929137a10710652ba Reviewed-on: https://webrtc-review.googlesource.com/c/113000 Reviewed-by: Karl Wiberg Reviewed-by: Rasmus Brandt Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#25887} --- api/video_codecs/video_encoder.h | 2 -- modules/video_coding/generic_decoder.cc | 3 +-- modules/video_coding/include/video_coding_defines.h | 5 ----- modules/video_coding/include/video_error_codes.h | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h index da21fa65a2..cce2dbda53 100644 --- a/api/video_codecs/video_encoder.h +++ b/api/video_codecs/video_encoder.h @@ -178,7 +178,6 @@ class RTC_EXPORT VideoEncoder { // <0 - Errors: // WEBRTC_VIDEO_CODEC_ERR_PARAMETER // WEBRTC_VIDEO_CODEC_ERR_SIZE - // WEBRTC_VIDEO_CODEC_LEVEL_EXCEEDED // WEBRTC_VIDEO_CODEC_MEMORY // WEBRTC_VIDEO_CODEC_ERROR virtual int32_t InitEncode(const VideoCodec* codec_settings, @@ -210,7 +209,6 @@ class RTC_EXPORT VideoEncoder { // WEBRTC_VIDEO_CODEC_ERR_PARAMETER // WEBRTC_VIDEO_CODEC_MEMORY // WEBRTC_VIDEO_CODEC_ERROR - // WEBRTC_VIDEO_CODEC_TIMEOUT virtual int32_t Encode(const VideoFrame& frame, const CodecSpecificInfo* codec_specific_info, const std::vector* frame_types) = 0; diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc index 2dd9b2604b..5ee8d4eb70 100644 --- a/modules/video_coding/generic_decoder.cc +++ b/modules/video_coding/generic_decoder.cc @@ -238,8 +238,7 @@ int32_t VCMGenericDecoder::Decode(const VCMEncodedFrame& frame, int64_t nowMs) { << frame.Timestamp() << ", error code: " << ret; _callback->Pop(frame.Timestamp()); return ret; - } else if (ret == WEBRTC_VIDEO_CODEC_NO_OUTPUT || - ret == WEBRTC_VIDEO_CODEC_REQUEST_SLI) { + } else if (ret == WEBRTC_VIDEO_CODEC_NO_OUTPUT) { // No output _callback->Pop(frame.Timestamp()); } diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h index 242edee824..dc9060c5c1 100644 --- a/modules/video_coding/include/video_coding_defines.h +++ b/modules/video_coding/include/video_coding_defines.h @@ -27,17 +27,12 @@ namespace webrtc { #define VCM_MISSING_CALLBACK 1 #define VCM_OK 0 #define VCM_GENERAL_ERROR -1 -#define VCM_LEVEL_EXCEEDED -2 -#define VCM_MEMORY -3 #define VCM_PARAMETER_ERROR -4 -#define VCM_UNKNOWN_PAYLOAD -5 #define VCM_CODEC_ERROR -6 #define VCM_UNINITIALIZED -7 #define VCM_NO_CODEC_REGISTERED -8 #define VCM_JITTER_BUFFER_ERROR -9 #define VCM_OLD_PACKET_ERROR -10 -#define VCM_NO_FRAME_DECODED -11 -#define VCM_NOT_IMPLEMENTED -20 enum { // Timing frames settings. Timing frames are sent every diff --git a/modules/video_coding/include/video_error_codes.h b/modules/video_coding/include/video_error_codes.h index 4f0da22ff2..f57713d1a2 100644 --- a/modules/video_coding/include/video_error_codes.h +++ b/modules/video_coding/include/video_error_codes.h @@ -16,17 +16,13 @@ // Define return values #define WEBRTC_VIDEO_CODEC_OK_REQUEST_KEYFRAME 4 -#define WEBRTC_VIDEO_CODEC_REQUEST_SLI 2 #define WEBRTC_VIDEO_CODEC_NO_OUTPUT 1 #define WEBRTC_VIDEO_CODEC_OK 0 #define WEBRTC_VIDEO_CODEC_ERROR -1 -#define WEBRTC_VIDEO_CODEC_LEVEL_EXCEEDED -2 #define WEBRTC_VIDEO_CODEC_MEMORY -3 #define WEBRTC_VIDEO_CODEC_ERR_PARAMETER -4 #define WEBRTC_VIDEO_CODEC_ERR_SIZE -5 -#define WEBRTC_VIDEO_CODEC_TIMEOUT -6 #define WEBRTC_VIDEO_CODEC_UNINITIALIZED -7 -#define WEBRTC_VIDEO_CODEC_ERR_REQUEST_SLI -12 #define WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE -13 #define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14 #define WEBRTC_VIDEO_CODEC_ERR_SIMULCAST_PARAMETERS_NOT_SUPPORTED -15