youtube · antoniori-eng · Mar 26, 2024 · Dec 15, 2023 · Dec 15, 2023 · Jan 9, 2024
diff --git a/starboard/nplb/player_test_util.cc b/starboard/nplb/player_test_util.cc
@@ -41,20 +41,36 @@ using std::placeholders::_3;
 using std::placeholders::_4;
 using testing::FakeGraphicsContextProvider;
 
-const char* kAudioTestFiles[] = {"beneath_the_canopy_aac_stereo.dmp",
-                                 "beneath_the_canopy_opus_stereo.dmp",
-                                 "sintel_329_ec3.dmp", "sintel_381_ac3.dmp"};
+const char* kAudioTestFiles[] = {
+    "beneath_the_canopy_aac_stereo.dmp",
+    "beneath_the_canopy_opus_stereo.dmp",
+    "sintel_329_ec3.dmp",
+    "sintel_381_ac3.dmp",
+};
 
 // For uncommon audio formats, we add audio only tests, without tests combined
 // with a video stream, to shorten the overall test time.
 const char* kAudioOnlyTestFiles[] = {
-    "beneath_the_canopy_aac_5_1.dmp", "beneath_the_canopy_aac_mono.dmp",
-    "beneath_the_canopy_opus_5_1.dmp", "beneath_the_canopy_opus_mono.dmp",
-    "heaac.dmp"};
-
-const char* kVideoTestFiles[] = {"beneath_the_canopy_137_avc.dmp",
-                                 "beneath_the_canopy_248_vp9.dmp",
-                                 "sintel_399_av1.dmp"};
+    "beneath_the_canopy_aac_5_1.dmp",
+    "beneath_the_canopy_aac_mono.dmp",
+    "beneath_the_canopy_opus_5_1.dmp",
+    "beneath_the_canopy_opus_mono.dmp",
+    "heaac.dmp",
+#if SB_API_VERSION >= 14
+    "sintel_5s_flac.dmp",
+    "sintel_5s_mp3.dmp",
+    "sintel_5s_pcm_s16le.dmp",
+#endif  // SB_API_VERSION >= 14
+    "sintel_5s_vorbis.dmp",
+};
+
+const char* kVideoTestFiles[] = {
+    "beneath_the_canopy_137_avc.dmp",
+    "beneath_the_canopy_248_vp9.dmp",
+    "sintel_399_av1.dmp",
+    "sintel_5s_vp8.dmp",
+    "sintel_5s_hevc.dmp",
+};
 
 const SbPlayerOutputMode kOutputModes[] = {kSbPlayerOutputModeDecodeToTexture,
                                            kSbPlayerOutputModePunchOut};

diff --git a/starboard/shared/starboard/player/testdata/licences/README b/starboard/shared/starboard/player/testdata/licences/README
@@ -1,9 +1,11 @@
 Test Data License
 
-"sintel_329_ec3.dmp", "sintel_381_ac3.dmp" and "sintel_399_av1.dmp" are included
-as test files, under the Creative Commons 3.0 Attribution license. "Sintel" is
-an independently produced short film, initiated by the Blender Foundation as a
-means to further improve and validate the free/open source 3D creation suite
-Blender.
+"sintel_329_ec3.dmp", "sintel_381_ac3.dmp", "sintel_399_av1.dmp",
+"sintel_5s_flac.dmp", "sintel_5s_hevc.dmp", "sintel_5s_mp3.dmp",
+"sintel_5s_pcm_s16le.dmp", "sintel_5s_vorbis.dmp", and "sintel_5s_vp8.dmp" are
+included as test files, under the Creative Commons 3.0 Attribution license.
+"Sintel" is an independently produced short film, initiated by the Blender
+Foundation as a means to further improve and validate the free/open source 3D
+creation suite Blender.
 
 Sintel © copyright Blender Foundation | durian.blender.org
