From 1d8307d706e06ba1c9bba1573f300e7bf79fefa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 11 Dec 2018 13:13:36 +0100 Subject: [PATCH] Delete VideoCodec::targetBitrate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This member is unused by encoders. Bug: None Change-Id: I867013bfdb89f48782e84842de05bb57648e0b64 Reviewed-on: https://webrtc-review.googlesource.com/c/113882 Reviewed-by: Rasmus Brandt Reviewed-by: Kári Helgason Reviewed-by: Sebastian Jansson Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#25988} --- api/video_codecs/video_codec.cc | 1 - api/video_codecs/video_codec.h | 1 - media/engine/simulcast_encoder_adapter_unittest.cc | 1 - modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc | 1 - sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.mm | 2 -- sdk/objc/base/RTCVideoEncoderSettings.h | 1 - sdk/objc/base/RTCVideoEncoderSettings.m | 1 - test/video_codec_settings.h | 1 - 8 files changed, 9 deletions(-) diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc index 0819c822a0..a52f3981ae 100644 --- a/api/video_codecs/video_codec.cc +++ b/api/video_codecs/video_codec.cc @@ -66,7 +66,6 @@ VideoCodec::VideoCodec() 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 9fba60c4e8..828bd1d94a 100644 --- a/api/video_codecs/video_codec.h +++ b/api/video_codecs/video_codec.h @@ -118,7 +118,6 @@ class RTC_EXPORT VideoCodec { 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 88a247e5e5..02f40c65ca 100644 --- a/media/engine/simulcast_encoder_adapter_unittest.cc +++ b/media/engine/simulcast_encoder_adapter_unittest.cc @@ -679,7 +679,6 @@ TEST_F(TestSimulcastEncoderAdapterFake, ReinitDoesNotReorderEncoderSettings) { 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 7064465fdf..11ac5b543f 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 @@ TEST_F(TestVp8Impl, KeepsTimestampOnReencode) { // 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 6fb81dbb8a..fe7e690517 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 69e04cac70..a9403f8dec 100644 --- a/sdk/objc/base/RTCVideoEncoderSettings.h +++ b/sdk/objc/base/RTCVideoEncoderSettings.h @@ -31,7 +31,6 @@ RTC_OBJC_EXPORT @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 929f568dbd..f68bc8cb56 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 9ee6be222c..f7ae48cf05 100644 --- a/test/video_codec_settings.h +++ b/test/video_codec_settings.h @@ -35,7 +35,6 @@ static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) { settings->startBitrate = kTestStartBitrateKbps; settings->maxBitrate = 0; settings->minBitrate = kTestMinBitrateKbps; - settings->targetBitrate = 0; settings->maxFramerate = kTestFrameRate;