From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:27 +0200
Subject: Adding upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/media/ExternalEngineStateMachine.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'dom/media/ExternalEngineStateMachine.h')

diff --git a/dom/media/ExternalEngineStateMachine.h b/dom/media/ExternalEngineStateMachine.h
index 84dedbe717..79183f894d 100644
--- a/dom/media/ExternalEngineStateMachine.h
+++ b/dom/media/ExternalEngineStateMachine.h
@@ -102,8 +102,10 @@ class ExternalEngineStateMachine final
 
   bool IsCDMProxySupported(CDMProxy* aProxy) override;
 
+  bool IsExternalEngineStateMachine() const override { return true; }
+
  private:
-  ~ExternalEngineStateMachine() = default;
+  ~ExternalEngineStateMachine();
 
   void AssertOnTaskQueue() const { MOZ_ASSERT(OnTaskQueue()); }
 
@@ -233,6 +235,7 @@ class ExternalEngineStateMachine final
   void PreservesPitchChanged() override;
   void PlayStateChanged() override;
   void LoopingChanged() override;
+  void PlaybackRateChanged();
 
   // Not supported.
   void SetIsLiveStream(bool aIsLiveStream) override {}
@@ -293,6 +296,8 @@ class ExternalEngineStateMachine final
 
   void ReportTelemetry(const MediaResult& aError);
 
+  void DecodeError(const MediaResult& aError) override;
+
   UniquePtr<ExternalPlaybackEngine> mEngine;
 
   bool mHasEnoughAudio = false;
@@ -303,12 +308,20 @@ class ExternalEngineStateMachine final
   // Only used if setting CDM happens before the engine finishes initialization.
   MozPromiseHolder<SetCDMPromise> mSetCDMProxyPromise;
   MozPromiseRequestHolder<SetCDMPromise> mSetCDMProxyRequest;
+  MozPromiseRequestHolder<GenericNonExclusivePromise> mInitEngineForCDMRequest;
 
   // It would be zero for audio-only playback.
   gfx::IntSize mVideoDisplay;
 
   // It would be set if playback is encrypted.
   nsCString mKeySystem;
+
+  // This array stores the tasks which needs to be executed only after the
+  // engine is ready but is called before that. It will be executed when
+  // starting running the engine.
+  nsTArray<RefPtr<nsIRunnable>> mPendingTasks;
+
+  bool mHasFatalError = false;
 };
 
 class ExternalPlaybackEngine {
-- 
cgit v1.2.3