diff options
| author | scottmg <scottmg@chromium.org> | 2015-05-26 15:14:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-26 22:15:03 +0000 |
| commit | 13c59839d6142eb81308bdda8d8da25b05137a28 (patch) | |
| tree | 1244730dc9c11e2ce1b1ed52c954cb1a34dfe68a /media/media.gyp | |
| parent | a0fc8a5980aa61007951f700a0ae8ab91fda89f3 (diff) | |
| download | chromium_src-13c59839d6142eb81308bdda8d8da25b05137a28.zip chromium_src-13c59839d6142eb81308bdda8d8da25b05137a28.tar.gz chromium_src-13c59839d6142eb81308bdda8d8da25b05137a28.tar.bz2 | |
Revert of Extract re-usable InitializeMediaFoundation() (patchset #3 id:40001 of https://codereview.chromium.org/1149203002/)
Reason for revert:
Broke compile on the Win GN bots: http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/2154
Original issue's description:
> Extract re-usable InitializeMediaFoundation()
>
> Allow media::InitializeMediaFoundation() to be used by any Media
> Foundation client code. This benefits existing Chromium code as well as any
> Chromium-based browser that adds its own code calling out to Media Foundation.
>
> There are two side effects for DXVAVideoDecodeAccelerator:
>
> - MFStartup() and MFShutdown() are now called once during the lifetime of the
> GPU process rather than per each accelerator instance.
>
> - MFStartup() is now called with the MFSTARTUP_LITE flag, which according to
> MSDN doesn't initialize the sockets library.
>
> TEST=media_unittests
>
> Committed: https://crrev.com/c0ab75a86447bc23d45ff7086b2375e2cd83c205
> Cr-Commit-Position: refs/heads/master@{#331446}
TBR=sandersd@chromium.org,wdzierzanowski@opera.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1154273002
Cr-Commit-Position: refs/heads/master@{#331448}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/media.gyp b/media/media.gyp index 0a772b7..f0ebe41 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -404,8 +404,6 @@ 'base/video_util.h', 'base/wall_clock_time_source.cc', 'base/wall_clock_time_source.h', - 'base/win/mf_initializer.cc', - 'base/win/mf_initializer.h', 'base/yuv_convert.cc', 'base/yuv_convert.h', 'blink/skcanvas_video_renderer.cc', |