Cherry pick PR #787: [XB] Workaround to fix memory issue for Xbox One…

… X (#957) "Refer to the original PR: #787" Co-authored-by: iuriionishchenko <[email protected]>
youtube · Jul 31, 2023 · 5c4daaa · 5c4daaa
1 parent 0f1aa3b
commit 5c4daaa
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/starboard/shared/win32/video_decoder.cc b/starboard/shared/win32/video_decoder.cc
@@ -476,8 +476,9 @@ void VideoDecoder::InitializeCodec() {
 
   ComPtr<IMFAttributes> attributes = transform->GetAttributes();
   SB_DCHECK(attributes);
-  CheckResult(attributes->SetUINT32(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT,
-                                    kMaxOutputSamples));
+  CheckResult(
+      attributes->SetUINT32(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT,
+                            static_cast<UINT32>(GetMaxNumberOfCachedFrames())));
 
   UpdateVideoArea(transform->GetCurrentOutputType());
 
@@ -716,7 +717,7 @@ void VideoDecoder::DecoderThreadRun() {
       // MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT.
       thread_lock_.Acquire();
       bool input_full = thread_events_.size() >= kMaxInputSamples;
-      bool output_full = thread_outputs_.size() >= kMaxOutputSamples;
+      bool output_full = thread_outputs_.size() >= GetMaxNumberOfCachedFrames();
       thread_lock_.Release();
 
       Status status = input_full ? kBufferFull : kNeedMoreInput;

diff --git a/starboard/xb1/shared/video_decoder_uwp.cc b/starboard/xb1/shared/video_decoder_uwp.cc
@@ -29,6 +29,8 @@ namespace starboard {
 namespace xb1 {
 namespace shared {
 
+const int kXboxeOneXMaxOutputSamples = 5;
+
 VideoDecoderUwp::~VideoDecoderUwp() {
   if (IsHdrSupported() && IsHdrAngleModeEnabled()) {
     SetHdrAngleModeEnabled(false);
@@ -78,6 +80,17 @@ bool VideoDecoderUwp::TryUpdateOutputForHdrVideo(
   return true;
 }
 
+size_t VideoDecoderUwp::GetPrerollFrameCount() {
+  return GetMaxNumberOfCachedFrames();
+}
+
+size_t VideoDecoderUwp::GetMaxNumberOfCachedFrames() {
+  return (::starboard::shared::uwp::kXboxOneX ==
+          ::starboard::shared::uwp::GetXboxType())
+             ? kXboxeOneXMaxOutputSamples
+             : ::starboard::shared::win32::VideoDecoder::GetPrerollFrameCount();
+}
+
 }  // namespace shared
 }  // namespace xb1
 }  // namespace starboard
diff --git a/starboard/xb1/shared/video_decoder_uwp.h b/starboard/xb1/shared/video_decoder_uwp.h
@@ -17,6 +17,7 @@
 
 #include "starboard/shared/starboard/media/media_util.h"
 #include "starboard/shared/uwp/application_uwp.h"
+#include "starboard/shared/uwp/xb1_get_type.h"
 #include "starboard/shared/win32/video_decoder.h"
 
 namespace starboard {
@@ -48,6 +49,9 @@ class VideoDecoderUwp : public ::starboard::shared::win32::VideoDecoder {
 
   bool TryUpdateOutputForHdrVideo(const VideoStreamInfo& stream_info) override;
 
+  size_t GetPrerollFrameCount() const override;
+  size_t GetMaxNumberOfCachedFrames() const override;
+
  private:
   SbMediaColorMetadata current_color_metadata_ = {};
   bool is_first_input_ = true;