Bug 1282410 - part3 : add log.
MozReview-Commit-ID: KWf3uya31zv
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -3110,54 +3110,52 @@ nsresult HTMLMediaElement::InitializeDec
}
nsresult HTMLMediaElement::InitializeDecoderForChannel(nsIChannel* aChannel,
nsIStreamListener** aListener)
{
NS_ASSERTION(mLoadingSrc, "mLoadingSrc must already be set");
NS_ASSERTION(mDecoder == nullptr, "Shouldn't have a decoder");
- nsAutoCString mimeType;
-
- aChannel->GetContentType(mimeType);
- NS_ASSERTION(!mimeType.IsEmpty(), "We should have the Content-Type.");
+ aChannel->GetContentType(mMimeType);
+ NS_ASSERTION(!mMimeType.IsEmpty(), "We should have the Content-Type.");
DecoderDoctorDiagnostics diagnostics;
RefPtr<MediaDecoder> decoder =
- DecoderTraits::CreateDecoder(mimeType, this, &diagnostics);
+ DecoderTraits::CreateDecoder(mMimeType, this, &diagnostics);
diagnostics.StoreFormatDiagnostics(OwnerDoc(),
- NS_ConvertASCIItoUTF16(mimeType),
+ NS_ConvertASCIItoUTF16(mMimeType),
decoder != nullptr,
__func__);
if (!decoder) {
nsAutoString src;
GetCurrentSrc(src);
- NS_ConvertUTF8toUTF16 mimeUTF16(mimeType);
+ NS_ConvertUTF8toUTF16 mimeUTF16(mMimeType);
const char16_t* params[] = { mimeUTF16.get(), src.get() };
ReportLoadError("MediaLoadUnsupportedMimeType", params, ArrayLength(params));
return NS_ERROR_FAILURE;
}
- LOG(LogLevel::Debug, ("%p Created decoder %p for type %s", this, decoder.get(), mimeType.get()));
+ LOG(LogLevel::Debug, ("%p Created decoder %p for type %s", this, decoder.get(), mMimeType.get()));
RefPtr<MediaResource> resource =
MediaResource::Create(decoder->GetResourceCallback(), aChannel);
if (!resource)
return NS_ERROR_OUT_OF_MEMORY;
if (mChannelLoader) {
mChannelLoader->Done();
mChannelLoader = nullptr;
}
// We postpone the |FinishDecoderSetup| function call until we get
// |OnConnected| signal from MediaStreamController which is held by
// RtspMediaResource.
- if (DecoderTraits::DecoderWaitsForOnConnected(mimeType)) {
+ if (DecoderTraits::DecoderWaitsForOnConnected(mMimeType)) {
decoder->SetResource(resource);
SetDecoder(decoder);
if (aListener) {
*aListener = nullptr;
}
return NS_OK;
} else {
return FinishDecoderSetup(decoder, resource, aListener);
@@ -5861,16 +5859,18 @@ HTMLMediaElement::OpenUnsupportedMediaWi
return;
}
// If media doesn't start playing, we don't need to open it.
if (mPaused) {
return;
}
+ LOG(LogLevel::Debug, ("Open unsupported type \'%s\' with external apps.",
+ mMimeType.get()));
nsContentUtils::DispatchTrustedEvent(OwnerDoc(), static_cast<nsIContent*>(this),
NS_LITERAL_STRING("OpenMediaWithExtenalApp"),
true,
true);
}
static const char* VisibilityString(Visibility aVisibility) {
switch(aVisibility) {
--- a/dom/html/HTMLMediaElement.h
+++ b/dom/html/HTMLMediaElement.h
@@ -1626,14 +1626,16 @@ private:
// be seeked even before the media is loaded.
double mDefaultPlaybackStartPosition;
// True if the audio track is not silent.
bool mIsAudioTrackAudible;
// True if media element is audible for users.
bool mAudible;
+
+ nsAutoCString mMimeType;
};
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_HTMLMediaElement_h