Merge branch 'main' into adderrno

Change-Id: Ief096ab442426afcf2622b5d5920685b35469712
youtube · Apr 11, 2024 · ac0476c · ac0476c
2 parents e3878c1 + c606f38
commit ac0476c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/cobalt/site/docker/Dockerfile b/cobalt/site/docker/Dockerfile
@@ -13,11 +13,12 @@
 # limitations under the License.
 
 ARG FROM_IMAGE
-FROM ${FROM_IMAGE:-gcr.io/cloud-marketplace-containers/google/debian10}
+FROM ${FROM_IMAGE:-gcr.io/cloud-marketplace-containers/google/debian11}
 
 RUN apt update -qqy \
     && apt install -qqy --no-install-recommends \
         curl \
+        ca-certificates \
         doxygen \
         git \
         python3 \

diff --git a/starboard/android/shared/player_components_factory.h b/starboard/android/shared/player_components_factory.h
@@ -227,7 +227,8 @@ class PlayerComponentsFactory : public starboard::shared::starboard::player::
     }
 
     bool enable_flush_during_seek = false;
-    if (!creation_parameters.video_mime().empty()) {
+    if (creation_parameters.video_codec() != kSbMediaVideoCodecNone &&
+        !creation_parameters.video_mime().empty()) {
       MimeType video_mime_type(creation_parameters.video_mime());
       if (video_mime_type.ValidateBoolParameter("enableflushduringseek")) {
         enable_flush_during_seek =
@@ -510,7 +511,8 @@ class PlayerComponentsFactory : public starboard::shared::starboard::player::
       std::string* error_message) {
     bool force_big_endian_hdr_metadata = false;
     bool enable_flush_during_seek = false;
-    if (!creation_parameters.video_mime().empty()) {
+    if (creation_parameters.video_codec() != kSbMediaVideoCodecNone &&
+        !creation_parameters.video_mime().empty()) {
       // Use mime param to determine endianness of HDR metadata. If param is
       // missing or invalid it defaults to Little Endian.
       MimeType video_mime_type(creation_parameters.video_mime());

diff --git a/starboard/nplb/posix_compliance/posix_socket_errno_test.cc b/starboard/nplb/posix_compliance/posix_socket_errno_test.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <errno.h>
+#include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -25,7 +26,7 @@ namespace nplb {
 namespace {
 
 TEST(PosixErrnoTest, CreateInvalidSocket) {
-  EXPECT_FALSE(socket(-1, SOCK_STREAM, 0) == 0);
+  EXPECT_FALSE(socket(-1, SOCK_STREAM, IPPROTO_TCP) == 0);
   EXPECT_TRUE(errno == EAFNOSUPPORT);
   SB_DLOG(INFO) << "Failed to create invalid socket, errno = "
                 << strerror(errno);
@@ -40,7 +41,7 @@ TEST(PosixErrnoTest, AcceptInvalidSocket) {
 }
 
 TEST(PosixErrnoTest, ConnectUnavailableAddress) {
-  int socket_fd = socket(AF_INET, SOCK_STREAM, 0);
+  int socket_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
   ASSERT_TRUE(socket_fd > 0);
 
   sockaddr_in6 address = {};

diff --git a/starboard/shared/win32/posix_emu/socket.cc b/starboard/shared/win32/posix_emu/socket.cc
@@ -222,7 +222,6 @@ static void set_errno() {
       break;
   }
 
-  _set_errno(0);
   _set_errno(sockError);
   SB_DLOG(INFO) << "Encounter socket error: " << sockError;
 }