From 529cfc9d4a31875828a9ae284d1129d1dcb2c740 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Thu, 8 Feb 2024 16:30:56 +0000 Subject: [PATCH] Backed out 3 changesets (bug 1873394) for causing bug 1879250. CLOSED TREE Backed out changeset b355f33d28c9 (bug 1873394) Backed out changeset 6711b73d58e1 (bug 1873394) Backed out changeset 44fdf4e83c7c (bug 1873394) UltraBlame original commit: 43f065b8fdeb618362374f49b893df0709008416 --- dom/html/HTMLMediaElement.cpp | 54 -- dom/html/HTMLMediaElement.h | 36 -- dom/media/ExternalEngineStateMachine.cpp | 432 --------------- dom/media/ExternalEngineStateMachine.h | 23 - dom/media/MediaDecoder.cpp | 258 --------- dom/media/VideoUtils.cpp | 189 ------- dom/media/VideoUtils.h | 12 - dom/media/eme/EMEUtils.cpp | 32 -- dom/media/eme/EMEUtils.h | 18 - dom/media/platforms/wmf/metrics.yaml | 572 -------------------- dom/media/utils/TelemetryProbesReporter.cpp | 533 ++++++------------ dom/media/utils/TelemetryProbesReporter.h | 30 - ipc/glue/UtilityProcessHost.cpp | 67 --- ipc/glue/UtilityProcessHost.h | 11 - toolkit/components/glean/metrics_index.py | 14 - toolkit/components/telemetry/Events.yaml | 293 ---------- 16 files changed, 156 insertions(+), 2418 deletions(-) delete mode 100644 dom/media/platforms/wmf/metrics.yaml diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index d6022bd3bc4ff..eba0c376b1ef4 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -43413,41 +43413,6 @@ mMediaKeys = mIncomingMediaKeys ; -# -ifdef -MOZ_WMF_CDM -if -( -mMediaKeys -& -& -mMediaKeys -- -> -GetCDMProxy -( -) -) -{ -mIsUsingWMFCDM -= -! -! -mMediaKeys -- -> -GetCDMProxy -( -) -- -> -AsWMFCDMProxy -( -) -; -} -# -endif / / 5 @@ -48661,25 +48626,6 @@ aOldDoc ) ; } -# -ifdef -MOZ_WMF_CDM -bool -HTMLMediaElement -: -: -IsUsingWMFCDM -( -) -const -{ -return -mIsUsingWMFCDM -; -} -; -# -endif } / / diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h index fb3c6509c4d52..1301ac787d9af 100644 --- a/dom/html/HTMLMediaElement.h +++ b/dom/html/HTMLMediaElement.h @@ -3513,18 +3513,6 @@ return mIsEncrypted ; } -# -ifdef -MOZ_WMF_CDM -bool -IsUsingWMFCDM -( -) -const -override -; -# -endif bool Paused ( @@ -12751,30 +12739,6 @@ aType ) const ; -# -ifdef -MOZ_WMF_CDM -/ -/ -It -' -s -used -to -record -telemetry -probe -for -WMFCDM -playback -. -bool -mIsUsingWMFCDM -= -false -; -# -endif } ; / diff --git a/dom/media/ExternalEngineStateMachine.cpp b/dom/media/ExternalEngineStateMachine.cpp index a54d8b1e386d7..04584512723ef 100644 --- a/dom/media/ExternalEngineStateMachine.cpp +++ b/dom/media/ExternalEngineStateMachine.cpp @@ -148,28 +148,10 @@ h # include " -mozilla -/ -glean -/ -GleanMetrics -. -h -" -# -include -" nsThreadUtils . h " -# -include -" -VideoUtils -. -h -" namespace mozilla { @@ -1774,11 +1756,6 @@ with media engine . -ReportTelemetry -( -NS_ERROR_DOM_MEDIA_FATAL_ERR -) -; DecodeError ( MediaResult @@ -1969,23 +1946,6 @@ state machine again . -Not -a -real -" -error -" -because -it -would -/ -/ -fallback -to -another -state -machine -. DecodeError ( MediaResult @@ -2007,23 +1967,6 @@ support encrypted playback . -Not -a -real -" -error -" -because -it -would -/ -/ -fallback -to -another -state -machine -. if ( ! @@ -2425,11 +2368,6 @@ Complete ( ) ; -ReportTelemetry -( -aError -) -; DecodeError ( aError @@ -3398,13 +3336,6 @@ RejectIfExists __func__ ) ; -ReportTelemetry -( -aReject -. -mError -) -; DecodeError ( aReject @@ -5820,11 +5751,6 @@ break ; default : -ReportTelemetry -( -aError -) -; DecodeError ( aError @@ -6308,11 +6234,6 @@ break ; default : -ReportTelemetry -( -aError -) -; DecodeError ( aError @@ -7353,11 +7274,6 @@ state machine again . -ReportTelemetry -( -NS_ERROR_DOM_MEDIA_EXTERNAL_ENGINE_NOT_SUPPORTED_ERR -) -; DecodeError ( MediaResult @@ -7376,11 +7292,6 @@ aError NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_MF_CDM_ERR ) { -ReportTelemetry -( -NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_MF_CDM_ERR -) -; RecoverFromCDMProcessCrashIfNeeded ( ) @@ -7388,11 +7299,6 @@ RecoverFromCDMProcessCrashIfNeeded } else { -ReportTelemetry -( -aError -) -; DecodeError ( aError @@ -7933,18 +7839,6 @@ engine after crash . -mKeySystem -= -NS_ConvertUTF16toUTF8 -( -aProxy -- -> -KeySystem -( -) -) -; LOG ( " @@ -7952,21 +7846,8 @@ SetCDMProxy = % p -( -key -- -system -= -% -s -) " aProxy -mKeySystem -. -get -( -) ) ; MOZ_DIAGNOSTIC_ASSERT @@ -8121,319 +8002,6 @@ false # endif } -void -ExternalEngineStateMachine -: -: -ReportTelemetry -( -const -MediaResult -& -aError -) -{ -glean -: -: -mfcdm -: -: -ErrorExtra -extraData -; -extraData -. -errorName -= -Some -( -aError -. -ErrorName -( -) -) -; -nsAutoCString -resolution -; -if -( -mInfo -) -{ -if -( -mInfo -- -> -HasAudio -( -) -) -{ -extraData -. -audioCodec -= -Some -( -mInfo -- -> -mAudio -. -mMimeType -) -; -} -if -( -mInfo -- -> -HasVideo -( -) -) -{ -extraData -. -videoCodec -= -Some -( -mInfo -- -> -mVideo -. -mMimeType -) -; -DetermineResolutionForTelemetry -( -* -mInfo -resolution -) -; -extraData -. -resolution -= -Some -( -resolution -) -; -} -} -if -( -! -mKeySystem -. -IsEmpty -( -) -) -{ -extraData -. -keySystem -= -Some -( -mKeySystem -) -; -} -glean -: -: -mfcdm -: -: -error -. -Record -( -Some -( -extraData -) -) -; -if -( -MOZ_LOG_TEST -( -gMediaDecoderLog -LogLevel -: -: -Debug -) -) -{ -nsPrintfCString -logMessage -{ -" -MFCDM -Error -event -error -= -% -s -" -aError -. -ErrorName -( -) -. -get -( -) -} -; -if -( -mInfo -) -{ -if -( -mInfo -- -> -HasAudio -( -) -) -{ -logMessage -. -Append -( -nsPrintfCString -{ -" -audio -= -% -s -" -mInfo -- -> -mAudio -. -mMimeType -. -get -( -) -} -) -; -} -if -( -mInfo -- -> -HasVideo -( -) -) -{ -logMessage -. -Append -( -nsPrintfCString -{ -" -video -= -% -s -resolution -= -% -s -" -mInfo -- -> -mVideo -. -mMimeType -. -get -( -) -resolution -. -get -( -) -} -) -; -} -} -if -( -! -mKeySystem -. -IsEmpty -( -) -) -{ -logMessage -. -Append -( -nsPrintfCString -{ -" -keySystem -= -% -s -" -mKeySystem -. -get -( -) -} -) -; -} -LOG -( -" -% -s -" -logMessage -. -get -( -) -) -; -} -} # undef FMT diff --git a/dom/media/ExternalEngineStateMachine.h b/dom/media/ExternalEngineStateMachine.h index 4c68d1e02f23e..0cd949e0a61ee 100644 --- a/dom/media/ExternalEngineStateMachine.h +++ b/dom/media/ExternalEngineStateMachine.h @@ -1862,15 +1862,6 @@ RecoverFromCDMProcessCrashIfNeeded ( ) ; -void -ReportTelemetry -( -const -MediaResult -& -aError -) -; UniquePtr < ExternalPlaybackEngine @@ -1941,20 +1932,6 @@ gfx IntSize mVideoDisplay ; -/ -/ -It -would -be -set -if -playback -is -encrypted -. -nsCString -mKeySystem -; } ; class diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp index 114dd75ff074c..619b763312b12 100644 --- a/dom/media/MediaDecoder.cpp +++ b/dom/media/MediaDecoder.cpp @@ -291,17 +291,6 @@ h # include " -mozilla -/ -glean -/ -GleanMetrics -. -h -" -# -include -" nsComponentManagerUtils . h @@ -2930,253 +2919,6 @@ machine " ) ; -glean -: -: -mfcdm -: -: -ErrorExtra -extraData -; -extraData -. -errorName -= -Some -( -" -FAILED_TO_FALLBACK_TO_STATE_MACHINE -" -_ns -) -; -nsAutoCString -resolution -; -if -( -mInfo -) -{ -if -( -mInfo -- -> -HasAudio -( -) -) -{ -extraData -. -audioCodec -= -Some -( -mInfo -- -> -mAudio -. -mMimeType -) -; -} -if -( -mInfo -- -> -HasVideo -( -) -) -{ -extraData -. -videoCodec -= -Some -( -mInfo -- -> -mVideo -. -mMimeType -) -; -DetermineResolutionForTelemetry -( -* -mInfo -resolution -) -; -extraData -. -resolution -= -Some -( -resolution -) -; -} -} -glean -: -: -mfcdm -: -: -error -. -Record -( -Some -( -extraData -) -) -; -if -( -MOZ_LOG_TEST -( -gMediaDecoderLog -LogLevel -: -: -Debug -) -) -{ -nsPrintfCString -logMessage -{ -" -MFCDM -Error -event -error -= -% -s -" -extraData -. -errorName -- -> -get -( -) -} -; -if -( -mInfo -) -{ -if -( -mInfo -- -> -HasAudio -( -) -) -{ -logMessage -. -Append -( -nsPrintfCString -{ -" -audio -= -% -s -" -mInfo -- -> -mAudio -. -mMimeType -. -get -( -) -} -) -; -} -if -( -mInfo -- -> -HasVideo -( -) -) -{ -logMessage -. -Append -( -nsPrintfCString -{ -" -video -= -% -s -resolution -= -% -s -" -mInfo -- -> -mVideo -. -mMimeType -. -get -( -) -resolution -. -get -( -) -} -) -; -} -} -LOG -( -" -% -s -" -logMessage -. -get -( -) -) -; -} } / / diff --git a/dom/media/VideoUtils.cpp b/dom/media/VideoUtils.cpp index 652f5fae78803..360faeb8d3717 100644 --- a/dom/media/VideoUtils.cpp +++ b/dom/media/VideoUtils.cpp @@ -8182,195 +8182,6 @@ codecs ) ; } -void -DetermineResolutionForTelemetry -( -const -MediaInfo -& -aInfo -nsCString -& -aResolutionOut -) -{ -if -( -aInfo -. -HasAudio -( -) -) -{ -aResolutionOut -. -AppendASCII -( -" -AV -" -) -; -} -else -{ -aResolutionOut -. -AppendASCII -( -" -V -" -) -; -} -static -const -struct -{ -int32_t -mH -; -const -char -* -mRes -; -} -sResolutions -[ -] -= -{ -{ -240 -" -0 -< -h -< -= -240 -" -} -{ -480 -" -240 -< -h -< -= -480 -" -} -{ -576 -" -480 -< -h -< -= -576 -" -} -{ -720 -" -576 -< -h -< -= -720 -" -} -{ -1080 -" -720 -< -h -< -= -1080 -" -} -{ -2160 -" -1080 -< -h -< -= -2160 -" -} -} -; -const -char -* -resolution -= -" -h -> -2160 -" -; -int32_t -height -= -aInfo -. -mVideo -. -mDisplay -. -height -; -for -( -const -auto -& -res -: -sResolutions -) -{ -if -( -height -< -= -res -. -mH -) -{ -resolution -= -res -. -mRes -; -break -; -} -} -aResolutionOut -. -AppendASCII -( -resolution -) -; -} } / / diff --git a/dom/media/VideoUtils.h b/dom/media/VideoUtils.h index 4276461669059..e8b707c5e7f49 100644 --- a/dom/media/VideoUtils.h +++ b/dom/media/VideoUtils.h @@ -4099,18 +4099,6 @@ nsACString aMimeType ) ; -void -DetermineResolutionForTelemetry -( -const -MediaInfo -& -aInfo -nsCString -& -aResolutionOut -) -; } / / diff --git a/dom/media/eme/EMEUtils.cpp b/dom/media/eme/EMEUtils.cpp index a068e7278ef2c..26528d133e47c 100644 --- a/dom/media/eme/EMEUtils.cpp +++ b/dom/media/eme/EMEUtils.cpp @@ -399,22 +399,6 @@ false ; } return -IsPlayReadyKeySystem -( -aKeySystem -) -; -} -bool -IsPlayReadyKeySystem -( -const -nsAString -& -aKeySystem -) -{ -return aKeySystem . EqualsLiteral @@ -505,22 +489,6 @@ false ; } return -IsWidevineExperimentKeySystem -( -aKeySystem -) -; -} -bool -IsWidevineExperimentKeySystem -( -const -nsAString -& -aKeySystem -) -{ -return aKeySystem . EqualsLiteral diff --git a/dom/media/eme/EMEUtils.h b/dom/media/eme/EMEUtils.h index cfb4c1d847438..3515df98554a9 100644 --- a/dom/media/eme/EMEUtils.h +++ b/dom/media/eme/EMEUtils.h @@ -409,15 +409,6 @@ aKeySystem ) ; bool -IsPlayReadyKeySystem -( -const -nsAString -& -aKeySystem -) -; -bool IsWidevineExperimentKeySystemAndSupported ( const @@ -427,15 +418,6 @@ aKeySystem ) ; bool -IsWidevineExperimentKeySystem -( -const -nsAString -& -aKeySystem -) -; -bool IsWMFClearKeySystemAndSupported ( const diff --git a/dom/media/platforms/wmf/metrics.yaml b/dom/media/platforms/wmf/metrics.yaml deleted file mode 100644 index a777d64e0671f..0000000000000 --- a/dom/media/platforms/wmf/metrics.yaml +++ /dev/null @@ -1,572 +0,0 @@ -# -This -Source -Code -Form -is -subject -to -the -terms -of -the -Mozilla -Public -# -License -v -. -2 -. -0 -. -If -a -copy -of -the -MPL -was -not -distributed -with -this -# -file -You -can -obtain -one -at -http -: -/ -/ -mozilla -. -org -/ -MPL -/ -2 -. -0 -/ -. -# -Adding -a -new -metric -? -We -have -docs -for -that -! -# -https -: -/ -/ -firefox -- -source -- -docs -. -mozilla -. -org -/ -toolkit -/ -components -/ -glean -/ -user -/ -new_definitions_file -. -html -- -- -- -schema -: -moz -: -/ -/ -mozilla -. -org -/ -schemas -/ -glean -/ -metrics -/ -2 -- -0 -- -0 -tags -: -- -' -Core -: -: -Audio -/ -Video -' -mfcdm -: -eme_playback -: -type -: -event -description -: -Record -the -information -about -the -EME -playback -when -using -the -media -engine -. -The -value -of -this -event -is -the -key -system -name -. -metadata -: -tags -: -- -' -Core -: -: -Audio -/ -Video -: -Playback -' -bugs -: -- -https -: -/ -/ -bugzilla -. -mozilla -. -org -/ -show_bug -. -cgi -? -id -= -1873394 -data_reviews -: -- -https -: -/ -/ -bugzilla -. -mozilla -. -org -/ -show_bug -. -cgi -? -id -= -1873394 -# -c7 -data_sensitivity -: -- -technical -notification_emails -: -- -media -- -alerts -mozilla -. -com -extra_keys -: -key_system -: -description -: -The -key -system -used -for -the -EME -playback -type -: -string -video_codec -: -description -: -The -video -codec -used -for -EME -playback -type -: -string -resolution -: -description -: -The -video -resolution -used -for -EME -playback -type -: -string -played_time -: -description -: -The -amount -of -time -( -in -seconds -) -the -EME -content -has -been -played -( -in -seconds -) -type -: -quantity -rendered_frames -: -description -: -The -amount -of -video -frames -has -been -rendered -type -: -quantity -dropped_frames -: -description -: -The -amount -of -video -frames -don -' -t -get -rendered -but -dropped -type -: -quantity -expires -: -130 -telemetry_mirror -: -Mfcdm_EmePlayback_Gecko -error -: -type -: -event -description -: -Record -the -error -or -crash -happened -while -using -the -media -engine -playback -. -The -value -of -this -event -is -the -name -of -error -. -This -probe -covers -both -EME -and -non -- -EME -playback -. -metadata -: -tags -: -- -' -Core -: -: -Audio -/ -Video -: -Playback -' -bugs -: -- -https -: -/ -/ -bugzilla -. -mozilla -. -org -/ -show_bug -. -cgi -? -id -= -1873394 -data_reviews -: -- -https -: -/ -/ -bugzilla -. -mozilla -. -org -/ -show_bug -. -cgi -? -id -= -1873394 -# -c7 -data_sensitivity -: -- -technical -notification_emails -: -- -media -- -alerts -mozilla -. -com -extra_keys -: -error_name -: -description -: -The -name -of -the -error -type -: -string -current_state -: -description -: -The -state -of -the -external -state -machine -was -being -used -when -the -error -or -crash -happened -type -: -string -audio_codec -: -description -: -The -audio -codec -was -being -used -when -the -error -or -crash -happened -type -: -string -video_codec -: -description -: -The -video -codec -was -being -used -when -the -error -or -crash -happened -type -: -string -resolution -: -description -: -The -video -resolution -was -being -used -when -the -error -or -crash -happened -type -: -string -key_system -: -description -: -The -key -system -was -being -used -when -the -error -or -crash -happened -type -: -string -expires -: -130 -telemetry_mirror -: -Mfcdm_Error_Gecko diff --git a/dom/media/utils/TelemetryProbesReporter.cpp b/dom/media/utils/TelemetryProbesReporter.cpp index 76e866651495a..373adfaa2da5f 100644 --- a/dom/media/utils/TelemetryProbesReporter.cpp +++ b/dom/media/utils/TelemetryProbesReporter.cpp @@ -121,17 +121,6 @@ h # include " -mozilla -/ -glean -/ -GleanMetrics -. -h -" -# -include -" nsThreadUtils . h @@ -2678,11 +2667,165 @@ GetMediaInfo ; nsCString key -; -DetermineResolutionForTelemetry ( info +. +HasAudio +( +) +? +" +AV +" +: +" +V +" +) +; +static +const +struct +{ +int32_t +mH +; +const +char +* +mRes +; +} +sResolutions +[ +] += +{ +{ +240 +" +0 +< +h +< += +240 +" +} +{ +480 +" +240 +< +h +< += +480 +" +} +{ +576 +" +480 +< +h +< += +576 +" +} +{ +720 +" +576 +< +h +< += +720 +" +} +{ +1080 +" +720 +< +h +< += +1080 +" +} +{ +2160 +" +1080 +< +h +< += +2160 +" +} +} +; +const +char +* +resolution += +" +h +> +2160 +" +; +int32_t +height += +info +. +mVideo +. +mDisplay +. +height +; +for +( +const +auto +& +res +: +sResolutions +) +{ +if +( +height +< += +res +. +mH +) +{ +resolution += +res +. +mRes +; +break +; +} +} key +. +AppendASCII +( +resolution ) ; auto @@ -2924,371 +3067,7 @@ totalVideoPlayTimeS key ) ; -# -ifdef -MOZ_WMF_CDM -if -( -mOwner -- -> -IsUsingWMFCDM -( -) -) -{ -ReportResultForMFCDMPlaybackIfNeeded -( -totalVideoPlayTimeS -key -) -; -} -# -endif } -# -ifdef -MOZ_WMF_CDM -void -TelemetryProbesReporter -: -: -ReportResultForMFCDMPlaybackIfNeeded -( -double -aTotalPlayTimeS -const -nsCString -& -aResolution -) -{ -const -auto -keySystem -= -mOwner -- -> -GetKeySystem -( -) -; -if -( -! -keySystem -) -{ -NS_WARNING -( -" -Can -not -find -key -system -to -report -telemetry -for -MFCDM -! -! -" -) -; -return -; -} -glean -: -: -mfcdm -: -: -EmePlaybackExtra -extraData -; -extraData -. -keySystem -= -Some -( -NS_ConvertUTF16toUTF8 -( -* -keySystem -) -) -; -extraData -. -videoCodec -= -Some -( -mOwner -- -> -GetMediaInfo -( -) -. -mVideo -. -mMimeType -) -; -extraData -. -resolution -= -Some -( -aResolution -) -; -extraData -. -playedTime -= -Some -( -aTotalPlayTimeS -) -; -Maybe -< -uint64_t -> -renderedFrames -; -Maybe -< -uint64_t -> -droppedFrames -; -if -( -auto -* -stats -= -mOwner -- -> -GetFrameStatistics -( -) -) -{ -renderedFrames -= -Some -( -stats -- -> -GetPresentedFrames -( -) -) -; -droppedFrames -= -Some -( -stats -- -> -GetDroppedFrames -( -) -) -; -extraData -. -renderedFrames -= -Some -( -* -renderedFrames -) -; -extraData -. -droppedFrames -= -Some -( -* -droppedFrames -) -; -} -if -( -MOZ_LOG_TEST -( -gTelemetryProbesReporterLog -LogLevel -: -: -Debug -) -) -{ -nsPrintfCString -logMessage -{ -" -MFCDM -EME_Playback -event -keySystem -= -% -s -videoCodec -= -% -s -resolution -= -% -s -" -" -playedTime -= -% -s -" -NS_ConvertUTF16toUTF8 -( -* -keySystem -) -. -get -( -) -mOwner -- -> -GetMediaInfo -( -) -. -mVideo -. -mMimeType -. -get -( -) -aResolution -. -get -( -) -std -: -: -to_string -( -aTotalPlayTimeS -) -. -c_str -( -) -} -; -if -( -renderedFrames -) -{ -logMessage -. -Append -( -nsPrintfCString -{ -" -renderedFrames -= -% -" -PRIu64 -* -renderedFrames -} -) -; -} -if -( -droppedFrames -) -{ -logMessage -. -Append -( -nsPrintfCString -{ -" -droppedFrames -= -% -" -PRIu64 -* -droppedFrames -} -) -; -} -LOG -( -" -% -s -" -logMessage -. -get -( -) -) -; -} -glean -: -: -mfcdm -: -: -eme_playback -. -Record -( -Some -( -extraData -) -) -; -} -# -endif void TelemetryProbesReporter : diff --git a/dom/media/utils/TelemetryProbesReporter.h b/dom/media/utils/TelemetryProbesReporter.h index b870c019558d7..e63c58c4c653c 100644 --- a/dom/media/utils/TelemetryProbesReporter.h +++ b/dom/media/utils/TelemetryProbesReporter.h @@ -164,20 +164,6 @@ aName = 0 ; -# -ifdef -MOZ_WMF_CDM -virtual -bool -IsUsingWMFCDM -( -) -const -= -0 -; -# -endif } ; enum @@ -510,22 +496,6 @@ nsCString key ) ; -# -ifdef -MOZ_WMF_CDM -void -ReportResultForMFCDMPlaybackIfNeeded -( -double -aTotalPlayTimeS -const -nsCString -& -aResolution -) -; -# -endif / / Helper diff --git a/ipc/glue/UtilityProcessHost.cpp b/ipc/glue/UtilityProcessHost.cpp index 0b9325ff1505c..945fa939fbb77 100644 --- a/ipc/glue/UtilityProcessHost.cpp +++ b/ipc/glue/UtilityProcessHost.cpp @@ -793,15 +793,6 @@ aExtraOpts ; # endif -# -ifdef -MOZ_WMF_CDM -EnanbleMFCDMTelemetryEventIfNeeded -( -) -; -# -endif mLaunchPhase = LaunchPhase @@ -2489,64 +2480,6 @@ undef WMF_LOG # endif -# -ifdef -MOZ_WMF_CDM -void -UtilityProcessHost -: -: -EnanbleMFCDMTelemetryEventIfNeeded -( -) -const -{ -if -( -mSandbox -! -= -SandboxingKind -: -: -MF_MEDIA_ENGINE_CDM -) -{ -return -; -} -static -bool -sTelemetryEventEnabled -= -false -; -if -( -! -sTelemetryEventEnabled -) -{ -sTelemetryEventEnabled -= -true -; -Telemetry -: -: -SetEventRecordingEnabled -( -" -mfcdm -" -_ns -true -) -; -} -} -# -endif } / / diff --git a/ipc/glue/UtilityProcessHost.h b/ipc/glue/UtilityProcessHost.h index e2055294bb40d..ad692fdb395bf 100644 --- a/ipc/glue/UtilityProcessHost.h +++ b/ipc/glue/UtilityProcessHost.h @@ -947,17 +947,6 @@ aExtraOpts ; # endif -# -ifdef -MOZ_WMF_CDM -void -EnanbleMFCDMTelemetryEventIfNeeded -( -) -const -; -# -endif / / Set diff --git a/toolkit/components/glean/metrics_index.py b/toolkit/components/glean/metrics_index.py index 8f032010f3fbd..afd66a7af6874 100644 --- a/toolkit/components/glean/metrics_index.py +++ b/toolkit/components/glean/metrics_index.py @@ -625,20 +625,6 @@ yaml " -" -dom -/ -media -/ -platforms -/ -wmf -/ -metrics -. -yaml -" - " toolkit / diff --git a/toolkit/components/telemetry/Events.yaml b/toolkit/components/telemetry/Events.yaml index 8a2f0b4235c75..9b57138349be5 100644 --- a/toolkit/components/telemetry/Events.yaml +++ b/toolkit/components/telemetry/Events.yaml @@ -22672,299 +22672,6 @@ alerts mozilla . com -mfcdm -: -eme_playback -: -objects -: -[ -" -gecko -" -] -bug_numbers -: -[ -1873394 -] -description -: -Record -the -information -about -the -EME -playback -when -using -the -media -engine -. -The -value -of -this -event -is -the -key -system -name -. -products -: -- -firefox -record_in_processes -: -[ -" -all -" -] -release_channel_collection -: -opt -- -out -expiry_version -: -" -130 -" -notification_emails -: -- -media -- -alerts -mozilla -. -com -extra_keys -: -key_system -: -The -key -system -used -for -the -EME -playback -video_codec -: -The -video -codec -used -for -playback -resolution -: -The -video -resolution -used -for -playback -played_time -: -The -amount -of -time -the -EME -content -has -been -played -( -in -seconds -) -rendered_frames -: -The -amount -of -video -frames -has -been -rendered -dropped_frames -: -The -amount -of -video -frames -don -' -t -get -rendered -but -dropped -error -: -objects -: -[ -" -gecko -" -] -bug_numbers -: -[ -1873394 -] -description -: -Record -the -error -or -crash -happened -while -using -the -media -engine -playback -. -The -value -of -this -event -is -the -name -of -error -. -products -: -- -firefox -record_in_processes -: -[ -" -all -" -] -release_channel_collection -: -opt -- -out -expiry_version -: -" -130 -" -notification_emails -: -- -media -- -alerts -mozilla -. -com -extra_keys -: -error_name -: -The -name -of -the -error -current_state -: -The -state -of -the -external -state -machine -was -being -used -when -the -error -or -crash -happened -video_codec -: -The -video -codec -was -being -used -when -the -error -or -crash -happened -audio_codec -: -The -audio -codec -was -being -used -when -the -error -or -crash -happened -resolution -: -The -video -resolution -was -being -used -when -the -error -or -crash -happened -key_system -: -The -key -system -was -being -used -when -the -error -or -crash -happened installation : first_seen