mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 09:07:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete codec-specific frameDroppingOn settings.

Browse source 
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}
This commit is contained in:
Niels Möller 2022-05-17 15:39:41 +02:00 committed by WebRTC LUCI CQ
parent 2ee3e4db22
commit be2fb41b32
5 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
View file

@ -508,7 +508,7 @@ class ForcedFallbackTest : public VideoEncoderSoftwareFallbackWrapperTestBase {
codec_.height = kHeight;
codec_.VP8()->numberOfTemporalLayers = 1;
codec_.VP8()->automaticResizeOn = true;
codec_.VP8()->frameDroppingOn = true;
codec_.SetFrameDropEnabled(true);
rate_allocator_.reset(new SimulcastRateAllocator(codec_));
}

19
api/video_codecs/video_codec.cc
View file

@ -34,14 +34,12 @@ bool VideoCodecVP8::operator==(const VideoCodecVP8& other) const {
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 VideoCodecVP9::operator==(const VideoCodecVP9& other) const {
}
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 @@ void VideoCodec::SetVideoEncoderComplexity(
}
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) {

7
api/video_codecs/video_codec.h
View file

@ -47,7 +47,6 @@ struct VideoCodecVP8 {
unsigned char numberOfTemporalLayers;
bool denoisingOn;
bool automaticResizeOn;
bool frameDroppingOn;
int keyFrameInterval;
};
@ -65,7 +64,6 @@ struct VideoCodecVP9 {
}
unsigned char numberOfTemporalLayers;
bool denoisingOn;
bool frameDroppingOn;
int keyFrameInterval;
bool adaptiveQpMode;
bool automaticResizeOn;
@ -80,7 +78,6 @@ struct VideoCodecH264 {
bool operator!=(const VideoCodecH264& other) const {
return !(*this == other);
}
bool frameDroppingOn;
int keyFrameInterval;
uint8_t numberOfTemporalLayers;
};
@ -181,9 +178,7 @@ class RTC_EXPORT VideoCodec {
// 'complexity_' indicates the CPU capability of the client. It's used to
// determine encoder CPU complexity (e.g., cpu_used for VP8, VP9. and AV1).
VideoCodecComplexity complexity_;
// TODO(bugs.webrtc.org/6883): When unset, GetEnableFrameDrop checks the
// codec-specific settings.
absl::optional<bool> frame_drop_enabled_;
bool frame_drop_enabled_ = false;
};
} // namespace webrtc

3
api/video_codecs/video_encoder.cc
View file

@ -26,7 +26,6 @@ VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() {
vp8_settings.numberOfTemporalLayers = 1;
vp8_settings.denoisingOn = true;
vp8_settings.automaticResizeOn = false;
vp8_settings.frameDroppingOn = true;
vp8_settings.keyFrameInterval = 3000;
return vp8_settings;
@ -38,7 +37,6 @@ VideoCodecVP9 VideoEncoder::GetDefaultVp9Settings() {
vp9_settings.numberOfTemporalLayers = 1;
vp9_settings.denoisingOn = true;
vp9_settings.frameDroppingOn = true;
vp9_settings.keyFrameInterval = 3000;
vp9_settings.adaptiveQpMode = true;
vp9_settings.automaticResizeOn = true;
@ -53,7 +51,6 @@ VideoCodecH264 VideoEncoder::GetDefaultH264Settings() {
VideoCodecH264 h264_settings;
memset(&h264_settings, 0, sizeof(h264_settings));
h264_settings.frameDroppingOn = true;
h264_settings.keyFrameInterval = 3000;
h264_settings.numberOfTemporalLayers = 1;

2
modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
View file

@ -165,6 +165,7 @@ TEST_F(TestVp8Impl,
}
TEST_F(TestVp8Impl, SetRates) {
codec_settings_.SetFrameDropEnabled(true);
auto* const vpx = new NiceMock<MockLibvpxInterface>();
LibvpxVp8Encoder encoder((std::unique_ptr<LibvpxInterface>(vpx)),
VP8Encoder::Settings());
@ -416,6 +417,7 @@ TEST_F(TestVp8Impl, ScalingDisabledIfAutomaticResizeOff) {
}
TEST_F(TestVp8Impl, ScalingEnabledIfAutomaticResizeOn) {
codec_settings_.SetFrameDropEnabled(true);
codec_settings_.VP8()->automaticResizeOn = true;
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
encoder_->InitEncode(&codec_settings_, kSettings));