[media] Limit max number of buffers to write with audio write ahead

b/227837774
youtube · May 16, 2024 · d2226ce · d2226ce
1 parent c291e10
commit d2226ce
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/cobalt/media/base/sbplayer_pipeline.cc b/cobalt/media/base/sbplayer_pipeline.cc
@@ -1049,6 +1049,8 @@ void SbPlayerPipeline::OnDemuxerStreamRead(
     for (const auto& buffer : buffers) {
       playback_statistics_.OnAudioAU(buffer);
       if (!buffer->end_of_stream()) {
+        last_audio_sample_interval_ =
+            buffer->timestamp() - timestamp_of_last_written_audio_;
         timestamp_of_last_written_audio_ = buffer->timestamp();
       }
     }
@@ -1118,6 +1120,25 @@ void SbPlayerPipeline::OnNeedData(DemuxerStream::Type type,
         audio_read_delayed_ = true;
         return;
       }
+      // LOG(ERROR) << "Brown test done " << time_ahead_of_playback;
+      max_buffers =
+          std::min(max_buffers, GetEstimatedMaxBuffers(adjusted_write_duration,
+                                                       time_ahead_of_playback));
+    } else {
+      max_buffers =
+          std::min(max_buffers,
+                   GetEstimatedMaxBuffers(
+                       AdjustWriteDurationForPlaybackRate(
+                           audio_write_duration_for_preroll_, playback_rate_),
+                       timestamp_of_last_written_audio_ - seek_time_));
+      /*LOG(ERROR) << "Brown max_buffers " << max_buffers
+                 << " " <<
+         AdjustWriteDurationForPlaybackRate(audio_write_duration_for_preroll_,
+         playback_rate_)
+                 << " " << (timestamp_of_last_written_audio_ - seek_time_)
+                 << " " <<
+         (AdjustWriteDurationForPlaybackRate(audio_write_duration_for_preroll_,
+         playback_rate_) + kMediaTimeCheckInterval);*/
     }
 
     audio_read_delayed_ = false;
@@ -1135,6 +1156,26 @@ void SbPlayerPipeline::OnNeedData(DemuxerStream::Type type,
                               type, max_buffers));
 }
 
+int SbPlayerPipeline::GetEstimatedMaxBuffers(TimeDelta write_duration,
+                                             TimeDelta time_ahead_of_playback) {
+  int estimated_max_buffers = 1;
+  if (!last_audio_sample_interval_.is_zero()) {
+    TimeDelta time_allow_to_write = write_duration - time_ahead_of_playback;
+    estimated_max_buffers = time_allow_to_write.InMillisecondsRoundedUp() /
+                                last_audio_sample_interval_.InMilliseconds() +
+                            1;
+    /*LOG(ERROR) << "time_allow_to_write " << time_allow_to_write
+               << " " << last_audio_sample_interval_
+               << " " << time_ahead_of_playback
+               << " " << write_duration
+               << " " << estimated_max_buffers
+               << " " << (time_allow_to_write.InMillisecondsF() /
+       last_audio_sample_interval_.InMillisecondsF());*/
+  }
+  return allow_batched_sample_write_ ? estimated_max_buffers : 1;
+}
+
+
 void SbPlayerPipeline::OnPlayerStatus(SbPlayerState state) {
   DCHECK(task_runner_->RunsTasksInCurrentSequence());
 

diff --git a/cobalt/media/base/sbplayer_pipeline.h b/cobalt/media/base/sbplayer_pipeline.h
@@ -203,6 +203,9 @@ class MEDIA_EXPORT SbPlayerPipeline : public Pipeline,
   void SetReadInProgress(::media::DemuxerStream::Type type, bool in_progress);
   bool GetReadInProgress(::media::DemuxerStream::Type type) const;
 
+  int GetEstimatedMaxBuffers(TimeDelta write_duration,
+                             TimeDelta time_ahead_of_playback);
+
   // An identifier string for the pipeline, used in CVal to identify multiple
   // pipelines.
   const std::string pipeline_identifier_;
@@ -345,6 +348,7 @@ class MEDIA_EXPORT SbPlayerPipeline : public Pipeline,
   // Indicates if video end of stream has been written into the underlying
   // player.
   bool is_video_eos_written_ = false;
+  TimeDelta last_audio_sample_interval_ = TimeDelta::FromMicroseconds(0);
 
   // Last media time reported by GetMediaTime().
   base::CVal<TimeDelta> last_media_time_;

diff --git a/cobalt/media/media_module.h b/cobalt/media/media_module.h
@@ -123,7 +123,7 @@ class MediaModule : public WebMediaPlayerFactory,
   Players players_;
   bool suspended_ = false;
 
-  bool allow_batched_sample_write_ = false;
+  bool allow_batched_sample_write_ = true;
   // When set to `false` (the default value), Cobalt calls
   // `SbPlayerGetPreferredOutputMode()` with `kSbPlayerOutputModeInvalid` when
   // there is no preference on output mode.

diff --git a/starboard/shared/starboard/player/player_get_maximum_number_of_samples_per_write.cc b/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 64;
 }