Bug 1305670 - Fix typo from SetA/VFormatNotSupport to SetA/V NotSupported
MozReview-Commit-ID: 7kw8JPPlGcT
--- a/dom/media/DecoderDoctorDiagnostics.h
+++ b/dom/media/DecoderDoctorDiagnostics.h
@@ -65,18 +65,18 @@ public:
bool DidWMFFailToLoad() const { return mWMFFailedToLoad; }
void SetFFmpegFailedToLoad() { mFFmpegFailedToLoad = true; }
bool DidFFmpegFailToLoad() const { return mFFmpegFailedToLoad; }
void SetGMPPDMFailedToStartup() { mGMPPDMFailedToStartup = true; }
bool DidGMPPDMFailToStartup() const { return mGMPPDMFailedToStartup; }
- void SetVideoFormatNotSupport() { mVideoNotSupported = true; }
- void SetAudioFormatNotSupport() { mAudioNotSupported = true; }
+ void SetVideoNotSupported() { mVideoNotSupported = true; }
+ void SetAudioNotSupported() { mAudioNotSupported = true; }
void SetGMP(const nsACString& aGMP) { mGMP = aGMP; }
const nsACString& GMP() const { return mGMP; }
const nsAString& KeySystem() const { return mKeySystem; }
bool IsKeySystemSupported() const { return mIsKeySystemSupported; }
enum KeySystemIssue {
eUnset,
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -233,19 +233,19 @@ PDMFactory::CreateDecoderWithPDM(Platfor
const TrackInfo& config = aParams.mConfig;
supportChecker.AddMediaFormatChecker(config);
auto reason = supportChecker.Check();
if (reason != SupportChecker::Result::kSupported) {
DecoderDoctorDiagnostics* diagnostics = aParams.mDiagnostics;
if (diagnostics) {
if (reason == SupportChecker::Result::kVideoFormatNotSupported) {
- diagnostics->SetVideoFormatNotSupport();
+ diagnostics->SetVideoNotSupported();
} else if (reason == SupportChecker::Result::kAudioFormatNotSupported) {
- diagnostics->SetAudioFormatNotSupport();
+ diagnostics->SetAudioNotSupported();
}
}
return nullptr;
}
if (config.IsAudio()) {
m = aPDM->CreateAudioDecoder(aParams);
return m.forget();
--- a/dom/media/platforms/wrappers/H264Converter.cpp
+++ b/dom/media/platforms/wrappers/H264Converter.cpp
@@ -173,17 +173,17 @@ H264Converter::CreateDecoder(DecoderDoct
mp4_demuxer::SPSData spsdata;
if (mp4_demuxer::H264::DecodeSPSFromExtraData(mCurrentConfig.mExtraData, spsdata)) {
// Do some format check here.
// WMF H.264 Video Decoder and Apple ATDecoder do not support YUV444 format.
if (spsdata.chroma_format_idc == 3 /*YUV444*/) {
mLastError = NS_ERROR_FAILURE;
if (aDiagnostics) {
- aDiagnostics->SetVideoFormatNotSupport();
+ aDiagnostics->SetVideoNotSupported();
}
return NS_ERROR_FAILURE;
}
} else {
// SPS was invalid.
mLastError = NS_ERROR_FAILURE;
return NS_ERROR_FAILURE;
}