From a2dfa8bc26a082d7fe110abf6b1fe19edb6c6642 Mon Sep 17 00:00:00 2001
From: jeffqjiangNew <142832361+jeffqjiangNew@users.noreply.github.com>
Date: Fri, 8 Dec 2023 17:53:01 -0500
Subject: [PATCH] * rocDecode: Fix for the performance regression introduced by
 PR#114. (#128)

- Skip the additional buffer bumping specified in process C.5.2.2., to avoid synchronous job submission in some cases.
  - Increase DPB buffer size now by 2 to avoid overwriting pictures to be output.
---
 src/parser/hevc_parser.cpp | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/parser/hevc_parser.cpp b/src/parser/hevc_parser.cpp
index b8326de318..1bc03105ce 100644
--- a/src/parser/hevc_parser.cpp
+++ b/src/parser/hevc_parser.cpp
@@ -1595,8 +1595,8 @@ bool HEVCVideoParser::ParseSliceHeader(uint8_t *nalu, size_t size) {
     if (m_active_sps_id_ != pps_ptr->pps_seq_parameter_set_id) {
         m_active_sps_id_ = pps_ptr->pps_seq_parameter_set_id;
         sps_ptr = &m_sps_[m_active_sps_id_];
-        // Re-set DPB size. We add one addition buffer to avoid serialization of decode submission and display callback in certain cases.
-        dpb_buffer_.dpb_size = sps_ptr->sps_max_dec_pic_buffering_minus1[sps_ptr->sps_max_sub_layers_minus1] + 2;
+        // Re-set DPB size. We add 2 addition buffers to avoid overwritting buffer needed for output in certain cases.
+        dpb_buffer_.dpb_size = sps_ptr->sps_max_dec_pic_buffering_minus1[sps_ptr->sps_max_sub_layers_minus1] + 3;
         new_sps_activated_ = true;  // Note: clear this flag after the actions are taken.
     }
     sps_ptr = &m_sps_[m_active_sps_id_];
@@ -1607,8 +1607,8 @@ bool HEVCVideoParser::ParseSliceHeader(uint8_t *nalu, size_t size) {
         pic_width_ = sps_ptr->pic_width_in_luma_samples;
         pic_height_ = sps_ptr->pic_height_in_luma_samples;
         // Take care of the case where a new SPS replaces the old SPS with the same id but with different dimensions
-        // Re-set DPB size. We add one addition buffer to avoid serialization of decode submission and display callback in certain cases.
-        dpb_buffer_.dpb_size = sps_ptr->sps_max_dec_pic_buffering_minus1[sps_ptr->sps_max_sub_layers_minus1] + 2;
+        // Re-set DPB size. We add 2 addition buffers to avoid overwritting buffer needed for output in certain cases.
+        dpb_buffer_.dpb_size = sps_ptr->sps_max_dec_pic_buffering_minus1[sps_ptr->sps_max_sub_layers_minus1] + 3;
         new_sps_activated_ = true;  // Note: clear this flag after the actions are taken.
     }
 
@@ -2344,16 +2344,7 @@ int HEVCVideoParser::FindFreeBufAndMark() {
     }
     dpb_buffer_.dpb_fullness++;
 
-    SpsData *sps_ptr = &m_sps_[m_active_sps_id_];
-    uint32_t highest_tid = sps_ptr->sps_max_sub_layers_minus1; // HighestTid
-    uint32_t max_num_reorder_pics = sps_ptr->sps_max_num_reorder_pics[highest_tid];
-
-    while (dpb_buffer_.num_needed_for_output > max_num_reorder_pics) {
-        if (BumpPicFromDpb() != PARSER_OK) {
-            return PARSER_FAIL;
-        }
-    }
-
+    // Skip the additional bumping to avoid synchronous job submission
     // Skip SpsMaxLatencyPictures check as SpsMaxLatencyPictures >= sps_max_num_reorder_pics.
 
     return PARSER_OK;