From e85012fb68656ef1eb544e8ef2f00d9b12c0bc35 Mon Sep 17 00:00:00 2001
From: alwu <alwu@mozilla.com>
Date: Thu, 25 Feb 2021 18:07:04 +0000
Subject: [PATCH] Bug 1691578 - part1 : rename `MediaPlatformDecoderNotFound`
 to `MediaFFMpegNotFound`. r=bryce

`MediaPlatformDecoderNotFound` sounds too general and seems indicating that this error is platform independent, but that is not true. This error is actually for not founding ffmpeg.

Differential Revision: https://phabricator.services.mozilla.com/D104471
---
 dom/media/doctor/DecoderDoctorDiagnostics.cpp | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/dom/media/doctor/DecoderDoctorDiagnostics.cpp b/dom/media/doctor/DecoderDoctorDiagnostics.cpp
index bf9c6a4c1535..b9951a2b0517 100644
--- a/dom/media/doctor/DecoderDoctorDiagnostics.cpp
+++ b/dom/media/doctor/DecoderDoctorDiagnostics.cpp
@@ -254,7 +254,7 @@ static const NotificationAndReportStringId sMediaWMFNeeded = {
     dom::DecoderDoctorNotificationType::Platform_decoder_not_found,
     "MediaWMFNeeded",
     {ReportParam::Formats}};
-static const NotificationAndReportStringId sMediaPlatformDecoderNotFound = {
+static const NotificationAndReportStringId sMediaFFMpegNotFound = {
     dom::DecoderDoctorNotificationType::Platform_decoder_not_found,
     "MediaPlatformDecoderNotFound",
     {ReportParam::Formats}};
@@ -284,15 +284,12 @@ static const NotificationAndReportStringId sMediaDecodeWarning = {
     {ReportParam::ResourceURL, ReportParam::DecodeIssue}};
 
 static const NotificationAndReportStringId* const
-    sAllNotificationsAndReportStringIds[] = {&sMediaWidevineNoWMF,
-                                             &sMediaWMFNeeded,
-                                             &sMediaPlatformDecoderNotFound,
-                                             &sMediaCannotPlayNoDecoders,
-                                             &sMediaNoDecoders,
-                                             &sCannotInitializePulseAudio,
-                                             &sUnsupportedLibavcodec,
-                                             &sMediaDecodeError,
-                                             &sMediaDecodeWarning};
+    sAllNotificationsAndReportStringIds[] = {
+        &sMediaWidevineNoWMF,    &sMediaWMFNeeded,
+        &sMediaFFMpegNotFound,   &sMediaCannotPlayNoDecoders,
+        &sMediaNoDecoders,       &sCannotInitializePulseAudio,
+        &sUnsupportedLibavcodec, &sMediaDecodeError,
+        &sMediaDecodeWarning};
 
 // Create a webcompat-friendly description of a MediaResult.
 static nsString MediaResultDescription(const MediaResult& aResult,
@@ -694,12 +691,11 @@ void DecoderDoctorDocumentWatcher::SynthesizeAnalysis() {
             DD_INFO(
                 "DecoderDoctorDocumentWatcher[%p, "
                 "doc=%p]::SynthesizeAnalysis() - unplayable formats: %s -> "
-                "Cannot play media because platform decoder was not found "
-                "(Reason: %s)",
+                "Cannot play media because ffmpeg was not found (Reason: %s)",
                 this, mDocument,
                 NS_ConvertUTF16toUTF8(formatsRequiringFFMpeg).get(),
                 FFmpegRuntimeLinker::LinkStatusString());
-            ReportAnalysis(mDocument, sMediaPlatformDecoderNotFound, false,
+            ReportAnalysis(mDocument, sMediaFFMpegNotFound, false,
                            formatsRequiringFFMpeg);
             return;
         }