Bug 1377370. P3 - remove HLS related code from MediaResource.cpp.
MozReview-Commit-ID: FnZEMNDjjmE
--- a/dom/media/MediaResource.cpp
+++ b/dom/media/MediaResource.cpp
@@ -28,20 +28,16 @@
#include "nsICachingChannel.h"
#include "nsIAsyncVerifyRedirectCallback.h"
#include "nsContentUtils.h"
#include "nsHostObjectProtocolHandler.h"
#include <algorithm>
#include "nsProxyRelease.h"
#include "nsIContentPolicy.h"
-#ifdef MOZ_ANDROID_HLS_SUPPORT
-#include "HLSResource.h"
-#endif
-
using mozilla::media::TimeUnit;
#undef LOG
#undef ILOG
mozilla::LazyLogModule gMediaResourceLog("MediaResource");
// Debug logging macro with object pointer and class name.
#define LOG(msg, ...) MOZ_LOG(gMediaResourceLog, mozilla::LogLevel::Debug, \
@@ -1434,23 +1430,16 @@ MediaResource::Create(MediaResourceCallb
aChannel->GetContentType(contentTypeString);
Maybe<MediaContainerType> containerType = MakeMediaContainerType(contentTypeString);
if (!containerType) {
return nullptr;
}
RefPtr<MediaResource> resource;
-#ifdef MOZ_ANDROID_HLS_SUPPORT
- if (DecoderTraits::IsHttpLiveStreamingType(containerType.value())) {
- resource = new HLSResource(aCallback, aChannel, uri);
- return resource.forget();
- }
-#endif
-
// Let's try to create a FileMediaResource in case the channel is a nsIFile
nsCOMPtr<nsIFileChannel> fc = do_QueryInterface(aChannel);
if (fc) {
resource = new FileMediaResource(aCallback, aChannel, uri);
}
// If the URL is blobURL with a seekable inputStream, we can still use a
// FileMediaResource. This basically means that the blobURL and its Blob have