Minor cleanups and CL feedback

youtube · Nov 9, 2024 · df874e5 · df874e5
1 parent 000a09f
commit df874e5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/content/renderer/media/media_permission_dispatcher.cc b/content/renderer/media/media_permission_dispatcher.cc
@@ -148,10 +148,12 @@ void MediaPermissionDispatcher::OnPermissionStatus(
   PermissionStatusCB permission_status_cb = std::move(iter->second);
   requests_.erase(iter);
 
+#if BUILDFLAG(USE_STARBOARD_MEDIA)
   std::move(permission_status_cb).Run(true);
-  // TODO (SIDEBOARD) - FIX THIS PERMISSION CHECK FOR REAL
-  // std::move(permission_status_cb)
-  //     .Run(status == blink::mojom::PermissionStatus::GRANTED);
+#else // BUILDFLAG(USE_STARBOARD_MEDIA)
+  std::move(permission_status_cb)
+      .Run(status == blink::mojom::PermissionStatus::GRANTED);
+#endif // BUILDFLAG(USE_STARBOARD_MEDIA)
 }
 
 void MediaPermissionDispatcher::OnConnectionError() {

diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
@@ -18,11 +18,6 @@ if (is_cobalt) {
   import("//starboard/build/buildflags.gni")
 }
 
-if (is_cobalt) {
-  import("//starboard/build/buildflags.gni")
-}
-
-
 source_set("base") {
   # Do not expand the visibility here without double-checking with OWNERS, this
   # is a roll-up target which is part of the //media component. Most other DEPs
@@ -413,12 +408,6 @@ source_set("base") {
     "//media:subcomponent_config",
   ]
 
-  if (is_cobalt) {
-    deps += [
-      "//starboard($starboard_toolchain)",
-    ]
-  }
-
   if (media_use_ffmpeg) {
     deps += [
       "//third_party/ffmpeg",

diff --git a/media/cdm/BUILD.gn b/media/cdm/BUILD.gn
@@ -4,6 +4,10 @@
 
 import("//media/media_options.gni")
 
+if (is_cobalt) {
+  import("//starboard/build/buildflags.gni")
+}
+
 source_set("cdm_api") {
   sources = [ "api/content_decryption_module.h" ]
 }
@@ -171,8 +175,7 @@ source_set("cdm") {
     deps += [ "//media/fuchsia/common" ]
   }
 
-  if (is_cobalt) {
-    import("//starboard/build/buildflags.gni")
+  if (is_cobalt && use_starboard_media) {
     sources += [
        "starboard/starboard_cdm.cc",
        "starboard/starboard_cdm.h",

diff --git a/media/cdm/starboard/starboard_cdm.cc b/media/cdm/starboard/starboard_cdm.cc
@@ -149,8 +149,8 @@ void StarboardCdm::CreateSessionAndGenerateRequest(
   ticket_to_session_update_request_map_.insert(
       std::make_pair(ticket, std::move(session_update_request)));
 
-  LOG(INFO) << "YO THOR Generate session update request of drm system ("
-            << sb_drm_ << "), type: " << GetInitDataTypeName(init_data_type)
+  LOG(INFO) << "Generate session update request of drm system (" << sb_drm_
+            << "), type: " << GetInitDataTypeName(init_data_type)
             << ", init data size: " << init_data.size()
             << ", ticket: " << ticket;
 
@@ -162,7 +162,7 @@ void StarboardCdm::CreateSessionAndGenerateRequest(
 void StarboardCdm::LoadSession(CdmSessionType session_type,
                                const std::string& session_id,
                                std::unique_ptr<NewSessionCdmPromise> promise) {
-  DLOG(INFO) << "YO THOR StarboardCdm - Load session - not impl yet!";
+  LOG(INFO) << "StarboardCdm - Load session - not impl yet!";
 }
 
 void StarboardCdm::UpdateSession(const std::string& session_id,
@@ -197,7 +197,7 @@ void StarboardCdm::UpdateSession(const std::string& session_id,
 
   ticket_to_session_update_map_.insert(std::make_pair(ticket, session_update));
 
-  LOG(INFO) << "YO THOR Update session of drm system (" << sb_drm_
+  LOG(INFO) << "Update session of drm system (" << sb_drm_
             << "), key length: " << response.size() << ", ticket: " << ticket
             << ", session id: " << session_id;
 
@@ -229,8 +229,8 @@ void StarboardCdm::CloseSession(const std::string& session_id,
 // Runs the parallel steps from https://w3c.github.io/encrypted-media/#remove.
 void StarboardCdm::RemoveSession(const std::string& session_id,
                                  std::unique_ptr<SimpleCdmPromise> promise) {
-  // TODO - DO WE NEED THIS?
-  LOG(INFO) << "YO THOR2 - STARBOARD CDM - REMOVE SESSION";
+  // TODO(sideboard) - DO WE NEED THIS?
+  LOG(INFO) << "STARBOARD CDM - REMOVE SESSION";
   auto it = session_map_.find(session_id);
   if (it == session_map_.end()) {
     promise->reject(CdmPromise::Exception::INVALID_STATE_ERROR, 0,
@@ -405,7 +405,7 @@ void StarboardCdm::OnSessionUpdateRequestGeneratedFunc(
                     static_cast<const char*>(session_id) + session_id_size);
   }
 
-  LOG(INFO) << "YO THOR Receiving session update request notification from drm "
+  LOG(INFO) << "Receiving session update request notification from drm "
                "system ("
             << sb_drm << "), status: " << status << ", type: " << type
             << ", ticket: " << ticket