From 3a79a9a2907fee81a874766d8e0f708782b1f2de Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Fri, 1 Jun 2018 13:06:06 +0200 Subject: [PATCH] Remove deprecated API methods in video pipeline Bug: none Change-Id: I3c3d493f9e14a93868c86fa94ef7269126bd9877 Reviewed-on: https://webrtc-review.googlesource.com/80482 Reviewed-by: Karl Wiberg Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#23514} --- api/video/video_timing.cc | 2 +- api/video/video_timing.h | 3 --- api/video_codecs/video_encoder.h | 3 --- video/receive_statistics_proxy.cc | 6 ------ video/receive_statistics_proxy.h | 4 ---- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/api/video/video_timing.cc b/api/video/video_timing.cc index 3ed9501f7d..1f46692960 100644 --- a/api/video/video_timing.cc +++ b/api/video/video_timing.cc @@ -28,7 +28,7 @@ TimingFrameInfo::TimingFrameInfo() decode_start_ms(-1), decode_finish_ms(-1), render_time_ms(-1), - flags(TimingFrameFlags::kDefault) {} + flags(TimingFrameFlags::kNotTriggered) {} int64_t TimingFrameInfo::EndToEndDelay() const { return capture_time_ms >= 0 ? decode_finish_ms - capture_time_ms : -1; diff --git a/api/video/video_timing.h b/api/video/video_timing.h index ab8cd99136..e11366d906 100644 --- a/api/video/video_timing.h +++ b/api/video/video_timing.h @@ -24,9 +24,6 @@ namespace webrtc { enum TimingFrameFlags : uint8_t { kNotTriggered = 0, // Timing info valid, but not to be transmitted. // Used on send-side only. - // TODO(ilnik): Delete compatibility alias. - // Used to be sent over the wire, for the old protocol. - kDefault = 0, // Old name, for API compatibility. kTriggeredByTimer = 1 << 0, // Frame marked for tracing by periodic timer. kTriggeredBySize = 1 << 1, // Frame marked for tracing due to size. kInvalid = std::numeric_limits::max() // Invalid, ignore! diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h index 9f75e5c690..4036712b82 100644 --- a/api/video_codecs/video_encoder.h +++ b/api/video_codecs/video_encoder.h @@ -71,9 +71,6 @@ class EncodedImageCallback { const CodecSpecificInfo* codec_specific_info, const RTPFragmentationHeader* fragmentation) = 0; - // Deprecated. TODO(ilnik): Remove this in few weeks. - virtual void OnDroppedFrame() {} - virtual void OnDroppedFrame(DropReason reason) {} }; diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc index 2fd5d9be72..0f92f6aca7 100644 --- a/video/receive_statistics_proxy.cc +++ b/video/receive_statistics_proxy.cc @@ -684,12 +684,6 @@ void ReceiveStatisticsProxy::DataCountersUpdated( total_byte_tracker_.AddSamples(total_bytes - last_total_bytes); } -// Deprecated. TODO(ilnik): remove once all depending projects are updated. -void ReceiveStatisticsProxy::OnDecodedFrame(rtc::Optional qp, - VideoContentType content_type) { - OnDecodedFrame(qp, 0, 0, content_type); -} - void ReceiveStatisticsProxy::OnDecodedFrame(rtc::Optional qp, int width, int height, diff --git a/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h index 72fd2b2b21..7d399be45e 100644 --- a/video/receive_statistics_proxy.h +++ b/video/receive_statistics_proxy.h @@ -52,10 +52,6 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback, VideoReceiveStream::Stats GetStats() const; - // Deprecated. TODO(ilnik): remove once all depending projects are updated. - RTC_DEPRECATED void OnDecodedFrame(rtc::Optional qp, - VideoContentType content_type); - void OnDecodedFrame(rtc::Optional qp, int width, int height,