Commit 019e5c1d authored by Henrik Boström's avatar Henrik Boström Committed by Commit Bot

[macOS] Speculatively re-enable InCaptureConvertToNv12 with 5 buffers.

This is part of investigating https://crbug.com/1148964.
It may or may not cause Canary crashes again. We are monitoring crashes.

TBR=handellm@google.com

Bug: chromium:1148964
Change-Id: I5e778cd024f126811319ba750cb46adbdf3ce090
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2550206Reviewed-by: default avatarHenrik Boström <hbos@chromium.org>
Commit-Queue: Henrik Boström <hbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829278}
parent bd76c64e
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
namespace media { namespace media {
const base::Feature kInCaptureConvertToNv12{"InCaptureConvertToNv12", const base::Feature kInCaptureConvertToNv12{"InCaptureConvertToNv12",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kInCaptureConvertToNv12WithPixelTransfer{ const base::Feature kInCaptureConvertToNv12WithPixelTransfer{
"InCaptureConvertToNv12WithPixelTransfer", "InCaptureConvertToNv12WithPixelTransfer",
...@@ -27,7 +27,7 @@ const base::Feature kInCaptureConvertToNv12WithLibyuv{ ...@@ -27,7 +27,7 @@ const base::Feature kInCaptureConvertToNv12WithLibyuv{
namespace { namespace {
constexpr size_t kDefaultBufferPoolSize = 10; constexpr size_t kDefaultBufferPoolSize = 5;
// NV12 a.k.a. 420v // NV12 a.k.a. 420v
constexpr OSType kPixelFormatNv12 = constexpr OSType kPixelFormatNv12 =
......
...@@ -408,8 +408,8 @@ INSTANTIATE_TEST_SUITE_P(SampleBufferTransformerTest, ...@@ -408,8 +408,8 @@ INSTANTIATE_TEST_SUITE_P(SampleBufferTransformerTest,
TestParametersOSTypeToString); TestParametersOSTypeToString);
TEST(SampleBufferTransformerAutoReconfigureTest, TEST(SampleBufferTransformerAutoReconfigureTest,
AutoReconfigureIsDisabledByDefault) { AutoReconfigureIsEnabledByDefault) {
EXPECT_FALSE(SampleBufferTransformer::CreateIfAutoReconfigureEnabled()); EXPECT_TRUE(SampleBufferTransformer::CreateIfAutoReconfigureEnabled());
} }
TEST(SampleBufferTransformerAutoReconfigureTest, TEST(SampleBufferTransformerAutoReconfigureTest,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment