diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index e1cc0cfac7..191b7c0390 100644 --- a/api/video_codecs/video_encoder.cc +++ b/api/video_codecs/video_encoder.cc @@ -20,7 +20,6 @@ VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() { vp8_settings.resilience = kResilientStream; vp8_settings.numberOfTemporalLayers = 1; vp8_settings.denoisingOn = true; - vp8_settings.errorConcealmentOn = false; vp8_settings.automaticResizeOn = false; vp8_settings.frameDroppingOn = true; vp8_settings.keyFrameInterval = 3000; diff --git a/common_types.h b/common_types.h index bd23f0f0de..9545284801 100644 --- a/common_types.h +++ b/common_types.h @@ -423,13 +423,10 @@ enum VP8ResilienceMode { class TemporalLayersFactory; // VP8 specific struct VideoCodecVP8 { - // TODO(nisse): Unused, delete? - bool pictureLossIndicationOn; VideoCodecComplexity complexity; VP8ResilienceMode resilience; unsigned char numberOfTemporalLayers; bool denoisingOn; - bool errorConcealmentOn; bool automaticResizeOn; bool frameDroppingOn; int keyFrameInterval; diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc index d8fc4b6d78..7454d681df 100644 --- a/media/engine/simulcast_encoder_adapter_unittest.cc +++ b/media/engine/simulcast_encoder_adapter_unittest.cc @@ -332,14 +332,11 @@ class TestSimulcastEncoderAdapterFake : public ::testing::Test, EXPECT_EQ(ref.maxBitrate, target.maxBitrate); EXPECT_EQ(ref.minBitrate, target.minBitrate); EXPECT_EQ(ref.maxFramerate, target.maxFramerate); - EXPECT_EQ(ref.VP8().pictureLossIndicationOn, - target.VP8().pictureLossIndicationOn); EXPECT_EQ(ref.VP8().complexity, target.VP8().complexity); EXPECT_EQ(ref.VP8().resilience, target.VP8().resilience); EXPECT_EQ(ref.VP8().numberOfTemporalLayers, target.VP8().numberOfTemporalLayers); EXPECT_EQ(ref.VP8().denoisingOn, target.VP8().denoisingOn); - EXPECT_EQ(ref.VP8().errorConcealmentOn, target.VP8().errorConcealmentOn); EXPECT_EQ(ref.VP8().automaticResizeOn, target.VP8().automaticResizeOn); EXPECT_EQ(ref.VP8().frameDroppingOn, target.VP8().frameDroppingOn); EXPECT_EQ(ref.VP8().keyFrameInterval, target.VP8().keyFrameInterval); diff --git a/modules/video_coding/codecs/test/test_config.cc b/modules/video_coding/codecs/test/test_config.cc index 37a6f5c920..e85f9300e2 100644 --- a/modules/video_coding/codecs/test/test_config.cc +++ b/modules/video_coding/codecs/test/test_config.cc @@ -36,7 +36,6 @@ std::string CodecSpecificToString(const webrtc::VideoCodec& codec) { ss << "\n # temporal layers : " << static_cast(codec.VP8().numberOfTemporalLayers); ss << "\n Denoising : " << codec.VP8().denoisingOn; - ss << "\n Error concealment : " << codec.VP8().errorConcealmentOn; ss << "\n Automatic resize : " << codec.VP8().automaticResizeOn; ss << "\n Frame dropping : " << codec.VP8().frameDroppingOn; ss << "\n Key frame interval : " << codec.VP8().keyFrameInterval; @@ -74,7 +73,6 @@ void TestConfig::SetCodecSettings(VideoCodecType codec_type, size_t num_simulcast_streams, size_t num_spatial_layers, size_t num_temporal_layers, - bool error_concealment_on, bool denoising_on, bool frame_dropper_on, bool spatial_resize_on, @@ -115,7 +113,6 @@ void TestConfig::SetCodecSettings(VideoCodecType codec_type, codec_settings.VP8()->numberOfTemporalLayers = static_cast(num_temporal_layers); codec_settings.VP8()->denoisingOn = denoising_on; - codec_settings.VP8()->errorConcealmentOn = error_concealment_on; codec_settings.VP8()->automaticResizeOn = spatial_resize_on; codec_settings.VP8()->frameDroppingOn = frame_dropper_on; codec_settings.VP8()->keyFrameInterval = kBaseKeyFrameInterval; diff --git a/modules/video_coding/codecs/test/test_config.h b/modules/video_coding/codecs/test/test_config.h index 2ac7bf23e8..65ce408fc7 100644 --- a/modules/video_coding/codecs/test/test_config.h +++ b/modules/video_coding/codecs/test/test_config.h @@ -35,7 +35,6 @@ struct TestConfig { size_t num_simulcast_streams, size_t num_spatial_layers, size_t num_temporal_layers, - bool error_concealment_on, bool denoising_on, bool frame_dropper_on, bool spatial_resize_on, diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc index 848800393e..50cac8e3d7 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc @@ -70,7 +70,7 @@ class VideoProcessorIntegrationTestLibvpx #if !defined(RTC_DISABLE_VP9) TEST_F(VideoProcessorIntegrationTestLibvpx, HighBitrateVP9) { - config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, false, true, false, + config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, true, false, kResilienceOn, kCifWidth, kCifHeight); config_.num_frames = kNumFramesShort; @@ -86,7 +86,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, HighBitrateVP9) { } TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeBitrateVP9) { - config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, false, true, false, + config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, true, false, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = { @@ -107,7 +107,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeBitrateVP9) { } TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeFramerateVP9) { - config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, false, true, false, + config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, true, false, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = { @@ -130,7 +130,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeFramerateVP9) { } TEST_F(VideoProcessorIntegrationTestLibvpx, DenoiserOnVP9) { - config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, true, true, false, + config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, true, true, false, kResilienceOn, kCifWidth, kCifHeight); config_.num_frames = kNumFramesShort; @@ -146,7 +146,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, DenoiserOnVP9) { } TEST_F(VideoProcessorIntegrationTestLibvpx, VeryLowBitrateVP9) { - config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, false, true, true, + config_.SetCodecSettings(kVideoCodecVP9, 1, 1, 1, false, true, true, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = {{50, 30, kNumFramesLong}}; @@ -166,7 +166,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, VeryLowBitrateVP9) { #endif // !defined(RTC_DISABLE_VP9) TEST_F(VideoProcessorIntegrationTestLibvpx, HighBitrateVP8) { - config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, false, true, true, false, + config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, true, true, false, kResilienceOn, kCifWidth, kCifHeight); config_.num_frames = kNumFramesShort; @@ -202,7 +202,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, HighBitrateVP8) { #define MAYBE_ChangeBitrateVP8 ChangeBitrateVP8 #endif TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeBitrateVP8) { - config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, false, true, true, false, + config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, true, true, false, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = { @@ -233,7 +233,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeBitrateVP8) { #define MAYBE_ChangeFramerateVP8 ChangeFramerateVP8 #endif TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeFramerateVP8) { - config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, false, true, true, false, + config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, true, true, false, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = { @@ -270,7 +270,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeFramerateVP8) { #define MAYBE_TemporalLayersVP8 TemporalLayersVP8 #endif TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_TemporalLayersVP8) { - config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 3, false, true, true, false, + config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 3, true, true, false, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = {{200, 30, 150}, @@ -305,7 +305,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_SimulcastVP8) { config_.filename = "ConferenceMotion_1280_720_50"; config_.input_filename = ResourcePath(config_.filename, "yuv"); config_.num_frames = 100; - config_.SetCodecSettings(kVideoCodecVP8, 3, 1, 3, false, true, true, false, + config_.SetCodecSettings(kVideoCodecVP8, 3, 1, 3, true, true, false, kResilienceOn, 1280, 720); std::vector rate_profiles = {{1500, 30, config_.num_frames}}; @@ -328,7 +328,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_SvcVP9) { config_.filename = "ConferenceMotion_1280_720_50"; config_.input_filename = ResourcePath(config_.filename, "yuv"); config_.num_frames = 100; - config_.SetCodecSettings(kVideoCodecVP9, 1, 3, 3, false, true, true, false, + config_.SetCodecSettings(kVideoCodecVP9, 1, 3, 3, true, true, false, kResilienceOn, 1280, 720); std::vector rate_profiles = {{1500, 30, config_.num_frames}}; diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc index 7d8cba6ea0..3e42e9c10a 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc @@ -37,7 +37,7 @@ class VideoProcessorIntegrationTestMediaCodec TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsVp8) { config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, false, false, false, false, - false, 352, 288); + 352, 288); std::vector rate_profiles = {{500, 30, kForemanNumFrames}}; @@ -56,7 +56,7 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsVp8) { TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) { config_.encoded_frame_checker = &h264_keyframe_checker_; config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, false, false, false, - false, 352, 288); + 352, 288); std::vector rate_profiles = {{500, 30, kForemanNumFrames}}; @@ -81,7 +81,7 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec, config_.h264_codec_settings.profile = H264::kProfileConstrainedHigh; config_.encoded_frame_checker = &h264_keyframe_checker_; config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, false, false, false, - false, 352, 288); + 352, 288); std::vector rate_profiles = {{500, 30, kForemanNumFrames}}; diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc index 25f33fcc22..e77b2ac3f9 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc @@ -43,7 +43,7 @@ class VideoProcessorIntegrationTestOpenH264 }; TEST_F(VideoProcessorIntegrationTestOpenH264, ConstantHighBitrate) { - config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, false, true, false, + config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, true, false, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = {{500, 30, kNumFrames}}; @@ -63,7 +63,7 @@ TEST_F(VideoProcessorIntegrationTestOpenH264, SingleNalUnit) { config_.h264_codec_settings.packetization_mode = H264PacketizationMode::SingleNalUnit; config_.max_payload_size_bytes = 500; - config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, false, true, false, + config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, true, false, kResilienceOn, kCifWidth, kCifHeight); std::vector rate_profiles = {{500, 30, kNumFrames}}; diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc index 0dae975a80..d755090c45 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc @@ -27,7 +27,6 @@ const int kNumSpatialLayers = 1; const int kNumTemporalLayers = 1; const bool kResilienceOn = kNumSpatialLayers > 1 || kNumTemporalLayers > 1; const bool kDenoisingOn = false; -const bool kErrorConcealmentOn = false; const bool kSpatialResizeOn = false; const bool kFrameDropperOn = false; @@ -74,8 +73,8 @@ class VideoProcessorIntegrationTestParameterized config_.SetCodecSettings(codec_type_, num_simulcast_streams, num_spatial_layers, kNumTemporalLayers, - kErrorConcealmentOn, kDenoisingOn, kFrameDropperOn, - kSpatialResizeOn, kResilienceOn, width, height); + kDenoisingOn, kFrameDropperOn, kSpatialResizeOn, + kResilienceOn, width, height); std::vector rate_profiles = { {bitrate_, framerate, kNumFrames}}; diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc index ed22a3de0a..58e9233dad 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc @@ -41,7 +41,7 @@ class VideoProcessorIntegrationTestVideoToolbox TEST_F(VideoProcessorIntegrationTestVideoToolbox, DISABLED_ForemanCif500kbpsH264CBP) { config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, false, false, false, - false, 352, 288); + 352, 288); std::vector rate_profiles = {{500, 30, kForemanNumFrames}}; @@ -60,7 +60,7 @@ TEST_F(VideoProcessorIntegrationTestVideoToolbox, config_.h264_codec_settings.profile = H264::kProfileConstrainedHigh; config_.SetCodecSettings(kVideoCodecH264, 1, 1, 1, false, false, false, false, - false, 352, 288); + 352, 288); std::vector rate_profiles = {{500, 30, kForemanNumFrames}}; diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc index f5eda4dbf0..827ad90e3b 100644 --- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -52,7 +52,7 @@ class VideoProcessorTest : public testing::Test { protected: VideoProcessorTest() : q_("VP queue") { config_.SetCodecSettings(kVideoCodecVP8, 1, 1, 1, false, false, false, - false, false, kWidth, kHeight); + false, kWidth, kHeight); stats_.resize(1); diff --git a/modules/video_coding/codecs/vp8/simulcast_test_utility.h b/modules/video_coding/codecs/vp8/simulcast_test_utility.h index 00cdb0cd7b..5162f22642 100644 --- a/modules/video_coding/codecs/vp8/simulcast_test_utility.h +++ b/modules/video_coding/codecs/vp8/simulcast_test_utility.h @@ -218,7 +218,6 @@ class TestVp8Simulcast : public ::testing::Test { &settings->simulcastStream[2], temporal_layer_profile[2]); settings->VP8()->resilience = kResilientStream; settings->VP8()->denoisingOn = true; - settings->VP8()->errorConcealmentOn = false; settings->VP8()->automaticResizeOn = false; settings->VP8()->frameDroppingOn = true; settings->VP8()->keyFrameInterval = 3000;