mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 16:55:40 +00:00
Bug 1302656: P1. Don't detach mediasource when error occurs. r=jwwang
MozReview-Commit-ID: 88EIb4XXcdR --HG-- extra : rebase_source : 93c309462b1669351d7a526d78be5a35c00d6341
This commit is contained in:
parent
b59dab94ce
commit
99ffe3f3e7
@ -1025,6 +1025,9 @@ void HTMLMediaElement::AbortExistingLoads()
|
||||
|
||||
void HTMLMediaElement::NoSupportedMediaSourceError(const nsACString& aErrorDetails)
|
||||
{
|
||||
if (mDecoder) {
|
||||
ShutdownDecoder();
|
||||
}
|
||||
mError = new MediaError(this, MEDIA_ERR_SRC_NOT_SUPPORTED, aErrorDetails);
|
||||
ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_NO_SOURCE);
|
||||
DispatchAsyncEvent(NS_LITERAL_STRING("error"));
|
||||
@ -4374,9 +4377,6 @@ void HTMLMediaElement::FirstFrameLoaded()
|
||||
|
||||
void HTMLMediaElement::NetworkError()
|
||||
{
|
||||
if (mDecoder) {
|
||||
ShutdownDecoder();
|
||||
}
|
||||
if (mReadyState == nsIDOMHTMLMediaElement::HAVE_NOTHING) {
|
||||
NoSupportedMediaSourceError();
|
||||
} else {
|
||||
@ -4391,9 +4391,6 @@ void HTMLMediaElement::DecodeError(const MediaResult& aError)
|
||||
const char16_t* params[] = { src.get() };
|
||||
ReportLoadError("MediaLoadDecodeError", params, ArrayLength(params));
|
||||
|
||||
if (mDecoder) {
|
||||
ShutdownDecoder();
|
||||
}
|
||||
AudioTracks()->EmptyTracks();
|
||||
VideoTracks()->EmptyTracks();
|
||||
if (mIsLoadingFromSourceChildren) {
|
||||
|
@ -1026,7 +1026,6 @@ MediaDecoder::NetworkError()
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
MOZ_ASSERT(!IsShutdown());
|
||||
mOwner->NetworkError();
|
||||
MOZ_ASSERT(IsShutdown());
|
||||
}
|
||||
|
||||
void
|
||||
@ -1035,7 +1034,6 @@ MediaDecoder::DecodeError(const MediaResult& aError)
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
MOZ_ASSERT(!IsShutdown());
|
||||
mOwner->DecodeError(aError);
|
||||
MOZ_ASSERT(IsShutdown());
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user