Delete enum VP8ResilienceMode.
We only support on (formely kResilientStream) and off (formely
kResilienceOff). The third mode, kResilientFrames, was not
implemented.
Bug: None
Change-Id: Ida82f6a33eda9d943ea70bc8ae4e6bddb720b0e8
Reviewed-on: https://webrtc-review.googlesource.com/71481
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22984}diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index 056a4cb..1abee76 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -17,7 +17,7 @@
VideoCodecVP8 vp8_settings;
memset(&vp8_settings, 0, sizeof(vp8_settings));
- vp8_settings.resilience = kResilientStream;
+ vp8_settings.resilienceOn = true;
vp8_settings.numberOfTemporalLayers = 1;
vp8_settings.denoisingOn = true;
vp8_settings.automaticResizeOn = false;
diff --git a/common_types.cc b/common_types.cc
index 641c2c7..5e0dc93 100644
--- a/common_types.cc
+++ b/common_types.cc
@@ -23,7 +23,7 @@
bool VideoCodecVP8::operator==(const VideoCodecVP8& other) const {
return (complexity == other.complexity &&
- resilience == other.resilience &&
+ resilienceOn == other.resilienceOn &&
numberOfTemporalLayers == other.numberOfTemporalLayers &&
denoisingOn == other.denoisingOn &&
automaticResizeOn == other.automaticResizeOn &&
diff --git a/common_types.h b/common_types.h
index ae47811..140854c 100644
--- a/common_types.h
+++ b/common_types.h
@@ -349,17 +349,6 @@
kComplexityMax = 3
};
-enum VP8ResilienceMode {
- kResilienceOff, // The stream produced by the encoder requires a
- // recovery frame (typically a key frame) to be
- // decodable after a packet loss.
- kResilientStream, // A stream produced by the encoder is resilient to
- // packet losses, but packets within a frame subsequent
- // to a loss can't be decoded.
- kResilientFrames // Same as kResilientStream but with added resilience
- // within a frame.
-};
-
// VP8 specific
struct VideoCodecVP8 {
bool operator==(const VideoCodecVP8& other) const;
@@ -367,7 +356,7 @@
return !(*this == other);
}
VideoCodecComplexity complexity;
- VP8ResilienceMode resilience;
+ bool resilienceOn;
unsigned char numberOfTemporalLayers;
bool denoisingOn;
bool automaticResizeOn;
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index d2acd94..b3a6bd4 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -330,7 +330,7 @@
EXPECT_EQ(ref.minBitrate, target.minBitrate);
EXPECT_EQ(ref.maxFramerate, target.maxFramerate);
EXPECT_EQ(ref.VP8().complexity, target.VP8().complexity);
- EXPECT_EQ(ref.VP8().resilience, target.VP8().resilience);
+ EXPECT_EQ(ref.VP8().resilienceOn, target.VP8().resilienceOn);
EXPECT_EQ(ref.VP8().numberOfTemporalLayers,
target.VP8().numberOfTemporalLayers);
EXPECT_EQ(ref.VP8().denoisingOn, target.VP8().denoisingOn);
diff --git a/modules/video_coding/codecs/test/test_config.cc b/modules/video_coding/codecs/test/test_config.cc
index 70a88dc..727a009 100644
--- a/modules/video_coding/codecs/test/test_config.cc
+++ b/modules/video_coding/codecs/test/test_config.cc
@@ -68,7 +68,7 @@
switch (codec.codecType) {
case kVideoCodecVP8:
ss << "complexity: " << codec.VP8().complexity;
- ss << "\nresilience: " << codec.VP8().resilience;
+ ss << "\nresilience: " << codec.VP8().resilienceOn;
ss << "\nnum_temporal_layers: "
<< static_cast<int>(codec.VP8().numberOfTemporalLayers);
ss << "\ndenoising: " << codec.VP8().denoisingOn;
@@ -143,8 +143,7 @@
switch (codec_settings.codecType) {
case kVideoCodecVP8:
- codec_settings.VP8()->resilience =
- resilience_on ? kResilientStream : kResilienceOff;
+ codec_settings.VP8()->resilienceOn = resilience_on;
codec_settings.VP8()->numberOfTemporalLayers =
static_cast<uint8_t>(num_temporal_layers);
codec_settings.VP8()->denoisingOn = denoising_on;
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index 9eeb4b8..b1cecf0 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -441,16 +441,8 @@
configurations_[0].g_lag_in_frames = 0; // 0- no frame lagging
// Set the error resilience mode according to user settings.
- switch (inst->VP8().resilience) {
- case kResilienceOff:
- configurations_[0].g_error_resilient = 0;
- break;
- case kResilientStream:
- configurations_[0].g_error_resilient = VPX_ERROR_RESILIENT_DEFAULT;
- break;
- case kResilientFrames:
- return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; // Not supported
- }
+ configurations_[0].g_error_resilient =
+ inst->VP8().resilienceOn ? VPX_ERROR_RESILIENT_DEFAULT : 0;
// rate control settings
configurations_[0].rc_dropframe_thresh = inst->VP8().frameDroppingOn ? 30 : 0;
@@ -675,7 +667,7 @@
vpx_codec_control(&(encoders_[i]), VP8E_SET_SCREEN_CONTENT_MODE,
codec_.mode == kScreensharing ? 2 : 0);
// Apply boost on golden frames (has only effect when resilience is off).
- if (use_gf_boost_ && codec_.VP8()->resilience == kResilienceOff) {
+ if (use_gf_boost_ && !codec_.VP8()->resilienceOn) {
int gf_boost_percent;
if (GetGfBoostPercentageFromFieldTrialGroup(&gf_boost_percent)) {
vpx_codec_control(&(encoders_[i]), VP8E_SET_GF_CBR_BOOST_PCT,
diff --git a/modules/video_coding/codecs/vp8/simulcast_test_utility.h b/modules/video_coding/codecs/vp8/simulcast_test_utility.h
index 01d4aeb..59d8226 100644
--- a/modules/video_coding/codecs/vp8/simulcast_test_utility.h
+++ b/modules/video_coding/codecs/vp8/simulcast_test_utility.h
@@ -214,7 +214,7 @@
ConfigureStream(kDefaultWidth, kDefaultHeight, kMaxBitrates[2],
kMinBitrates[2], kTargetBitrates[2],
&settings->simulcastStream[2], temporal_layer_profile[2]);
- settings->VP8()->resilience = kResilientStream;
+ settings->VP8()->resilienceOn = true;
settings->VP8()->denoisingOn = true;
settings->VP8()->automaticResizeOn = false;
settings->VP8()->frameDroppingOn = true;
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index a0ec33f..57bce50 100644
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@@ -186,7 +186,7 @@
if (nack_enabled && video_codec.VP8()->numberOfTemporalLayers == 1) {
RTC_LOG(LS_INFO)
<< "No temporal layers and nack enabled -> resilience off";
- video_codec.VP8()->resilience = kResilienceOff;
+ video_codec.VP8()->resilienceOn = false;
}
break;
}
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index 4b39223..85d4118 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -853,7 +853,7 @@
EXPECT_EQ(kNumStreams, fake_encoder_.codec_config().numberOfSimulcastStreams);
EXPECT_EQ(kNumTl, fake_encoder_.codec_config().VP8()->numberOfTemporalLayers);
// Resilience is off for no temporal layers with nack on.
- EXPECT_EQ(kResilienceOff, fake_encoder_.codec_config().VP8()->resilience);
+ EXPECT_FALSE(fake_encoder_.codec_config().VP8()->resilienceOn);
video_stream_encoder_->Stop();
}
@@ -873,7 +873,7 @@
EXPECT_EQ(kNumStreams, fake_encoder_.codec_config().numberOfSimulcastStreams);
EXPECT_EQ(kNumTl, fake_encoder_.codec_config().VP8()->numberOfTemporalLayers);
// Resilience is off for no temporal layers and >1 streams with nack on.
- EXPECT_EQ(kResilienceOff, fake_encoder_.codec_config().VP8()->resilience);
+ EXPECT_FALSE(fake_encoder_.codec_config().VP8()->resilienceOn);
video_stream_encoder_->Stop();
}
@@ -893,7 +893,7 @@
EXPECT_EQ(kNumStreams, fake_encoder_.codec_config().numberOfSimulcastStreams);
EXPECT_EQ(kNumTl, fake_encoder_.codec_config().VP8()->numberOfTemporalLayers);
// Resilience is on for no temporal layers with nack off.
- EXPECT_EQ(kResilientStream, fake_encoder_.codec_config().VP8()->resilience);
+ EXPECT_TRUE(fake_encoder_.codec_config().VP8()->resilienceOn);
video_stream_encoder_->Stop();
}
@@ -913,7 +913,7 @@
EXPECT_EQ(kNumStreams, fake_encoder_.codec_config().numberOfSimulcastStreams);
EXPECT_EQ(kNumTl, fake_encoder_.codec_config().VP8()->numberOfTemporalLayers);
// Resilience is on for temporal layers.
- EXPECT_EQ(kResilientStream, fake_encoder_.codec_config().VP8()->resilience);
+ EXPECT_TRUE(fake_encoder_.codec_config().VP8()->resilienceOn);
video_stream_encoder_->Stop();
}
