diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2018-12-03 02:29:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 02:29:32 +0100 |
| commit | b07aad35366437cb2e07d9e75c6baf42b4ae17a4 (patch) | |
| tree | 90274aa575339feb7aa32d3826928d10447a160c | |
| parent | f7430355ed99227bd4bfe7544bdf9fbb7134918a (diff) | |
| parent | b78915e46c137cbba048f8e8deac4a8e3282a515 (diff) | |
| download | UXP-b07aad35366437cb2e07d9e75c6baf42b4ae17a4.tar UXP-b07aad35366437cb2e07d9e75c6baf42b4ae17a4.tar.gz UXP-b07aad35366437cb2e07d9e75c6baf42b4ae17a4.tar.lz UXP-b07aad35366437cb2e07d9e75c6baf42b4ae17a4.tar.xz UXP-b07aad35366437cb2e07d9e75c6baf42b4ae17a4.zip | |
Merge pull request #897 from trav90/telemetry-cleanup
Remove MediaTelemetryConstants
| -rw-r--r-- | dom/media/platforms/MediaTelemetryConstants.h | 22 | ||||
| -rw-r--r-- | dom/media/platforms/moz.build | 1 | ||||
| -rw-r--r-- | dom/media/platforms/wmf/DXVA2Manager.cpp | 1 | ||||
| -rw-r--r-- | dom/media/platforms/wmf/WMFVideoMFTManager.cpp | 1 |
4 files changed, 0 insertions, 25 deletions
diff --git a/dom/media/platforms/MediaTelemetryConstants.h b/dom/media/platforms/MediaTelemetryConstants.h deleted file mode 100644 index 5024949a8..000000000 --- a/dom/media/platforms/MediaTelemetryConstants.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef dom_media_platforms_MediaTelemetryConstants_h___ -#define dom_media_platforms_MediaTelemetryConstants_h___ - -namespace mozilla { -namespace media { - -enum class MediaDecoderBackend : uint32_t -{ - WMFSoftware = 0, - WMFDXVA2D3D9 = 1, - WMFDXVA2D3D11 = 2 -}; - -} // namespace media -} // namespace mozilla - -#endif // dom_media_platforms_MediaTelemetryConstants_h___ diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build index be13d31c4..f5fb72c5d 100644 --- a/dom/media/platforms/moz.build +++ b/dom/media/platforms/moz.build @@ -10,7 +10,6 @@ EXPORTS += [ 'agnostic/TheoraDecoder.h', 'agnostic/VorbisDecoder.h', 'agnostic/VPXDecoder.h', - 'MediaTelemetryConstants.h', 'PDMFactory.h', 'PlatformDecoderModule.h', 'wrappers/FuzzingWrapper.h', diff --git a/dom/media/platforms/wmf/DXVA2Manager.cpp b/dom/media/platforms/wmf/DXVA2Manager.cpp index 1226ea621..69e002f7f 100644 --- a/dom/media/platforms/wmf/DXVA2Manager.cpp +++ b/dom/media/platforms/wmf/DXVA2Manager.cpp @@ -14,7 +14,6 @@ #include "mozilla/layers/D3D11ShareHandleImage.h" #include "mozilla/layers/ImageBridgeChild.h" #include "mozilla/layers/TextureForwarder.h" -#include "MediaTelemetryConstants.h" #include "mfapi.h" #include "gfxPrefs.h" #include "MFTDecoder.h" diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp index 8a51f817a..a7633a7de 100644 --- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp @@ -27,7 +27,6 @@ #include "mozilla/WindowsVersion.h" #include "mozilla/Telemetry.h" #include "nsPrintfCString.h" -#include "MediaTelemetryConstants.h" #include "GMPUtils.h" // For SplitAt. TODO: Move SplitAt to a central place. #include "MP4Decoder.h" #include "VPXDecoder.h" |