diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/media/base/test_helpers.cc | |
parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/base/test_helpers.cc')
-rw-r--r-- | chromium/media/base/test_helpers.cc | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/chromium/media/base/test_helpers.cc b/chromium/media/base/test_helpers.cc index 01599dde247..36e6965ee62 100644 --- a/chromium/media/base/test_helpers.cc +++ b/chromium/media/base/test_helpers.cc @@ -126,6 +126,7 @@ void WaitableMessageLoopEvent::OnTimeout() { } static VideoDecoderConfig GetTestConfig(VideoCodec codec, + VideoCodecProfile config, VideoRotation rotation, gfx::Size coded_size, bool is_encrypted) { @@ -133,8 +134,8 @@ static VideoDecoderConfig GetTestConfig(VideoCodec codec, gfx::Size natural_size = coded_size; return VideoDecoderConfig( - codec, VIDEO_CODEC_PROFILE_UNKNOWN, PIXEL_FORMAT_I420, COLOR_SPACE_JPEG, - rotation, coded_size, visible_rect, natural_size, EmptyExtraData(), + codec, config, PIXEL_FORMAT_I420, COLOR_SPACE_JPEG, rotation, coded_size, + visible_rect, natural_size, EmptyExtraData(), is_encrypted ? AesCtrEncryptionScheme() : Unencrypted()); } @@ -143,38 +144,44 @@ static const gfx::Size kLargeSize(640, 480); // static VideoDecoderConfig TestVideoConfig::Invalid() { - return GetTestConfig(kUnknownVideoCodec, VIDEO_ROTATION_0, kNormalSize, - false); + return GetTestConfig(kUnknownVideoCodec, VIDEO_CODEC_PROFILE_UNKNOWN, + VIDEO_ROTATION_0, kNormalSize, false); } // static VideoDecoderConfig TestVideoConfig::Normal(VideoCodec codec) { - return GetTestConfig(codec, VIDEO_ROTATION_0, kNormalSize, false); + return GetTestConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN, VIDEO_ROTATION_0, + kNormalSize, false); } // static -VideoDecoderConfig TestVideoConfig::NormalH264() { - return GetTestConfig(kCodecH264, VIDEO_ROTATION_0, kNormalSize, false); +VideoDecoderConfig TestVideoConfig::NormalH264(VideoCodecProfile config) { + return GetTestConfig(kCodecH264, config, VIDEO_ROTATION_0, kNormalSize, + false); } // static VideoDecoderConfig TestVideoConfig::NormalEncrypted(VideoCodec codec) { - return GetTestConfig(codec, VIDEO_ROTATION_0, kNormalSize, true); + return GetTestConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN, VIDEO_ROTATION_0, + kNormalSize, true); } // static VideoDecoderConfig TestVideoConfig::NormalRotated(VideoRotation rotation) { - return GetTestConfig(kCodecVP8, rotation, kNormalSize, false); + return GetTestConfig(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, rotation, + kNormalSize, false); } // static VideoDecoderConfig TestVideoConfig::Large(VideoCodec codec) { - return GetTestConfig(codec, VIDEO_ROTATION_0, kLargeSize, false); + return GetTestConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN, VIDEO_ROTATION_0, + kLargeSize, false); } // static VideoDecoderConfig TestVideoConfig::LargeEncrypted(VideoCodec codec) { - return GetTestConfig(codec, VIDEO_ROTATION_0, kLargeSize, true); + return GetTestConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN, VIDEO_ROTATION_0, + kLargeSize, true); } // static @@ -196,7 +203,7 @@ AudioDecoderConfig TestAudioConfig::Normal() { // static AudioParameters TestAudioParameters::Normal() { return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, - CHANNEL_LAYOUT_STEREO, 48000, 16, 2048); + CHANNEL_LAYOUT_STEREO, 48000, 2048); } template <class T> |