commit be2fb41b325558e4fd8b12e85c583dab6985ee22
author Niels Möller <nisse@webrtc.org> Tue May 17 15:39:41 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 20 14:54:31 2022 +0000
tree ac8e64f1df826f43e0083d17cc6a4893293d93de
parent 2ee3e4db221d4b18529f8ad24be4c2c6466e3b11

Delete codec-specific frameDroppingOn settings.

Followup to https://webrtc-review.googlesource.com/c/src/+/262244

Bug: webrtc:6883
Change-Id: Iefac43709f14424c74470aa878ec512b7dacc68a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262258
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36949}

api/video_codecs/video_codec.cc

diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index b4bc5b7..c6122d3 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -34,14 +34,12 @@
   return (numberOfTemporalLayers == other.numberOfTemporalLayers &&
           denoisingOn == other.denoisingOn &&
           automaticResizeOn == other.automaticResizeOn &&
-          frameDroppingOn == other.frameDroppingOn &&
           keyFrameInterval == other.keyFrameInterval);
 }
 
 bool VideoCodecVP9::operator==(const VideoCodecVP9& other) const {
   return (numberOfTemporalLayers == other.numberOfTemporalLayers &&
           denoisingOn == other.denoisingOn &&
-          frameDroppingOn == other.frameDroppingOn &&
           keyFrameInterval == other.keyFrameInterval &&
           adaptiveQpMode == other.adaptiveQpMode &&
           automaticResizeOn == other.automaticResizeOn &&
@@ -50,8 +48,7 @@
 }
 
 bool VideoCodecH264::operator==(const VideoCodecH264& other) const {
-  return (frameDroppingOn == other.frameDroppingOn &&
-          keyFrameInterval == other.keyFrameInterval &&
+  return (keyFrameInterval == other.keyFrameInterval &&
           numberOfTemporalLayers == other.numberOfTemporalLayers);
 }
 
@@ -148,19 +145,7 @@
 }
 
 bool VideoCodec::GetFrameDropEnabled() const {
-  if (frame_drop_enabled_.has_value()) {
-    return *frame_drop_enabled_;
-  }
-  switch (codecType) {
-    default:
-      return false;
-    case kVideoCodecVP8:
-      return VP8().frameDroppingOn;
-    case kVideoCodecVP9:
-      return VP9().frameDroppingOn;
-    case kVideoCodecH264:
-      return H264().frameDroppingOn;
-  }
+  return frame_drop_enabled_;
 }
 
 void VideoCodec::SetFrameDropEnabled(bool enabled) {