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

Remove H264 CHP field trial code.

Browse Source 
Bug: webrtc:8317
Change-Id: I2da3cc6578dd8ff6e88052bc33cd38cb92af46dc
Reviewed-on: https://webrtc-review.googlesource.com/73242
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23077}
This commit is contained in:
Kári Tristan Helgason
2018-05-02 10:29:12 +02:00
committed by Commit Bot
parent 5613879b7b
commit cad94449dd
7 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/video_coding/BUILD.gn
View File

@ -716,7 +716,6 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers",
"../../test:field_trial",
"../../test:fileutils",
"../../test:test_support",
"../../test:video_test_common",

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

@ -16,7 +16,6 @@
#include "common_types.h" // NOLINT(build/include)
#include "media/base/mediaconstants.h"
#include "test/field_trial.h"
#include "test/testsupport/fileutils.h"
namespace webrtc {
@ -82,8 +81,6 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) {
// HW encoders that support CHP.
TEST_F(VideoProcessorIntegrationTestMediaCodec,
DISABLED_ForemanCif500kbpsH264CHP) {
ScopedFieldTrials override_field_trials("WebRTC-H264HighProfile/Enabled/");
config_.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
config_.encoded_frame_checker = &h264_keyframe_checker_;
config_.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false,

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

@ -14,7 +14,6 @@
#include "media/base/mediaconstants.h"
#include "modules/video_coding/codecs/test/objc_codec_factory_helper.h"
#include "test/field_trial.h"
#include "test/testsupport/fileutils.h"
namespace webrtc {
@ -82,8 +81,6 @@ MAYBE_TEST_F(VideoProcessorIntegrationTestVideoToolbox,
MAYBE_TEST_F(VideoProcessorIntegrationTestVideoToolbox,
ForemanCif500kbpsH264CHP) {
ScopedFieldTrials override_field_trials("WebRTC-H264HighProfile/Enabled/");
config_.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
config_.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false,
false, 352, 288);