Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 19:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1388125 - FileMediaResource should use BlobImpl->Size() instead of stream::Available() to know the size, r=jya

Browse Source
This commit is contained in:
Andrea Marchesini 2017-09-18 13:31:00 +02:00
parent b56fe1327b
commit 052284c159
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dom/media/MediaResource.cpp
View File

@ -24,6 +24,7 @@
#include "nsIRequestObserver.h"
#include "nsIStreamListener.h"
#include "nsIScriptSecurityManager.h"
#include "mozilla/dom/BlobImpl.h"
#include "mozilla/dom/HTMLMediaElement.h"
#include "nsError.h"
#include "nsICachingChannel.h"
@ -1048,11 +1049,12 @@ class FileMediaResource : public BaseMediaResource
public:
FileMediaResource(MediaResourceCallback* aCallback,
nsIChannel* aChannel,
nsIURI* aURI)
nsIURI* aURI,
int64_t aSize = -1 /* unknown size */)
: BaseMediaResource(aCallback, aChannel, aURI)
, mSize(-1)
, mSize(aSize)
, mLock("FileMediaResource.mLock")
, mSizeInitialized(false)
, mSizeInitialized(aSize != -1)
{
}
~FileMediaResource()
@ -1381,33 +1383,47 @@ BaseMediaResource::Create(MediaResourceCallback* aCallback,
return nullptr;
}
RefPtr<BaseMediaResource> resource;
// 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);
RefPtr<BaseMediaResource> resource =
new FileMediaResource(aCallback, aChannel, uri);
return resource.forget();
}
// 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
// been created in the current process.
RefPtr<mozilla::dom::BlobImpl> blobImpl;
if (IsBlobURI(uri) &&
NS_SUCCEEDED(NS_GetBlobForBlobURI(uri, getter_AddRefs(blobImpl))) &&
blobImpl) {
IgnoredErrorResult rv;
if (!resource) {
nsCOMPtr<nsIInputStream> stream;
nsCOMPtr<nsISeekableStream> seekableStream;
if (IsBlobURI(uri) &&
NS_SUCCEEDED(NS_GetStreamForBlobURI(uri, getter_AddRefs(stream))) &&
(seekableStream = do_QueryInterface(stream))) {
resource = new FileMediaResource(aCallback, aChannel, uri);
blobImpl->GetInternalStream(getter_AddRefs(stream), rv);
if (NS_WARN_IF(rv.Failed())) {
return nullptr;
}
// It's better to read the size from the blob instead of using ::Available,
// because, if the stream implements nsIAsyncInputStream interface,
// ::Available will not return the size of the stream, but what can be
// currently read.
uint64_t size = blobImpl->GetSize(rv);
if (NS_WARN_IF(rv.Failed())) {
return nullptr;
}
// If the URL is a blob URL, with a seekable inputStream, we can still use
// a FileMediaResource.
nsCOMPtr<nsISeekableStream> seekableStream = do_QueryInterface(stream);
if (seekableStream) {
RefPtr<BaseMediaResource> resource =
new FileMediaResource(aCallback, aChannel, uri, size);
return resource.forget();
}
}
if (!resource) {
resource =
RefPtr<BaseMediaResource> resource =
new ChannelMediaResource(aCallback, aChannel, uri, aIsPrivateBrowsing);
}
return resource.forget();
}