[android] Support configuring maximum number of samples per write to …

…SbPlayer from webapp

1. Support maximum number of samples per write configuration from the h5vcc setting.
2. Enable this feature by the h5vcc settings of "EnableBatchedSampleWrite" and a positive value for "PlayerConfiguration.SetMaximumNumberOfSamplesPerWrite".

b/227837774

cobalt/media/base/sbplayer_pipeline.cc

@@ -104,7 +104,7 @@ SbPlayerPipeline::SbPlayerPipeline(
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     const GetDecodeTargetGraphicsContextProviderFunc&
         get_decode_target_graphics_context_provider_func,
-    bool allow_resume_after_suspend, bool allow_batched_sample_write,
+    bool allow_resume_after_suspend, int audio_batched_sample_write,
     bool force_punch_out_by_default,
 #if SB_API_VERSION >= 15
     TimeDelta audio_write_duration_local, TimeDelta audio_write_duration_remote,
@@ -116,7 +116,7 @@ SbPlayerPipeline::SbPlayerPipeline(
       sbplayer_interface_(interface),
       task_runner_(task_runner),
       allow_resume_after_suspend_(allow_resume_after_suspend),
-      allow_batched_sample_write_(allow_batched_sample_write),
+      audio_batched_sample_write_(audio_batched_sample_write),
       window_(window),
       get_decode_target_graphics_context_provider_func_(
           get_decode_target_graphics_context_provider_func),
@@ -1079,8 +1079,10 @@ void SbPlayerPipeline::OnNeedData(DemuxerStream::Type type,
     return;
   }
 
-  int max_buffers =
-      allow_batched_sample_write_ ? max_number_of_buffers_to_write : 1;
+  int max_buffers = audio_batched_sample_write_ > 1
+                        ? std::min(max_number_of_buffers_to_write,
+                                   audio_batched_sample_write_)
+                        : 1;
 
   if (GetReadInProgress(type)) return;
 

cobalt/media/base/sbplayer_pipeline.h

@@ -63,7 +63,7 @@ class MEDIA_EXPORT SbPlayerPipeline : public Pipeline,
                    const GetDecodeTargetGraphicsContextProviderFunc&
                        get_decode_target_graphics_context_provider_func,
                    bool allow_resume_after_suspend,
-                   bool allow_batched_sample_write,
+                   int audio_batched_sample_write,
                    bool force_punch_out_by_default,
 #if SB_API_VERSION >= 15
                    TimeDelta audio_write_duration_local,
@@ -217,8 +217,8 @@ class MEDIA_EXPORT SbPlayerPipeline : public Pipeline,
   // Whether we should save DecoderBuffers for resume after suspend.
   const bool allow_resume_after_suspend_;
 
-  // Whether we enable batched sample write functionality.
-  const bool allow_batched_sample_write_;
+  // Whether we allow batched sample write functionality.
+  const int audio_batched_sample_write_;
 
   // The default output mode passed to `SbPlayerGetPreferredOutputMode()`.
   SbPlayerOutputMode default_output_mode_ = kSbPlayerOutputModeInvalid;

cobalt/media/media_module.cc

@@ -185,10 +185,9 @@ class CanPlayTypeHandlerStarboard : public CanPlayTypeHandler {
 }  // namespace
 
 bool MediaModule::SetConfiguration(const std::string& name, int32 value) {
-  if (name == "EnableBatchedSampleWrite") {
-    allow_batched_sample_write_ = value;
-    LOG(INFO) << (allow_batched_sample_write_ ? "Enabling" : "Disabling")
-              << " batched sample write.";
+  if (name == "AudioBatchedSampleWrite") {
+    audio_batched_sample_write_ = value;
+    LOG(INFO) << "Set MaximumNumberOfSamplesPerWrite to " << value;
     return true;
   } else if (name == "ForcePunchOutByDefault") {
     force_punch_out_by_default_ = value;
@@ -235,7 +234,7 @@ std::unique_ptr<WebMediaPlayer> MediaModule::CreateWebMediaPlayer(
       base::Bind(&MediaModule::GetSbDecodeTargetGraphicsContextProvider,
                  base::Unretained(this)),
       client, this, options_.allow_resume_after_suspend,
-      allow_batched_sample_write_, force_punch_out_by_default_,
+      audio_batched_sample_write_, force_punch_out_by_default_,
 #if SB_API_VERSION >= 15
       audio_write_duration_local_, audio_write_duration_remote_,
 #endif  // SB_API_VERSION >= 15

cobalt/media/media_module.h

@@ -123,7 +123,7 @@ class MediaModule : public WebMediaPlayerFactory,
   Players players_;
   bool suspended_ = false;
 
-  bool allow_batched_sample_write_ = false;
+  int audio_batched_sample_write_ = 1;
   // When set to `false` (the default value), Cobalt calls
   // `SbPlayerGetPreferredOutputMode()` with `kSbPlayerOutputModeInvalid` when
   // there is no preference on output mode.

cobalt/media/player/web_media_player_impl.cc

@@ -109,7 +109,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
     const Pipeline::GetDecodeTargetGraphicsContextProviderFunc&
         get_decode_target_graphics_context_provider_func,
     WebMediaPlayerClient* client, WebMediaPlayerDelegate* delegate,
-    bool allow_resume_after_suspend, bool allow_batched_sample_write,
+    bool allow_resume_after_suspend, int audio_batched_sample_write,
     bool force_punch_out_by_default,
 #if SB_API_VERSION >= 15
     base::TimeDelta audio_write_duration_local,
@@ -123,7 +123,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       client_(client),
       delegate_(delegate),
       allow_resume_after_suspend_(allow_resume_after_suspend),
-      allow_batched_sample_write_(allow_batched_sample_write),
+      audio_batched_sample_write_(audio_batched_sample_write),
       force_punch_out_by_default_(force_punch_out_by_default),
       proxy_(new WebMediaPlayerProxy(task_runner_, this)),
       media_log_(media_log),
@@ -143,7 +143,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   pipeline_ = new SbPlayerPipeline(
       interface, window, pipeline_thread_.task_runner(),
       get_decode_target_graphics_context_provider_func,
-      allow_resume_after_suspend_, allow_batched_sample_write_,
+      allow_resume_after_suspend_, audio_batched_sample_write_,
       force_punch_out_by_default_,
 #if SB_API_VERSION >= 15
       audio_write_duration_local, audio_write_duration_remote,

cobalt/media/player/web_media_player_impl.h

@@ -111,7 +111,7 @@ class WebMediaPlayerImpl : public WebMediaPlayer,
                      WebMediaPlayerClient* client,
                      WebMediaPlayerDelegate* delegate,
                      bool allow_resume_after_suspend,
-                     bool allow_batched_sample_write,
+                     int audio_batched_sample_write,
                      bool force_punch_out_by_default,
 #if SB_API_VERSION >= 15
                      base::TimeDelta audio_write_duration_local,
@@ -300,7 +300,7 @@ class WebMediaPlayerImpl : public WebMediaPlayer,
   WebMediaPlayerClient* const client_;
   WebMediaPlayerDelegate* const delegate_;
   const bool allow_resume_after_suspend_;
-  const bool allow_batched_sample_write_;
+  const int audio_batched_sample_write_;
   const bool force_punch_out_by_default_;
   scoped_refptr<DecodeTargetProvider> decode_target_provider_;
 

starboard/shared/starboard/player/player_get_maximum_number_of_samples_per_write.cc

@@ -16,5 +16,5 @@
 
 int SbPlayerGetMaximumNumberOfSamplesPerWrite(SbPlayer player,
                                               SbMediaType sample_type) {
-  return 1;
+  return 256;
 }