From 0fcef5168b4150e68e4e2ad6c919ca937e721691 Mon Sep 17 00:00:00 2001
From: "Pohsiang (John) Hsu" <pohhsu@microsoft.com>
Date: Thu, 5 Dec 2024 23:32:37 -0800
Subject: [PATCH] d3d12: log all the field of dpb buffer for better diagnostic,
 cosmetic space removal

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed by: Pohsiang (John) Hsu <pohhsu@microsoft.com>

Reviewed-by: Jesse Natalie <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33312>
---
 ...d12_video_encoder_references_manager_h264.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp
index 8843dcd814c..92b3a081db0 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp
@@ -127,7 +127,7 @@ d3d12_video_encoder_references_manager_h264::print_l0_l1_lists()
       }
 
       debug_printf("[D3D12 Video Encoder Picture Manager H264] L0 list (%d entries) for frame with POC %d - frame_num "
-                   "(%d) is: \n %s \n",
+                   "(%d) is: \n%s \n",
                    m_curFrameState.List0ReferenceFramesCount,
                    m_curFrameState.PictureOrderCountNumber,
                    m_curFrameState.FrameDecodingOrderNumber,
@@ -147,7 +147,7 @@ d3d12_video_encoder_references_manager_h264::print_l0_l1_lists()
       }
       debug_printf("[D3D12 Video Encoder Picture Manager H264] L0 modification list (%d entries) for frame with POC %d "
                    "- frame_num "
-                   "(%d) temporal_id (%d) is: \n %s \n",
+                   "(%d) temporal_id (%d) is: \n%s \n",
                    m_curFrameState.List0RefPicModificationsCount,
                    m_curFrameState.PictureOrderCountNumber,
                    m_curFrameState.FrameDecodingOrderNumber,
@@ -169,7 +169,7 @@ d3d12_video_encoder_references_manager_h264::print_l0_l1_lists()
       }
 
       debug_printf("[D3D12 Video Encoder Picture Manager H264] L1 list (%d entries) for frame with POC %d - frame_num "
-                   "(%d) is: \n %s \n",
+                   "(%d) is: \n%s \n",
                    m_curFrameState.List1ReferenceFramesCount,
                    m_curFrameState.PictureOrderCountNumber,
                    m_curFrameState.FrameDecodingOrderNumber,
@@ -190,7 +190,7 @@ d3d12_video_encoder_references_manager_h264::print_l0_l1_lists()
 
       debug_printf("[D3D12 Video Encoder Picture Manager H264] L1 modification list (%d entries) for frame with POC %d "
                    "- frame_num "
-                   "(%d) temporal_id (%d) is: \n %s \n",
+                   "(%d) temporal_id (%d) is: \n%s \n",
                    m_curFrameState.List1RefPicModificationsCount,
                    m_curFrameState.PictureOrderCountNumber,
                    m_curFrameState.FrameDecodingOrderNumber,
@@ -216,10 +216,16 @@ d3d12_video_encoder_references_manager_h264::print_dpb()
             dpbContents += " - CURRENT FRAME RECON PIC ";
          }
 
+         dpbContents += " - IsLongTermReference: ";
+         dpbContents += std::to_string(dpbDesc.IsLongTermReference);
+         dpbContents += " - LongTermPictureIdx: ";
+         dpbContents += std::to_string(dpbDesc.LongTermPictureIdx);
          dpbContents += " - POC: ";
          dpbContents += std::to_string(dpbDesc.PictureOrderCountNumber);
          dpbContents += " - FrameDecodingOrderNumber: ";
          dpbContents += std::to_string(dpbDesc.FrameDecodingOrderNumber);
+         dpbContents += " - TemporalLayerIndex: ";
+         dpbContents += std::to_string(dpbDesc.TemporalLayerIndex);
          dpbContents += " - DPBStorageIdx: ";
          dpbContents += std::to_string(dpbDesc.ReconstructedPictureResourceIndex);
          dpbContents += " - DPBStorageResourcePtr: ";
@@ -236,7 +242,7 @@ d3d12_video_encoder_references_manager_h264::print_dpb()
       }
 
       debug_printf("[D3D12 Video Encoder Picture Manager H264] DPB has %d frames - DPB references for frame with POC "
-                   "%d (frame_num: %d) are: \n %s \n",
+                   "%d (frame_num: %d) are: \n%s \n",
                    static_cast<UINT>(m_CurrentFrameReferencesData.pReferenceFramesReconPictureDescriptors.size()),
                    m_curFrameState.PictureOrderCountNumber,
                    m_curFrameState.FrameDecodingOrderNumber,