From c2ee8e8a468ada088a01d59f9beb2b3cf3395453 Mon Sep 17 00:00:00 2001 From: Taylor Brandstetter Date: Mon, 21 May 2018 10:20:54 -0700 Subject: [PATCH] Removing references to webrtc::VideoSendStream::DegradationPreference. It was replaced be webrtc::DegradationPreference in this CL: https://webrtc-review.googlesource.com/c/src/+/77024 But some downstream code was still referencing it. Bug: webrtc:8830 Change-Id: Ibd0a3d15df7f13473c0f37a2493dd70cec6c0482 Reviewed-on: https://webrtc-review.googlesource.com/78082 Reviewed-by: Niels Moller Commit-Queue: Taylor Brandstetter Cr-Commit-Position: refs/heads/master@{#23335} --- api/rtpparameters.h | 4 ---- call/video_send_stream.h | 5 ----- 2 files changed, 9 deletions(-) diff --git a/api/rtpparameters.h b/api/rtpparameters.h index ba02fd24d6..96df9ce885 100644 --- a/api/rtpparameters.h +++ b/api/rtpparameters.h @@ -83,10 +83,6 @@ enum class DegradationPreference { MAINTAIN_RESOLUTION, // Try to strike a "pleasing" balance between frame rate or resolution. BALANCED, - // TODO(deadbeef): Remove once downstream code referencing - // "webrtc::VideoSendStream::DegradationPreference::kMaintainResolution" is - // updated. - kMaintainResolution = MAINTAIN_RESOLUTION }; extern const double kDefaultBitratePriority; diff --git a/call/video_send_stream.h b/call/video_send_stream.h index 620719efbb..848902fc2e 100644 --- a/call/video_send_stream.h +++ b/call/video_send_stream.h @@ -264,11 +264,6 @@ class VideoSendStream { // When a stream is stopped, it can't receive, process or deliver packets. virtual void Stop() = 0; - // TODO(deadbeef): Remove once downstream code referencing - // "webrtc::VideoSendStream::DegradationPreference::kMaintainResolution" is - // updated. - using DegradationPreference = webrtc::DegradationPreference; - virtual void SetSource( rtc::VideoSourceInterface* source, const DegradationPreference& degradation_preference) = 0;