diff --git a/starboard/shared/starboard/player/testdata/sha1_files.gni b/starboard/shared/starboard/player/testdata/sha1_files.gni
@@ -29,6 +29,12 @@ sha1_files = [
   "sintel_329_ec3.dmp.sha1",
   "sintel_381_ac3.dmp.sha1",
   "sintel_399_av1.dmp.sha1",
+  "sintel_5s_flac.dmp.sha1",
+  "sintel_5s_hevc.dmp.sha1",
+  "sintel_5s_mp3.dmp.sha1",
+  "sintel_5s_pcm_s16le.dmp.sha1",
+  "sintel_5s_vorbis.dmp.sha1",
+  "sintel_5s_vp8.dmp.sha1",
   "vertical_4k_30_fps_313_vp9.dmp.sha1",
   "vertical_8k_30_fps_571_av1.dmp.sha1",
   "vertical_1080p_30_fps_137_avc.dmp.sha1",

diff --git a/starboard/shared/starboard/player/testdata/sintel_5s_flac.dmp.sha1 b/starboard/shared/starboard/player/testdata/sintel_5s_flac.dmp.sha1
@@ -0,0 +1 @@
+51bb41dc8a9ff8fc1c98e2e142b454e5b372b19a
diff --git a/starboard/shared/starboard/player/testdata/sintel_5s_hevc.dmp.sha1 b/starboard/shared/starboard/player/testdata/sintel_5s_hevc.dmp.sha1
@@ -0,0 +1 @@
+ed556cdaf9ebbc551a2df329118f8d284b549786
diff --git a/starboard/shared/starboard/player/testdata/sintel_5s_mp3.dmp.sha1 b/starboard/shared/starboard/player/testdata/sintel_5s_mp3.dmp.sha1
@@ -0,0 +1 @@
+b695568bfbda4883d1349b4f16da003d8f235ad0
diff --git a/starboard/shared/starboard/player/testdata/sintel_5s_pcm_s16le.dmp.sha1 b/starboard/shared/starboard/player/testdata/sintel_5s_pcm_s16le.dmp.sha1
@@ -0,0 +1 @@
+efec3b1eea57a3001c77517ce20bd8bbdd82973c
diff --git a/starboard/shared/starboard/player/testdata/sintel_5s_vorbis.dmp.sha1 b/starboard/shared/starboard/player/testdata/sintel_5s_vorbis.dmp.sha1
@@ -0,0 +1 @@
+62f5c2d1a6c56ea8fbeb7665ea2aaff23d327d8b
diff --git a/starboard/shared/starboard/player/testdata/sintel_5s_vp8.dmp.sha1 b/starboard/shared/starboard/player/testdata/sintel_5s_vp8.dmp.sha1
@@ -0,0 +1 @@
+58b500e3a6d2ccda0bdfd2e2af5a3193b38d9847
diff --git a/starboard/shared/starboard/player/video_dmp_reader.cc b/starboard/shared/starboard/player/video_dmp_reader.cc
@@ -150,8 +150,22 @@
     case kSbMediaAudioCodecEac3:
       ss << "audio/mp4; codecs=\"ec-3\";";
       break;
+    case kSbMediaAudioCodecVorbis:
+      ss << "audio/webm; codecs=\"vorbis\";";
+      break;
+#if SB_API_VERSION >= 14
+    case kSbMediaAudioCodecMp3:
+      ss << "audio/mpeg; codecs=\"mp3\";";
+      break;
+    case kSbMediaAudioCodecFlac:
+      ss << "audio/ogg; codecs=\"flac\";";
+      break;
+    case kSbMediaAudioCodecPcm:
+      ss << "audio/wav; codecs=\"1\";";
+      break;
+#endif  // SB_API_VERSION >= 14
     default:
-      SB_NOTREACHED();
+      SB_NOTREACHED() << "Unsupported audio codec: " << dmp_info_.audio_codec;
   }
 
   ss << " channels="
@@ -175,8 +189,14 @@
     case kSbMediaVideoCodecAv1:
       ss << "video/mp4; codecs=\"av01.0.08M.08\";";
       break;
+    case kSbMediaVideoCodecVp8:
+      ss << "video/webm; codecs=\"vp8\";";
+      break;
+    case kSbMediaVideoCodecH265:
+      ss << "video/mp4; codecs=\"hev1.1.6.L123.B0\";";
+      break;
     default:
-      SB_NOTREACHED();
+      SB_NOTREACHED() << "Unsupported video codec: " << dmp_info_.video_codec;
   }
   if (number_of_video_buffers() > 0) {
     const auto& video_stream_info = this->video_stream_info();