summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-20 10:19:17 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-20 10:19:17 +0100
commit5d1eb0d3aa590338930553cb7e09c43c4840ef1a (patch)
tree24d81bfbc659d826eb3eef5f3ac1cc4f3d000e50
parenta930db1c9e8444ed89754c5a79085d59c7295952 (diff)
downloadUXP-5d1eb0d3aa590338930553cb7e09c43c4840ef1a.tar
UXP-5d1eb0d3aa590338930553cb7e09c43c4840ef1a.tar.gz
UXP-5d1eb0d3aa590338930553cb7e09c43c4840ef1a.tar.lz
UXP-5d1eb0d3aa590338930553cb7e09c43c4840ef1a.tar.xz
UXP-5d1eb0d3aa590338930553cb7e09c43c4840ef1a.zip
Remove more obsolete checks in dom/media and ipc.
-rw-r--r--dom/media/fmp4/MP4Decoder.cpp8
-rw-r--r--dom/media/platforms/wmf/WMFUtils.cpp8
-rw-r--r--ipc/mscom/MainThreadRuntime.cpp7
3 files changed, 4 insertions, 19 deletions
diff --git a/dom/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp
index 4cf07ddbd..fdd6f2c7e 100644
--- a/dom/media/fmp4/MP4Decoder.cpp
+++ b/dom/media/fmp4/MP4Decoder.cpp
@@ -52,14 +52,6 @@ IsWhitelistedH264Codec(const nsAString& aCodec)
return false;
}
-#ifdef XP_WIN
- // Disable 4k video on windows vista since it performs poorly.
- if (!IsWin7OrLater() &&
- level >= H264_LEVEL_5) {
- return false;
- }
-#endif
-
// Just assume what we can play on all platforms the codecs/formats that
// WMF can play, since we don't have documentation about what other
// platforms can play... According to the WMF documentation:
diff --git a/dom/media/platforms/wmf/WMFUtils.cpp b/dom/media/platforms/wmf/WMFUtils.cpp
index 208131fef..b5747e326 100644
--- a/dom/media/platforms/wmf/WMFUtils.cpp
+++ b/dom/media/platforms/wmf/WMFUtils.cpp
@@ -210,16 +210,12 @@ MFStartup()
return hr;
}
- const int MF_VISTA_VERSION = (0x0001 << 16 | MF_API_VERSION);
- const int MF_WIN7_VERSION = (0x0002 << 16 | MF_API_VERSION);
+ const int MF_VERSION = (0x0002 << 16 | MF_API_VERSION);
// decltype is unusable for functions having default parameters
DECL_FUNCTION_PTR(MFStartup, ULONG, DWORD);
ENSURE_FUNCTION_PTR_(MFStartup, Mfplat.dll)
- if (!IsWin7OrLater())
- return MFStartupPtr(MF_VISTA_VERSION, MFSTARTUP_FULL);
- else
- return MFStartupPtr(MF_WIN7_VERSION, MFSTARTUP_FULL);
+ return MFStartupPtr(MF_VERSION, MFSTARTUP_FULL);
}
HRESULT
diff --git a/ipc/mscom/MainThreadRuntime.cpp b/ipc/mscom/MainThreadRuntime.cpp
index 8e77d2f12..a061eaf54 100644
--- a/ipc/mscom/MainThreadRuntime.cpp
+++ b/ipc/mscom/MainThreadRuntime.cpp
@@ -60,11 +60,8 @@ MainThreadRuntime::MainThreadRuntime()
return;
}
- // Windows 7 has a policy that is even more strict. We should use that one
- // whenever possible.
- ULONG_PTR exceptionSetting = IsWin7OrLater() ?
- COMGLB_EXCEPTION_DONOT_HANDLE_ANY :
- COMGLB_EXCEPTION_DONOT_HANDLE;
+ // Use the strictest policy available.
+ ULONG_PTR exceptionSetting = COMGLB_EXCEPTION_DONOT_HANDLE_ANY;
mInitResult = globalOpts->Set(COMGLB_EXCEPTION_HANDLING, exceptionSetting);
MOZ_ASSERT(SUCCEEDED(mInitResult));
}