Delete VideoCodec::targetBitrate
This member is unused by encoders.
Bug: None
Change-Id: I867013bfdb89f48782e84842de05bb57648e0b64
Reviewed-on: https://webrtc-review.googlesource.com/c/113882
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25988}diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index 0819c82..a52f398 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -66,7 +66,6 @@
startBitrate(0),
maxBitrate(0),
minBitrate(0),
- targetBitrate(0),
maxFramerate(0),
active(true),
qpMax(0),
diff --git a/api/video_codecs/video_codec.h b/api/video_codecs/video_codec.h
index 9fba60c..828bd1d 100644
--- a/api/video_codecs/video_codec.h
+++ b/api/video_codecs/video_codec.h
@@ -118,7 +118,6 @@
unsigned int startBitrate; // kilobits/sec.
unsigned int maxBitrate; // kilobits/sec.
unsigned int minBitrate; // kilobits/sec.
- unsigned int targetBitrate; // kilobits/sec.
uint32_t maxFramerate;
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 88a247e..02f40c6 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -679,7 +679,6 @@
EXPECT_EQ(codec_before.startBitrate, codec_after.startBitrate);
EXPECT_EQ(codec_before.maxBitrate, codec_after.maxBitrate);
EXPECT_EQ(codec_before.minBitrate, codec_after.minBitrate);
- EXPECT_EQ(codec_before.targetBitrate, codec_after.targetBitrate);
EXPECT_EQ(codec_before.maxFramerate, codec_after.maxFramerate);
EXPECT_EQ(codec_before.qpMax, codec_after.qpMax);
EXPECT_EQ(codec_before.numberOfSimulcastStreams,
diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 7064465..11ac5b5 100644
--- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -400,7 +400,6 @@
// Settings needed to trigger ScreenshareLayers usage, which is required for
// overshoot-drop-reencode logic.
- codec_settings_.targetBitrate = 200;
codec_settings_.maxBitrate = 1000;
codec_settings_.mode = VideoCodecMode::kScreensharing;
codec_settings_.VP8()->numberOfTemporalLayers = 2;
diff --git a/sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.mm b/sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.mm
index 6fb81db..fe7e690 100644
--- a/sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.mm
+++ b/sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.mm
@@ -25,7 +25,6 @@
self.startBitrate = videoCodec->startBitrate;
self.maxBitrate = videoCodec->maxBitrate;
self.minBitrate = videoCodec->minBitrate;
- self.targetBitrate = videoCodec->targetBitrate;
self.maxFramerate = videoCodec->maxFramerate;
self.qpMax = videoCodec->qpMax;
self.mode = (RTCVideoCodecMode)videoCodec->mode;
@@ -42,7 +41,6 @@
videoCodec.startBitrate = self.startBitrate;
videoCodec.maxBitrate = self.maxBitrate;
videoCodec.minBitrate = self.minBitrate;
- videoCodec.targetBitrate = self.targetBitrate;
videoCodec.maxBitrate = self.maxBitrate;
videoCodec.qpMax = self.qpMax;
videoCodec.mode = (webrtc::VideoCodecMode)self.mode;
diff --git a/sdk/objc/base/RTCVideoEncoderSettings.h b/sdk/objc/base/RTCVideoEncoderSettings.h
index 69e04ca..a9403f8 100644
--- a/sdk/objc/base/RTCVideoEncoderSettings.h
+++ b/sdk/objc/base/RTCVideoEncoderSettings.h
@@ -31,7 +31,6 @@
@property(nonatomic, assign) unsigned int startBitrate; // kilobits/sec.
@property(nonatomic, assign) unsigned int maxBitrate;
@property(nonatomic, assign) unsigned int minBitrate;
-@property(nonatomic, assign) unsigned int targetBitrate;
@property(nonatomic, assign) uint32_t maxFramerate;
diff --git a/sdk/objc/base/RTCVideoEncoderSettings.m b/sdk/objc/base/RTCVideoEncoderSettings.m
index 929f568..f68bc8c 100644
--- a/sdk/objc/base/RTCVideoEncoderSettings.m
+++ b/sdk/objc/base/RTCVideoEncoderSettings.m
@@ -18,7 +18,6 @@
@synthesize startBitrate = _startBitrate;
@synthesize maxBitrate = _maxBitrate;
@synthesize minBitrate = _minBitrate;
-@synthesize targetBitrate = _targetBitrate;
@synthesize maxFramerate = _maxFramerate;
@synthesize qpMax = _qpMax;
@synthesize mode = _mode;
diff --git a/test/video_codec_settings.h b/test/video_codec_settings.h
index 9ee6be2..f7ae48c 100644
--- a/test/video_codec_settings.h
+++ b/test/video_codec_settings.h
@@ -35,7 +35,6 @@
settings->startBitrate = kTestStartBitrateKbps;
settings->maxBitrate = 0;
settings->minBitrate = kTestMinBitrateKbps;
- settings->targetBitrate = 0;
settings->maxFramerate = kTestFrameRate;
