summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-11-19 11:48:28 +0100
committerGitHub <noreply@github.com>2018-11-19 11:48:28 +0100
commit181e7572833e26696bd477fa34b6da2c2af7ca6f (patch)
tree6a48a7ccf7c6b92940afda9fc9f0cb1f9668ded5
parenta5bdec9a680e926d8b9e828fe748fb50a57ed914 (diff)
parent011ec4885e7fdef229309d966c7fa0b98bcdfed8 (diff)
downloadUXP-181e7572833e26696bd477fa34b6da2c2af7ca6f.tar
UXP-181e7572833e26696bd477fa34b6da2c2af7ca6f.tar.gz
UXP-181e7572833e26696bd477fa34b6da2c2af7ca6f.tar.lz
UXP-181e7572833e26696bd477fa34b6da2c2af7ca6f.tar.xz
UXP-181e7572833e26696bd477fa34b6da2c2af7ca6f.zip
Merge pull request #877 from trav90/code-cleanup
Cleanup some comments in our media code.
-rw-r--r--dom/media/directshow/DirectShowReader.h2
-rw-r--r--dom/media/gmp/GMPParent.cpp3
-rw-r--r--dom/media/mediasource/MediaSource.cpp2
-rw-r--r--dom/media/platforms/wmf/WMFDecoderModule.h6
4 files changed, 4 insertions, 9 deletions
diff --git a/dom/media/directshow/DirectShowReader.h b/dom/media/directshow/DirectShowReader.h
index e1326d416..881b27c28 100644
--- a/dom/media/directshow/DirectShowReader.h
+++ b/dom/media/directshow/DirectShowReader.h
@@ -14,7 +14,7 @@
#include "MP3FrameParser.h"
// Add the graph to the Running Object Table so that we can connect
-// to this graph with GraphEdit/GraphStudio. Note: on Vista and up you must
+// to this graph with GraphEdit/GraphStudio. Note: you must
// also regsvr32 proppage.dll from the Windows SDK.
// See: http://msdn.microsoft.com/en-us/library/ms787252(VS.85).aspx
// #define DIRECTSHOW_REGISTER_GRAPH
diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
index 40c3e5141..418f14736 100644
--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
@@ -516,8 +516,7 @@ GMPCapability::Supports(const nsTArray<GMPCapability>& aCapabilities,
#ifdef XP_WIN
// Clearkey on Windows advertises that it can decode in its GMP info
// file, but uses Windows Media Foundation to decode. That's not present
- // on Windows XP, and on some Vista, Windows N, and KN variants without
- // certain services packs.
+ // on Windows N and KN variants without certain services packs.
if (tag.Equals(kEMEKeySystemClearkey)) {
if (capabilities.mAPIName.EqualsLiteral(GMP_API_VIDEO_DECODER)) {
if (!WMFDecoderModule::HasH264()) {
diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp
index af541bbbb..152c0085a 100644
--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -62,8 +62,6 @@ namespace mozilla {
// Returns true if we should enable MSE webm regardless of preferences.
// 1. If MP4/H264 isn't supported:
-// * Windows XP
-// * Windows Vista and Server 2008 without the optional "Platform Update Supplement"
// * N/KN editions (Europe and Korea) of Windows 7/8/8.1/10 without the
// optional "Windows Media Feature Pack"
// 2. If H264 hardware acceleration is not available.
diff --git a/dom/media/platforms/wmf/WMFDecoderModule.h b/dom/media/platforms/wmf/WMFDecoderModule.h
index cd7b8c660..6582f8056 100644
--- a/dom/media/platforms/wmf/WMFDecoderModule.h
+++ b/dom/media/platforms/wmf/WMFDecoderModule.h
@@ -40,10 +40,8 @@ public:
static int GetNumDecoderThreads();
// Accessors that report whether we have the required MFTs available
- // on the system to play various codecs. Windows Vista doesn't have the
- // H.264/AAC decoders if the "Platform Update Supplement for Windows Vista"
- // is not installed, and Window N and KN variants also require a "Media
- // Feature Pack" to be installed. Windows XP doesn't have WMF.
+ // on the system to play various codecs. Windows N and KN variants
+ // require a "Media Feature Pack" to be installed.
static bool HasAAC();
static bool HasH264();