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

Remove unused fields from VideoCodecVP8.

Browse Source 
Bug: None
Change-Id: I6f29ad5ce04582003e9be7292d04ea18f9335372
Reviewed-on: https://webrtc-review.googlesource.com/47660
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21973}
This commit is contained in:
Rasmus Brandt
2018-02-09 15:09:30 +01:00
committed by Commit Bot
parent 60bb6fe37a
commit 75e38d2dc3
12 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/video_coding/codecs/test/test_config.cc
View File

@ -36,7 +36,6 @@ std::string CodecSpecificToString(const webrtc::VideoCodec& codec) {
ss << "\n # temporal layers : "
<< static_cast<int>(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<uint8_t>(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;

1
modules/video_coding/codecs/test/test_config.h
View File

@ -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,

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

@ -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<RateProfile> 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<RateProfile> 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<RateProfile> 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<RateProfile> 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<RateProfile> 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<RateProfile> 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<RateProfile> 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<RateProfile> rate_profiles = {{1500, 30, config_.num_frames}};

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

@ -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<RateProfile> 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<RateProfile> 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<RateProfile> rate_profiles = {{500, 30, kForemanNumFrames}};

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

@ -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<RateProfile> 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<RateProfile> rate_profiles = {{500, 30, kNumFrames}};

5
modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc
View File

@ -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<RateProfile> rate_profiles = {
{bitrate_, framerate, kNumFrames}};

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

@ -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<RateProfile> 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<RateProfile> rate_profiles = {{500, 30, kForemanNumFrames}};

2
modules/video_coding/codecs/test/videoprocessor_unittest.cc
View File

@ -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);

1
modules/video_coding/codecs/vp8/simulcast_test_utility.h
View File

@ -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;