Add ScopedJobThreadPtr class to be used with JobThread

b/372515171
youtube · Oct 22, 2024 · 30e7e60 · 30e7e60
1 parent a337e43
commit 30e7e60
Show file tree

Hide file tree

Showing 19 changed files with 54 additions and 32 deletions.
diff --git a/starboard/android/shared/audio_renderer_passthrough.h b/starboard/android/shared/audio_renderer_passthrough.h
@@ -147,7 +147,7 @@ class AudioRendererPassthrough
   // ensure the thread completes all tasks before |audio_track_bridge_| is
   // invalidated.
   std::unique_ptr<AudioTrackBridge> audio_track_bridge_;
-  std::unique_ptr<JobThread> audio_track_thread_;
+  JobThread::ScopedJobThreadPtr audio_track_thread_;
 };
 
 }  // namespace shared

diff --git a/starboard/shared/libaom/aom_video_decoder.cc b/starboard/shared/libaom/aom_video_decoder.cc
@@ -102,7 +102,7 @@ void VideoDecoder::Reset() {
   SB_DCHECK(BelongsToCurrentThread());
 
   if (decoder_thread_) {
-    decoder_thread_->job_queue()->ScheduleAndWait(
+    decoder_thread_->job_queue()->Schedule(
         std::bind(&VideoDecoder::TeardownCodec, this));
 
     // Join the thread to ensure that all callbacks in process are finished.

diff --git a/starboard/shared/libaom/aom_video_decoder.h b/starboard/shared/libaom/aom_video_decoder.h
@@ -84,7 +84,7 @@ class VideoDecoder : public starboard::player::filter::VideoDecoder,
   bool error_occurred_;
 
   // Working thread to avoid lengthy decoding work block the player thread.
-  std::unique_ptr<starboard::player::JobThread> decoder_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr decoder_thread_;
 
   // Decode-to-texture related state.
   SbPlayerOutputMode output_mode_;

diff --git a/starboard/shared/libdav1d/dav1d_video_decoder.cc b/starboard/shared/libdav1d/dav1d_video_decoder.cc
@@ -126,10 +126,9 @@ void VideoDecoder::Reset() {
   SB_DCHECK(BelongsToCurrentThread());
 
   if (decoder_thread_) {
-    // Wait to ensure all tasks are done before decoder_thread_ reset.
-    decoder_thread_->job_queue()->ScheduleAndWait(
+    decoder_thread_->job_queue()->Schedule(
         std::bind(&VideoDecoder::TeardownCodec, this));
-
+    // Join the thread to ensure that all callbacks in process are finished.
     decoder_thread_.reset();
   }
 

diff --git a/starboard/shared/libdav1d/dav1d_video_decoder.h b/starboard/shared/libdav1d/dav1d_video_decoder.h
@@ -93,7 +93,7 @@ class VideoDecoder : public starboard::player::filter::VideoDecoder,
   bool stream_ended_ = false;
 
   // Working thread to avoid lengthy decoding work block the player thread.
-  std::unique_ptr<starboard::player::JobThread> decoder_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr decoder_thread_;
 
   // Decode-to-texture related state.
   const SbPlayerOutputMode output_mode_;

diff --git a/starboard/shared/libde265/de265_video_decoder.cc b/starboard/shared/libde265/de265_video_decoder.cc
@@ -98,10 +98,9 @@ void VideoDecoder::Reset() {
   SB_DCHECK(BelongsToCurrentThread());
 
   if (decoder_thread_) {
-    // Wait to ensure all tasks are done before decoder_thread_ reset.
-    decoder_thread_->job_queue()->ScheduleAndWait(
+    decoder_thread_->job_queue()->Schedule(
         std::bind(&VideoDecoder::TeardownCodec, this));
-
+    // Join the thread to ensure that all callbacks in process are finished.
     decoder_thread_.reset();
   }
 

diff --git a/starboard/shared/libde265/de265_video_decoder.h b/starboard/shared/libde265/de265_video_decoder.h
@@ -85,7 +85,7 @@ class VideoDecoder : public starboard::player::filter::VideoDecoder,
   bool error_occurred_ = false;
 
   // Working thread to avoid lengthy decoding work block the player thread.
-  std::unique_ptr<starboard::player::JobThread> decoder_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr decoder_thread_;
 
   // Decode-to-texture related state.
   SbPlayerOutputMode output_mode_;

diff --git a/starboard/shared/libvpx/vpx_video_decoder.cc b/starboard/shared/libvpx/vpx_video_decoder.cc
@@ -100,10 +100,9 @@ void VideoDecoder::Reset() {
   SB_DCHECK(BelongsToCurrentThread());
 
   if (decoder_thread_) {
-    // Wait to ensure all tasks are done before decoder_thread_ reset.
-    decoder_thread_->job_queue()->ScheduleAndWait(
+    decoder_thread_->job_queue()->Schedule(
         std::bind(&VideoDecoder::TeardownCodec, this));
-
+    // Join the thread to ensure that all callbacks in process are finished.
     decoder_thread_.reset();
   }
 

diff --git a/starboard/shared/libvpx/vpx_video_decoder.h b/starboard/shared/libvpx/vpx_video_decoder.h
@@ -86,7 +86,7 @@ class VideoDecoder : public starboard::player::filter::VideoDecoder,
   bool error_occurred_;
 
   // Working thread to avoid lengthy decoding work block the player thread.
-  std::unique_ptr<starboard::player::JobThread> decoder_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr decoder_thread_;
 
   // Decode-to-texture related state.
   SbPlayerOutputMode output_mode_;

diff --git a/starboard/shared/openh264/openh264_video_decoder.cc b/starboard/shared/openh264/openh264_video_decoder.cc
@@ -66,9 +66,9 @@ void VideoDecoder::Reset() {
   SB_DCHECK(BelongsToCurrentThread());
 
   if (decoder_thread_) {
-    // Wait to ensure all tasks are done before decoder_thread_ reset.
-    decoder_thread_->job_queue()->ScheduleAndWait(
+    decoder_thread_->job_queue()->Schedule(
         std::bind(&VideoDecoder::TeardownCodec, this));
+    // Join the thread to ensure that all callbacks in process are finished.
     decoder_thread_.reset();
   }
 

diff --git a/starboard/shared/openh264/openh264_video_decoder.h b/starboard/shared/openh264/openh264_video_decoder.h
@@ -119,7 +119,7 @@ class VideoDecoder : public starboard::player::filter::VideoDecoder,
   Mutex decode_target_mutex_;
 
   // Working thread to avoid lengthy decoding work block the player thread.
-  std::unique_ptr<starboard::player::JobThread> decoder_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr decoder_thread_;
 
   // Openh264 decode handler.
   ISVCDecoder* decoder_ = nullptr;

diff --git a/starboard/shared/starboard/player/filter/stub_audio_decoder.h b/starboard/shared/starboard/player/filter/stub_audio_decoder.h
@@ -59,7 +59,7 @@ class StubAudioDecoder : public AudioDecoder, private JobQueue::JobOwner {
   OutputCB output_cb_;
   ErrorCB error_cb_;
 
-  std::unique_ptr<starboard::player::JobThread> decoder_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr decoder_thread_;
   Mutex decoded_audios_mutex_;
   std::queue<scoped_refptr<DecodedAudio> > decoded_audios_;
   scoped_refptr<InputBuffer> last_input_buffer_;

diff --git a/starboard/shared/starboard/player/filter/stub_video_decoder.h b/starboard/shared/starboard/player/filter/stub_video_decoder.h
@@ -56,7 +56,7 @@ class StubVideoDecoder : public VideoDecoder, private JobQueue::JobOwner {
   DecoderStatusCB decoder_status_cb_;
   media::VideoStreamInfo video_stream_info_;
 
-  std::unique_ptr<starboard::player::JobThread> decoder_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr decoder_thread_;
   // std::set<> keeps frame timestamps sorted in ascending order.
   std::set<int64_t> output_frame_timestamps_;
   // Used to determine when to send kBufferFull in DecodeOneBuffer().

diff --git a/starboard/shared/starboard/player/filter/tools/audio_dmp_player.cc b/starboard/shared/starboard/player/filter/tools/audio_dmp_player.cc
@@ -44,7 +44,7 @@ const int kJobThreadStackSize = 0;
 std::unique_ptr<VideoDmpReader> s_video_dmp_reader;
 std::unique_ptr<PlayerComponents> s_player_components;
 int s_audio_sample_index;
-std::unique_ptr<JobThread> s_job_thread;
+JobThread::ScopedJobThreadPtr s_job_thread;
 int64_t s_duration;
 
 static void DeallocateSampleFunc(SbPlayer player,

diff --git a/starboard/shared/starboard/player/job_thread.h b/starboard/shared/starboard/player/job_thread.h
@@ -36,10 +36,35 @@ namespace player {
 // This class implements a thread that holds a JobQueue.
 class JobThread {
  public:
+  class ScopedJobThreadPtr {
+   public:
+    ScopedJobThreadPtr(JobThread* p = nullptr): job_thread_(p) {
+    }
+
+    ~ScopedJobThreadPtr() {
+      delete job_thread_;
+    }
+
+    void reset(JobThread* p = nullptr) {
+      delete job_thread_;
+      job_thread_ = p;
+    }
+
+    JobThread* operator->() const {
+      return job_thread_;
+    }
+
+    operator bool() const { 
+      return job_thread_ != nullptr;
+    }
+
+   private:
+    JobThread* job_thread_;
+  };  
+
   explicit JobThread(const char* thread_name,
                      int64_t stack_size = 0,
                      SbThreadPriority priority = kSbThreadPriorityNormal);
-  ~JobThread();
 
   JobQueue* job_queue() { return job_queue_.get(); }
   const JobQueue* job_queue() const { return job_queue_.get(); }
@@ -83,8 +108,8 @@ class JobThread {
 
     return job_queue_->RemoveJobByToken(job_token);
   }
-
  private:
+  ~JobThread();
   static void* ThreadEntryPoint(void* context);
   void RunLoop();
 

diff --git a/starboard/shared/uwp/wasapi_audio_sink.h b/starboard/shared/uwp/wasapi_audio_sink.h
@@ -177,7 +177,7 @@ class WASAPIAudioSink {
   Mutex output_frames_mutex_;
   std::queue<scoped_refptr<DecodedAudio>> pending_decoded_audios_;
 
-  std::unique_ptr<JobThread> job_thread_;
+  JobThread::ScopedJobThreadPtr job_thread_;
 
   starboard::ThreadChecker thread_checker_;
 };

diff --git a/starboard/shared/win32/audio_sink.cc b/starboard/shared/win32/audio_sink.cc
@@ -213,7 +213,7 @@ class XAudioAudioSinkType : public SbAudioSinkPrivate::Type,
       sink->StopCallbacks();
     }
 
-    restart_audio_thread_.job_queue()->Schedule(
+    restart_audio_thread_->job_queue()->Schedule(
         std::bind(&XAudioAudioSinkType::RestartAudioDevice, this));
   }
 
@@ -251,7 +251,7 @@ class XAudioAudioSinkType : public SbAudioSinkPrivate::Type,
   std::list<XAudioAudioSink*> audio_sinks_on_xaudio_callbacks_;
   starboard::ThreadChecker thread_checker_;
 
-  starboard::player::JobThread restart_audio_thread_;
+  starboard::player::JobThread::ScopedJobThreadPtr  restart_audio_thread_;
   std::list<XAudioAudioSink*> audio_sinks_to_restart_;
   bool sink_shutdown_in_progress_;
 };
@@ -383,7 +383,7 @@ void XAudioAudioSink::SubmitSourceBuffer(int offset_in_frames,
 }
 
 XAudioAudioSinkType::XAudioAudioSinkType()
-    : restart_audio_thread_("RestartAudioDevice"),
+    : restart_audio_thread_(new starboard::player::JobThread("RestartAudioDevice")),
       sink_shutdown_in_progress_(false),
       thread_checker_(starboard::ThreadChecker::kSetThreadIdOnFirstCheck) {
   x_audio2_ = XAudioCreate();
@@ -537,7 +537,7 @@ void XAudioAudioSinkType::TryAcquireSinkVoices() {
   if (!x_audio2_) {
     hr = XAudio2Create(&x_audio2_, 0, XAUDIO2_DEFAULT_PROCESSOR);
     if (FAILED(hr)) {
-      restart_audio_thread_.job_queue()->Schedule(
+      restart_audio_thread_->job_queue()->Schedule(
           std::bind(&XAudioAudioSinkType::TryAcquireSinkVoices, this));
       return;
     }
@@ -547,7 +547,7 @@ void XAudioAudioSinkType::TryAcquireSinkVoices() {
   if (!mastering_voice_) {
     hr = x_audio2_->CreateMasteringVoice(&mastering_voice_);
     if (FAILED(hr)) {
-      restart_audio_thread_.job_queue()->Schedule(
+      restart_audio_thread_->job_queue()->Schedule(
           std::bind(&XAudioAudioSinkType::TryAcquireSinkVoices, this));
       return;
     }
@@ -570,7 +570,7 @@ void XAudioAudioSinkType::TryAcquireSinkVoices() {
   if (audio_sinks_to_restart_.empty()) {
     return;
   }
-  restart_audio_thread_.job_queue()->Schedule(
+  restart_audio_thread_->job_queue()->Schedule(
       std::bind(&XAudioAudioSinkType::TryAcquireSinkVoices, this));
 }
 

diff --git a/starboard/xb1/shared/gpu_base_video_decoder.cc b/starboard/xb1/shared/gpu_base_video_decoder.cc
@@ -468,7 +468,7 @@ void GpuVideoDecoderBase::Reset() {
   if (decoder_thread_) {
     // Release stored frames to free frame buffers.
     decoder_status_cb_(kReleaseAllFrames, nullptr);
-    decoder_thread_->job_queue()->ScheduleAndWait(
+    decoder_thread_->job_queue()->Schedule(
         std::bind(&GpuVideoDecoderBase::DrainDecoder, this));
     decoder_thread_.reset();
   }

diff --git a/starboard/xb1/shared/gpu_base_video_decoder.h b/starboard/xb1/shared/gpu_base_video_decoder.h
@@ -237,7 +237,7 @@ class GpuVideoDecoderBase
   void* egl_display_ = nullptr;
   DecodeTargetContextRunner decode_target_context_runner_;
 
-  std::unique_ptr<starboard::shared::starboard::player::JobThread>
+  starboard::shared::starboard::player::JobThread::ScopedJobThreadPtr
       decoder_thread_;
 
   // |pending_inputs_| is shared between player main thread and decoder thread.