[media] Add SingleThreadTaskExecutor to web_media_player_sandbox

b/350582446
youtube · Oct 24, 2024 · 5e99757 · 5e99757
1 parent 1e7bfb9
commit 5e99757
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/cobalt/media/sandbox/format_guesstimator.cc b/cobalt/media/sandbox/format_guesstimator.cc
@@ -134,7 +134,9 @@ std::string ExtractCodecs(const std::string& content_type) {
 }  // namespace
 
 FormatGuesstimator::FormatGuesstimator(const std::string& path_or_url,
-                                       MediaModule* media_module) {
+                                       MediaModule* media_module)
+    : task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
+  DCHECK(task_runner_);
   GURL url(path_or_url);
   if (url.is_valid()) {
     // If it is a url, assume that it is a progressive video.
@@ -189,7 +191,7 @@ void FormatGuesstimator::InitializeAsAdaptive(const base::FilePath& path,
     // during initialization of |web_media_player_helper|. Wait until it is set
     // before proceeding.
     while (!chunk_demuxer) {
-      base::RunLoop().RunUntilIdle();
+      task_runner_->RunsTasksInCurrentSequence();
     }
 
     const std::string id = "stream";

diff --git a/cobalt/media/sandbox/format_guesstimator.h b/cobalt/media/sandbox/format_guesstimator.h
@@ -19,6 +19,7 @@
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/task/sequenced_task_runner.h"
 #include "cobalt/media/media_module.h"
 #include "url/gurl.h"
 
@@ -66,6 +67,7 @@ class FormatGuesstimator {
   GURL progressive_url_;
   base::FilePath adaptive_path_;
   std::string mime_type_;
+  base::SequencedTaskRunner* task_runner_;
 };
 
 }  // namespace sandbox

diff --git a/cobalt/media/sandbox/web_media_player_sandbox.cc b/cobalt/media/sandbox/web_media_player_sandbox.cc
@@ -24,7 +24,7 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/task/single_thread_task_executor.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "cobalt/base/wrap_main.h"
@@ -113,6 +113,9 @@ class Application {
         media_sandbox_(argc, argv,
                        base::FilePath(FILE_PATH_LITERAL(
                            "media_source_sandbox_trace.json"))) {
+    base::SingleThreadTaskExecutor task_executor(base::MessagePumpType::UI);
+    base::RunLoop run_loop;
+    run_loop.BeforeRun();
     if (argc > 1) {
       FormatGuesstimator guesstimator1(argv[argc - 1],
                                        media_sandbox_.GetMediaModule());
@@ -147,6 +150,8 @@ class Application {
       }
     }
 
+    run_loop.AfterRun();
+    run_loop.Quit();
     PrintUsage(argv[0]);
     SbSystemRequestStop(0);
   }