From c9fcedbab732fe6b1b9dcfac37350f7d8b8b48c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 14 Feb 2018 14:00:22 +0100 Subject: [PATCH] Delete unused deprecated headers under modules/video_coding/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently left over since 2015 refactorings, see cl https://codereview.webrtc.org/1417283007 Bug: webrtc:5095 Change-Id: I899f2c018d1906b4336b2e80b511f7398bac4947 Reviewed-on: https://webrtc-review.googlesource.com/53200 Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#22055} --- modules/video_coding/BUILD.gn | 3 - .../mock/mock_video_codec_interface.h | 81 ------------------- .../codecs/interface/video_codec_interface.h | 19 ----- .../codecs/interface/video_error_codes.h | 35 -------- 4 files changed, 138 deletions(-) delete mode 100644 modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h delete mode 100644 modules/video_coding/codecs/interface/video_codec_interface.h delete mode 100644 modules/video_coding/codecs/interface/video_error_codes.h diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 6dd7305efb..9d87d098a3 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -151,7 +151,6 @@ rtc_source_set("video_codec_interface") { rtc_source_set("mock_headers") { testonly = true sources = [ - "codecs/interface/mock/mock_video_codec_interface.h", "include/mock/mock_video_codec_interface.h", ] deps = [ @@ -175,8 +174,6 @@ rtc_source_set("codec_globals_headers") { rtc_source_set("video_coding_utility") { visibility = [ "*" ] sources = [ - "codecs/interface/video_codec_interface.h", - "codecs/interface/video_error_codes.h", "utility/default_video_bitrate_allocator.cc", "utility/default_video_bitrate_allocator.h", "utility/frame_dropper.cc", diff --git a/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h deleted file mode 100644 index 5f5880ac66..0000000000 --- a/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ -#define MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ - -#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; " - "use video_coding/include") -#include -#include - -#include "modules/video_coding/include/video_codec_interface.h" -#include "test/gmock.h" -#include "typedefs.h" // NOLINT(build/include) - -namespace webrtc { - -class MockEncodedImageCallback : public EncodedImageCallback { - public: - MOCK_METHOD3(Encoded, - int32_t(const EncodedImage& encodedImage, - const CodecSpecificInfo* codecSpecificInfo, - const RTPFragmentationHeader* fragmentation)); -}; - -class MockVideoEncoder : public VideoEncoder { - public: - MOCK_CONST_METHOD2(Version, int32_t(int8_t* version, int32_t length)); - MOCK_METHOD3(InitEncode, - int32_t(const VideoCodec* codecSettings, - int32_t numberOfCores, - size_t maxPayloadSize)); - MOCK_METHOD3(Encode, - int32_t(const VideoFrame& inputImage, - const CodecSpecificInfo* codecSpecificInfo, - const std::vector* frame_types)); - MOCK_METHOD1(RegisterEncodeCompleteCallback, - int32_t(EncodedImageCallback* callback)); - MOCK_METHOD0(Release, int32_t()); - MOCK_METHOD0(Reset, int32_t()); - MOCK_METHOD2(SetChannelParameters, int32_t(uint32_t packetLoss, int64_t rtt)); - MOCK_METHOD2(SetRates, int32_t(uint32_t newBitRate, uint32_t frameRate)); - MOCK_METHOD1(SetPeriodicKeyFrames, int32_t(bool enable)); -}; - -class MockDecodedImageCallback : public DecodedImageCallback { - public: - MOCK_METHOD1(Decoded, int32_t(const VideoFrame& decodedImage)); - MOCK_METHOD2(Decoded, - int32_t(const VideoFrame& decodedImage, int64_t decode_time_ms)); - MOCK_METHOD1(ReceivedDecodedReferenceFrame, - int32_t(const uint64_t pictureId)); - MOCK_METHOD1(ReceivedDecodedFrame, int32_t(const uint64_t pictureId)); -}; - -class MockVideoDecoder : public VideoDecoder { - public: - MOCK_METHOD2(InitDecode, - int32_t(const VideoCodec* codecSettings, int32_t numberOfCores)); - MOCK_METHOD5(Decode, - int32_t(const EncodedImage& inputImage, - bool missingFrames, - const RTPFragmentationHeader* fragmentation, - const CodecSpecificInfo* codecSpecificInfo, - int64_t renderTimeMs)); - MOCK_METHOD1(RegisterDecodeCompleteCallback, - int32_t(DecodedImageCallback* callback)); - MOCK_METHOD0(Release, int32_t()); - MOCK_METHOD0(Copy, VideoDecoder*()); -}; - -} // namespace webrtc - -#endif // MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ diff --git a/modules/video_coding/codecs/interface/video_codec_interface.h b/modules/video_coding/codecs/interface/video_codec_interface.h deleted file mode 100644 index 682fde6962..0000000000 --- a/modules/video_coding/codecs/interface/video_codec_interface.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ -#define MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ - -#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; " - "use video_coding/include") - -#include "modules/video_coding/include/video_codec_interface.h" - -#endif // MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H_ diff --git a/modules/video_coding/codecs/interface/video_error_codes.h b/modules/video_coding/codecs/interface/video_error_codes.h deleted file mode 100644 index 582d3091a5..0000000000 --- a/modules/video_coding/codecs/interface/video_error_codes.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ -#define MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_ - -#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; " - "use video_coding/include") - -// NOTE: in sync with video_coding_module_defines.h - -// Define return values - -#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 - -#endif // MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H_