zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused video coding error codes.

Browse Source 
Bug: webrtc:8064
Change-Id: I0fb714acc1bd86e230139eb929137a10710652ba
Reviewed-on: https://webrtc-review.googlesource.com/c/113000
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25887}
This commit is contained in:
Niels Möller
2018-12-04 11:01:26 +01:00
committed by Commit Bot
parent ebb677773a
commit 9cccf85314
4 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/video_codecs/video_encoder.h
View File

@ -178,7 +178,6 @@ class RTC_EXPORT VideoEncoder {
// <0 - Errors: // <0 - Errors:
// WEBRTC_VIDEO_CODEC_ERR_PARAMETER // WEBRTC_VIDEO_CODEC_ERR_PARAMETER
// WEBRTC_VIDEO_CODEC_ERR_SIZE // WEBRTC_VIDEO_CODEC_ERR_SIZE
// WEBRTC_VIDEO_CODEC_LEVEL_EXCEEDED
// WEBRTC_VIDEO_CODEC_MEMORY // WEBRTC_VIDEO_CODEC_MEMORY
// WEBRTC_VIDEO_CODEC_ERROR // WEBRTC_VIDEO_CODEC_ERROR
virtual int32_t InitEncode(const VideoCodec* codec_settings, virtual int32_t InitEncode(const VideoCodec* codec_settings,
@ -210,7 +209,6 @@ class RTC_EXPORT VideoEncoder {
// WEBRTC_VIDEO_CODEC_ERR_PARAMETER // WEBRTC_VIDEO_CODEC_ERR_PARAMETER
// WEBRTC_VIDEO_CODEC_MEMORY // WEBRTC_VIDEO_CODEC_MEMORY
// WEBRTC_VIDEO_CODEC_ERROR // WEBRTC_VIDEO_CODEC_ERROR
// WEBRTC_VIDEO_CODEC_TIMEOUT
virtual int32_t Encode(const VideoFrame& frame, virtual int32_t Encode(const VideoFrame& frame,
const CodecSpecificInfo* codec_specific_info, const CodecSpecificInfo* codec_specific_info,
const std::vector<FrameType>* frame_types) = 0; const std::vector<FrameType>* frame_types) = 0;

3
modules/video_coding/generic_decoder.cc
View File

@ -238,8 +238,7 @@ int32_t VCMGenericDecoder::Decode(const VCMEncodedFrame& frame, int64_t nowMs) {
<< frame.Timestamp() << ", error code: " << ret; << frame.Timestamp() << ", error code: " << ret;
_callback->Pop(frame.Timestamp()); _callback->Pop(frame.Timestamp());
return ret; return ret;
} else if (ret == WEBRTC_VIDEO_CODEC_NO_OUTPUT || } else if (ret == WEBRTC_VIDEO_CODEC_NO_OUTPUT) {
ret == WEBRTC_VIDEO_CODEC_REQUEST_SLI) {
// No output // No output
_callback->Pop(frame.Timestamp()); _callback->Pop(frame.Timestamp());
} }

5
modules/video_coding/include/video_coding_defines.h
View File

@ -27,17 +27,12 @@ namespace webrtc {
#define VCM_MISSING_CALLBACK 1 #define VCM_MISSING_CALLBACK 1
#define VCM_OK 0 #define VCM_OK 0
#define VCM_GENERAL_ERROR -1 #define VCM_GENERAL_ERROR -1
#define VCM_LEVEL_EXCEEDED -2
#define VCM_MEMORY -3
#define VCM_PARAMETER_ERROR -4 #define VCM_PARAMETER_ERROR -4
#define VCM_UNKNOWN_PAYLOAD -5
#define VCM_CODEC_ERROR -6 #define VCM_CODEC_ERROR -6
#define VCM_UNINITIALIZED -7 #define VCM_UNINITIALIZED -7
#define VCM_NO_CODEC_REGISTERED -8 #define VCM_NO_CODEC_REGISTERED -8
#define VCM_JITTER_BUFFER_ERROR -9 #define VCM_JITTER_BUFFER_ERROR -9
#define VCM_OLD_PACKET_ERROR -10 #define VCM_OLD_PACKET_ERROR -10
#define VCM_NO_FRAME_DECODED -11
#define VCM_NOT_IMPLEMENTED -20
enum { enum {
// Timing frames settings. Timing frames are sent every // Timing frames settings. Timing frames are sent every

4
modules/video_coding/include/video_error_codes.h
View File

@ -16,17 +16,13 @@
// Define return values // Define return values
#define WEBRTC_VIDEO_CODEC_OK_REQUEST_KEYFRAME 4 #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_NO_OUTPUT 1
#define WEBRTC_VIDEO_CODEC_OK 0 #define WEBRTC_VIDEO_CODEC_OK 0
#define WEBRTC_VIDEO_CODEC_ERROR -1 #define WEBRTC_VIDEO_CODEC_ERROR -1
#define WEBRTC_VIDEO_CODEC_LEVEL_EXCEEDED -2
#define WEBRTC_VIDEO_CODEC_MEMORY -3 #define WEBRTC_VIDEO_CODEC_MEMORY -3
#define WEBRTC_VIDEO_CODEC_ERR_PARAMETER -4 #define WEBRTC_VIDEO_CODEC_ERR_PARAMETER -4
#define WEBRTC_VIDEO_CODEC_ERR_SIZE -5 #define WEBRTC_VIDEO_CODEC_ERR_SIZE -5
#define WEBRTC_VIDEO_CODEC_TIMEOUT -6
#define WEBRTC_VIDEO_CODEC_UNINITIALIZED -7 #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_FALLBACK_SOFTWARE -13
#define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14 #define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14
#define WEBRTC_VIDEO_CODEC_ERR_SIMULCAST_PARAMETERS_NOT_SUPPORTED -15 #define WEBRTC_VIDEO_CODEC_ERR_SIMULCAST_PARAMETERS_NOT_SUPPORTED -15