zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused |keyframe_interval| from codec tests.

Browse Source 
Bug: webrtc:10349
Change-Id: Iada8c8a1824f6e5424f503bb67b00382069b1dbd
Reviewed-on: https://webrtc-review.googlesource.com/c/124486
Reviewed-by: Mirta Dvornicic <mirtad@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26866}
This commit is contained in:
Rasmus Brandt
2019-02-26 15:12:27 +01:00
committed by Commit Bot
parent f54e30b596
commit 7b3f4a2035
4 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
View File

@ -258,7 +258,6 @@ std::string VideoCodecTestFixtureImpl::Config::ToString() const {
ss << "\nuse_single_core: " << use_single_core;
ss << "\nmeasure_cpu: " << measure_cpu;
ss << "\nnum_cores: " << NumberOfCores();
ss << "\nkeyframe_interval: " << keyframe_interval;
ss << "\ncodec_type: " << codec_type;
ss << "\n\n--> codec_settings";
ss << "\nwidth: " << codec_settings.width;

4
modules/video_coding/codecs/test/videocodec_test_libvpx.cc
View File

@ -291,8 +291,8 @@ TEST(VideoCodecTestLibvpx, MAYBE_ChangeFramerateVP8) {
{10, 2, 10, 1, 0.3, 0.2, 0, 0}};
#else
std::vector<RateControlThresholds> rc_thresholds = {
{10, 2, 20, 1, 0.3, 0.1, 0, 1},
{5, 2, 5, 1, 0.3, 0.1, 0, 0},
{10, 2, 20, 1, 0.3, 0.15, 0, 1},
{5, 2, 5, 1, 0.3, 0.15, 0, 0},
{4, 2, 1, 1, 0.3, 0.2, 0, 0}};
#endif

13
modules/video_coding/codecs/test/videoprocessor.cc
View File

@ -157,16 +157,6 @@ void CalculateFrameQuality(const I420BufferInterface& ref_buffer,
}
}
std::vector<FrameType> FrameTypeForFrame(
const VideoCodecTestFixture::Config& config,
size_t frame_idx) {
if (config.keyframe_interval > 0 &&
(frame_idx % config.keyframe_interval == 0)) {
return {kVideoFrameKey};
}
return {kVideoFrameDelta};
}
} // namespace
VideoProcessor::VideoProcessor(webrtc::VideoEncoder* encoder,
@ -296,7 +286,8 @@ void VideoProcessor::ProcessFrame() {
// Encode.
const std::vector<FrameType> frame_types =
FrameTypeForFrame(config_, frame_number);
(frame_number == 0) ? std::vector<FrameType>{kVideoFrameKey}
: std::vector<FrameType>{kVideoFrameDelta};
const int encode_return_code =
encoder_->Encode(input_frame, nullptr, &frame_types);
for (size_t i = 0; i < num_simulcast_or_spatial_layers_; ++i) {