admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing kNoVisualizationParams. Use nullptr directly.

Browse Source 
Bug: none
Change-Id: Ifcffdf37d0dc4b9caa47b1117fc14e21bffe2cd9
Reviewed-on: https://webrtc-review.googlesource.com/49942
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21965}
This commit is contained in:
Sergey Silkin 2018-02-08 22:15:48 +01:00 committed by Commit Bot
parent ecfe2e86a6
commit 597472ebc3
4 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc
View File

@ -20,7 +20,6 @@ namespace webrtc {
namespace test { namespace test {
namespace { namespace {
// Codec settings. // Codec settings.
const bool kResilienceOn = true; const bool kResilienceOn = true;
const int kCifWidth = 352; const int kCifWidth = 352;
@ -29,9 +28,6 @@ const int kCifHeight = 288;
const int kNumFramesShort = 100; const int kNumFramesShort = 100;
#endif #endif
const int kNumFramesLong = 300; const int kNumFramesLong = 300;
const std::nullptr_t kNoVisualizationParams = nullptr;
} // namespace } // namespace
class VideoProcessorIntegrationTestLibvpx class VideoProcessorIntegrationTestLibvpx
@ -86,8 +82,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, HighBitrateVP9) {
std::vector<QualityThresholds> quality_thresholds = {{37, 36, 0.94, 0.92}}; std::vector<QualityThresholds> quality_thresholds = {{37, 36, 0.94, 0.92}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeBitrateVP9) { TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeBitrateVP9) {
@ -108,8 +103,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeBitrateVP9) {
{34, 33, 0.90, 0.88}, {38, 35, 0.95, 0.91}, {35, 34, 0.93, 0.90}}; {34, 33, 0.90, 0.88}, {38, 35, 0.95, 0.91}, {35, 34, 0.93, 0.90}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeFramerateVP9) { TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeFramerateVP9) {
@ -132,8 +126,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, ChangeFramerateVP9) {
{33, 32, 0.89, 0.87}, {33.5, 32, 0.90, 0.86}, {33.5, 31.5, 0.90, 0.85}}; {33, 32, 0.89, 0.87}, {33.5, 32, 0.90, 0.86}, {33.5, 31.5, 0.90, 0.85}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
TEST_F(VideoProcessorIntegrationTestLibvpx, DenoiserOnVP9) { TEST_F(VideoProcessorIntegrationTestLibvpx, DenoiserOnVP9) {
@ -149,8 +142,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, DenoiserOnVP9) {
std::vector<QualityThresholds> quality_thresholds = {{37.5, 36, 0.94, 0.93}}; std::vector<QualityThresholds> quality_thresholds = {{37.5, 36, 0.94, 0.93}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
TEST_F(VideoProcessorIntegrationTestLibvpx, VeryLowBitrateVP9) { TEST_F(VideoProcessorIntegrationTestLibvpx, VeryLowBitrateVP9) {
@ -165,8 +157,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, VeryLowBitrateVP9) {
std::vector<QualityThresholds> quality_thresholds = {{28, 25, 0.80, 0.65}}; std::vector<QualityThresholds> quality_thresholds = {{28, 25, 0.80, 0.65}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
// TODO(marpan): Add temporal layer test for VP9, once changes are in // TODO(marpan): Add temporal layer test for VP9, once changes are in
@ -190,8 +181,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, HighBitrateVP8) {
std::vector<QualityThresholds> quality_thresholds = {{35, 33, 0.91, 0.89}}; std::vector<QualityThresholds> quality_thresholds = {{35, 33, 0.91, 0.89}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
#endif // !defined(WEBRTC_IOS) #endif // !defined(WEBRTC_IOS)
@ -233,8 +223,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeBitrateVP8) {
{31.8, 31, 0.86, 0.85}, {36, 34.8, 0.92, 0.90}, {33.5, 32, 0.90, 0.88}}; {31.8, 31, 0.86, 0.85}, {36, 34.8, 0.92, 0.90}, {33.5, 32, 0.90, 0.88}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
// Too slow to finish before timeout on iOS. See webrtc:4755. // Too slow to finish before timeout on iOS. See webrtc:4755.
@ -271,8 +260,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeFramerateVP8) {
{31, 30, 0.85, 0.84}, {31.5, 30.5, 0.86, 0.84}, {30.5, 29, 0.83, 0.78}}; {31, 30, 0.85, 0.84}, {31.5, 30.5, 0.86, 0.84}, {30.5, 29, 0.83, 0.78}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
// Too slow to finish before timeout on iOS. See webrtc:4755. // Too slow to finish before timeout on iOS. See webrtc:4755.
@ -304,8 +292,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_TemporalLayersVP8) {
{31, 28, 0.85, 0.75}}; {31, 28, 0.85, 0.75}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
// Might be too slow on mobile platforms. // Might be too slow on mobile platforms.
@ -328,8 +315,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_SimulcastVP8) {
std::vector<QualityThresholds> quality_thresholds = {{34, 32, 0.90, 0.88}}; std::vector<QualityThresholds> quality_thresholds = {{34, 32, 0.90, 0.88}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
// Might be too slow on mobile platforms. // Might be too slow on mobile platforms.
@ -352,8 +338,7 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, MAYBE_SvcVP9) {
std::vector<QualityThresholds> quality_thresholds = {{36, 34, 0.93, 0.91}}; std::vector<QualityThresholds> quality_thresholds = {{36, 34, 0.93, 0.91}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
} // namespace test } // namespace test

10
modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc
View File

@ -21,7 +21,6 @@ namespace test {
namespace { namespace {
const int kForemanNumFrames = 300; const int kForemanNumFrames = 300;
const std::nullptr_t kNoVisualizationParams = nullptr;
} // namespace } // namespace
class VideoProcessorIntegrationTestMediaCodec class VideoProcessorIntegrationTestMediaCodec
@ -51,8 +50,7 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsVp8) {
std::vector<QualityThresholds> quality_thresholds = {{36, 31, 0.92, 0.86}}; std::vector<QualityThresholds> quality_thresholds = {{36, 31, 0.92, 0.86}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) { TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) {
@ -71,8 +69,7 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) {
std::vector<QualityThresholds> quality_thresholds = {{36, 31, 0.92, 0.86}}; std::vector<QualityThresholds> quality_thresholds = {{36, 31, 0.92, 0.86}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
// TODO(brandtr): Enable this test when we have trybots/buildbots with // TODO(brandtr): Enable this test when we have trybots/buildbots with
@ -97,8 +94,7 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec,
std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}}; std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
} // namespace test } // namespace test

10
modules/video_coding/codecs/test/videoprocessor_integrationtest_openh264.cc
View File

@ -20,15 +20,11 @@ namespace test {
#if defined(WEBRTC_USE_H264) #if defined(WEBRTC_USE_H264)
namespace { namespace {
// Codec settings. // Codec settings.
const bool kResilienceOn = true; const bool kResilienceOn = true;
const int kCifWidth = 352; const int kCifWidth = 352;
const int kCifHeight = 288; const int kCifHeight = 288;
const int kNumFrames = 100; const int kNumFrames = 100;
const std::nullptr_t kNoVisualizationParams = nullptr;
} // namespace } // namespace
class VideoProcessorIntegrationTestOpenH264 class VideoProcessorIntegrationTestOpenH264
@ -58,8 +54,7 @@ TEST_F(VideoProcessorIntegrationTestOpenH264, ConstantHighBitrate) {
std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}}; std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
// H264: Enable SingleNalUnit packetization mode. Encoder should split // H264: Enable SingleNalUnit packetization mode. Encoder should split
@ -81,8 +76,7 @@ TEST_F(VideoProcessorIntegrationTestOpenH264, SingleNalUnit) {
BitstreamThresholds bs_thresholds = {config_.max_payload_size_bytes}; BitstreamThresholds bs_thresholds = {config_.max_payload_size_bytes};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, &bs_thresholds, &quality_thresholds, &bs_thresholds, nullptr);
kNoVisualizationParams);
} }
#endif // defined(WEBRTC_USE_H264) #endif // defined(WEBRTC_USE_H264)

7
modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc
View File

@ -20,7 +20,6 @@ namespace test {
namespace { namespace {
const int kForemanNumFrames = 300; const int kForemanNumFrames = 300;
const std::nullptr_t kNoVisualizationParams = nullptr;
} // namespace } // namespace
class VideoProcessorIntegrationTestVideoToolbox class VideoProcessorIntegrationTestVideoToolbox
@ -52,8 +51,7 @@ TEST_F(VideoProcessorIntegrationTestVideoToolbox,
std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}}; std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
TEST_F(VideoProcessorIntegrationTestVideoToolbox, TEST_F(VideoProcessorIntegrationTestVideoToolbox,
@ -72,8 +70,7 @@ TEST_F(VideoProcessorIntegrationTestVideoToolbox,
std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}}; std::vector<QualityThresholds> quality_thresholds = {{37, 35, 0.93, 0.91}};
ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds,
&quality_thresholds, nullptr, &quality_thresholds, nullptr, nullptr);
kNoVisualizationParams);
} }
} // namespace test } // namespace test