Merge branch '26.eap' into santo/26.eap11/user-agent-os1

Author: santoshmahto7

.github/CODEOWNERS

@@ -35,3 +35,4 @@
 /third_party/blink/ @youtube/cobalt-web-api
 
 *.nplb_filter.json @youtube/nplb-filters
+/starboard/contrib/rdk @youtube/starboard-rdk-owners

cobalt/updater/prefs.cc

@@ -44,12 +44,13 @@ std::unique_ptr<PrefService> CreatePrefService() {
     return nullptr;
   }
   std::string app_key;
-  app_key.reserve(IM_EXT_MAX_APP_KEY_LENGTH);
-  if (installation_api->GetAppKey(app_key.data(), app_key.capacity()) ==
+  app_key.resize(IM_EXT_MAX_APP_KEY_LENGTH);
+  if (installation_api->GetAppKey(app_key.data(), app_key.size()) ==
       IM_EXT_ERROR) {
     LOG(ERROR) << "Failed to get app key.";
     return nullptr;
   }
+  app_key.resize(strlen(app_key.c_str()));
 
   LOG(INFO) << "Updater: prefs app_key=" << app_key;
   PrefServiceFactory pref_service_factory;

components/update_client/persisted_data.cc

@@ -102,6 +102,8 @@ std::string PersistedData::GetUpdaterChannel(const std::string& id) const {
   return GetString(id, "updaterchannel");
 }
 std::string PersistedData::GetLatestChannel() const {
+  if (!pref_service_)
+    return std::string();
   const base::Value::Dict* dict =
       &pref_service_->GetDict(kPersistedDataPreference);
   if (!dict)

media/mojo/clients/mojo_cdm.cc

@@ -435,8 +435,14 @@ void MojoCdm::OnMetricsReceived(
     uint32_t promise_id,
     const absl::optional<std::string>& metrics_string) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-  cdm_promise_adapter_.ResolvePromise(promise_id,
-      metrics_string.value_or(std::string()));
+  if (metrics_string) {
+    cdm_promise_adapter_.ResolvePromise(promise_id,
+                                        metrics_string.value_or(std::string()));
+  } else {
+    cdm_promise_adapter_.RejectPromise(
+        promise_id, CdmPromise::Exception::NOT_SUPPORTED_ERROR, 0,
+        "GetMetrics() is not supported.");
+  }
 }
 #endif  // BUILDFLAG(USE_STARBOARD_MEDIA)
 

starboard/contrib/rdk/src/third_party/starboard/rdk/shared/drm/drm_system_ocdm.cc

@@ -60,9 +60,13 @@ using OcdmGstSessionDecryptBufferFn =
 using OcdmGetMetricSystemDataFn =
   OpenCDMError(*)(struct OpenCDMSystem* system, uint32_t* bufferLength, uint8_t* buffer);
 
+using OcdmGetMetricsFn =
+  OpenCDMError(*)(struct OpenCDMSystem* system, std::string& buffer);
+
 static OcdmGstSessionDecryptExFn g_ocdmGstSessionDecryptEx { nullptr };
 static OcdmGstSessionDecryptBufferFn g_ocdmGstSessionDecryptBuffer { nullptr };
 static OcdmGetMetricSystemDataFn g_ocdmGetMetricSystemData { nullptr };
+static OcdmGetMetricsFn g_ocdmGetMetrics { nullptr };
 
 }  // namespace
 
@@ -552,6 +556,14 @@ DrmSystemOcdm::DrmSystemOcdm(
     } else {
       SB_LOG(INFO) << "No opencdm_get_metric_system_data.";
     }
+
+    g_ocdmGetMetrics = reinterpret_cast<OcdmGetMetricsFn>(
+        dlsym(RTLD_DEFAULT, "opencdm_get_metrics"));
+    if (g_ocdmGetMetrics) {
+      SB_LOG(INFO) << "Has opencdm_get_metrics";
+    } else {
+      SB_LOG(INFO) << "No opencdm_get_metrics.";
+    }
   });
 }
 
@@ -761,13 +773,14 @@ int DrmSystemOcdm::Decrypt(const std::string& id,
 }
 
 const void* DrmSystemOcdm::GetMetrics(int* size) {
-  if ( !g_ocdmGetMetricSystemData )
-    return nullptr;
 
   SB_CHECK(ocdm_system_ != nullptr);
 
   const int kMaxRetry = 5;
   for (int i = 0; i < kMaxRetry; ++i) {
+    if ( !g_ocdmGetMetricSystemData )
+      break;
+
     uint32_t buffer_length =  ( 1 << i ) * 4 * 1024;
 
     std::vector<uint8_t> tmp;
@@ -792,6 +805,24 @@ const void* DrmSystemOcdm::GetMetrics(int* size) {
     break;
   }
 
+  // Use `opencdm_get_metrics` when `opencdm_get_metric_system_data` fails to
+  // get mertics data. This is observed in RDK/Amlogic where
+  // `opencdm_get_metric_system_data` returns with error code
+  // `INTERFACE_NOT_IMPLEMENTED`.
+  if (g_ocdmGetMetrics && metrics_.size() == 0) {
+    std::string buffer;
+    auto rc = g_ocdmGetMetrics(ocdm_system_, buffer);
+    if (rc == ERROR_NONE) {
+      uint16_t buffer_length = buffer.size();
+      uint16_t out_length = (((buffer_length * 8) / 6) + 4) * sizeof(TCHAR);
+      metrics_.resize(out_length, '\0');
+      out_length = WPEFramework::Core::URL::Base64Encode(
+          reinterpret_cast<const uint8_t*>(buffer.data()), buffer_length,
+          reinterpret_cast<char*>(metrics_.data()), out_length, false);
+      metrics_.resize(out_length);
+    }
+  }
+
   *size = static_cast<int>(metrics_.size());
   return metrics_.data();
 }

third_party/musl/src/stdio/perror.c

@@ -2,22 +2,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include "build/build_config.h"
-#if !BUILDFLAG(ENABLE_COBALT_HERMETIC_HACKS)
 #include "stdio_impl.h"
-#endif // !BUILDFLAG(ENABLE_COBALT_HERMETIC_HACKS)
 
 void perror(const char *msg)
 {
-#if BUILDFLAG(ENABLE_COBALT_HERMETIC_HACKS)
-	// TODO: Explore ways to capture standard output and 
-	// standard error for testing. (b/425692168).
-
-	// Hack method to introduce the symbol into Chrobalt.
-	// Once the iobuffer has been implemented into Chrobalt, this
-	// hack method should be removed with a proper implementation.
-	printf("%s: %s", msg, strerror(errno));
-#else // BUILDFLAG(ENABLE_COBALT_HERMETIC_HACKS)
 	FILE *f = stderr;
 	char *errstr = strerror(errno);
 
@@ -40,5 +28,4 @@ void perror(const char *msg)
 	f->locale = old_locale;
 
 	FUNLOCK(f);
-#endif // BUILDFLAG(ENABLE_COBALT_HERMETIC_HACKS)
 }