diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-01-14 20:21:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 20:21:16 +0100 |
| commit | fb1d4c9712eb1898d89f90edfc6120ff169e6357 (patch) | |
| tree | 677d602abee695200146c4d51ba8db10146bc38c /dom/media/DecoderTraits.cpp | |
| parent | f38edc94a31de3bae839cf63ed57c3851908ac46 (diff) | |
| parent | 6335404642a019df481275f4f290ea76b4d8f597 (diff) | |
| download | UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.gz UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.lz UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.xz UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.zip | |
Merge pull request #929 from adeshkp/remove-telemetry-stubs
Telemetry: Remove stubs and related code
Diffstat (limited to 'dom/media/DecoderTraits.cpp')
| -rw-r--r-- | dom/media/DecoderTraits.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/dom/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp index f8cb4fd0e..6aa44f3e5 100644 --- a/dom/media/DecoderTraits.cpp +++ b/dom/media/DecoderTraits.cpp @@ -10,7 +10,6 @@ #include "nsCharSeparatedTokenizer.h" #include "nsMimeTypes.h" #include "mozilla/Preferences.h" -#include "mozilla/Telemetry.h" #include "OggDecoder.h" #include "OggDemuxer.h" @@ -85,22 +84,6 @@ DecoderTraits::IsWebMAudioType(const nsACString& aType) return aType.EqualsASCII("audio/webm"); } -static char const *const gHttpLiveStreamingTypes[] = { - // For m3u8. - // https://tools.ietf.org/html/draft-pantos-http-live-streaming-19#section-10 - "application/vnd.apple.mpegurl", - // Some sites serve these as the informal m3u type. - "application/x-mpegurl", - "audio/x-mpegurl", - nullptr -}; - -static bool -IsHttpLiveStreamingType(const nsACString& aType) -{ - return CodecListContains(gHttpLiveStreamingTypes, aType); -} - #ifdef MOZ_FMP4 static bool IsMP4SupportedType(const MediaContentType& aParsedType, @@ -247,10 +230,6 @@ CanHandleMediaType(const MediaContentType& aType, { MOZ_ASSERT(NS_IsMainThread()); - if (IsHttpLiveStreamingType(aType.GetMIMEType())) { - /* Telemetry STUB */ - } - if (aType.HaveCodecs()) { CanPlayStatus result = CanHandleCodecsType(aType, aDiagnostics); if (result == CANPLAY_NO || result == CANPLAY_YES) { |