Commit 83da2bae authored by Chunbo Hua's avatar Chunbo Hua Committed by Commit Bot

Remove the media switch of MediaFoundationH264Encoding.

The existing media foundation encoding path has been enabled by
default for a long time. Remove the old switch in preparation for
a new one which controls usage of the asynchronous MFT.

Bug: 982799
Change-Id: I9456029bf38f5af3710b93d693876f20e69d2768
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2135313Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756363}
parent 23ef0fc8
...@@ -191,6 +191,7 @@ Chris Tserng <tserng@amazon.com> ...@@ -191,6 +191,7 @@ Chris Tserng <tserng@amazon.com>
Chris Vasselli <clindsay@gmail.com> Chris Vasselli <clindsay@gmail.com>
Christophe Dumez <ch.dumez@samsung.com> Christophe Dumez <ch.dumez@samsung.com>
Christopher Dale <chrelad@gmail.com> Christopher Dale <chrelad@gmail.com>
Chunbo Hua <chunbo.hua@intel.com>
Claudio DeSouza <claudiomdsjr@gmail.com> Claudio DeSouza <claudiomdsjr@gmail.com>
Clemens Fruhwirth <clemens@endorphin.org> Clemens Fruhwirth <clemens@endorphin.org>
Clement Scheelfeldt Skau <clementskau@gmail.com> Clement Scheelfeldt Skau <clementskau@gmail.com>
......
...@@ -565,10 +565,6 @@ const base::Feature kUsePooledSharedImageVideoProvider{ ...@@ -565,10 +565,6 @@ const base::Feature kUsePooledSharedImageVideoProvider{
const base::Feature kDelayCopyNV12Textures{"DelayCopyNV12Textures", const base::Feature kDelayCopyNV12Textures{"DelayCopyNV12Textures",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
// Enables H264 HW encode acceleration using Media Foundation for Windows.
const base::Feature kMediaFoundationH264Encoding{
"MediaFoundationH264Encoding", base::FEATURE_ENABLED_BY_DEFAULT};
// Enables MediaFoundation based video capture // Enables MediaFoundation based video capture
const base::Feature kMediaFoundationVideoCapture{ const base::Feature kMediaFoundationVideoCapture{
"MediaFoundationVideoCapture", base::FEATURE_ENABLED_BY_DEFAULT}; "MediaFoundationVideoCapture", base::FEATURE_ENABLED_BY_DEFAULT};
......
...@@ -195,7 +195,6 @@ MEDIA_EXPORT extern const base::Feature kUsePooledSharedImageVideoProvider; ...@@ -195,7 +195,6 @@ MEDIA_EXPORT extern const base::Feature kUsePooledSharedImageVideoProvider;
#if defined(OS_WIN) #if defined(OS_WIN)
MEDIA_EXPORT extern const base::Feature kDelayCopyNV12Textures; MEDIA_EXPORT extern const base::Feature kDelayCopyNV12Textures;
MEDIA_EXPORT extern const base::Feature kMediaFoundationH264Encoding;
MEDIA_EXPORT extern const base::Feature kMediaFoundationVideoCapture; MEDIA_EXPORT extern const base::Feature kMediaFoundationVideoCapture;
MEDIA_EXPORT extern const base::Feature kMediaFoundationVP8Decoding; MEDIA_EXPORT extern const base::Feature kMediaFoundationVP8Decoding;
MEDIA_EXPORT extern const base::Feature kDirectShowGetPhotoState; MEDIA_EXPORT extern const base::Feature kDirectShowGetPhotoState;
......
...@@ -100,11 +100,9 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions( ...@@ -100,11 +100,9 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions(
vea_factory_functions.push_back(base::BindRepeating(&CreateVTVEA)); vea_factory_functions.push_back(base::BindRepeating(&CreateVTVEA));
#endif #endif
#if defined(OS_WIN) #if defined(OS_WIN)
if (base::FeatureList::IsEnabled(kMediaFoundationH264Encoding)) { vea_factory_functions.push_back(base::BindRepeating(
vea_factory_functions.push_back(base::BindRepeating( &CreateMediaFoundationVEA,
&CreateMediaFoundationVEA, gpu_preferences.enable_media_foundation_vea_on_windows7));
gpu_preferences.enable_media_foundation_vea_on_windows7));
}
#endif #endif
return vea_factory_functions; return vea_factory_functions;
} }
......
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