From ddded3a6d2d2e7b1a339fd5a1f1b70bdcc1a3c42 Mon Sep 17 00:00:00 2001
From: Rajy Rawther <Rajy.MeeyakhanRawther@amd.com>
Date: Mon, 13 Nov 2023 09:22:22 -0800
Subject: [PATCH] added picture_index associated with frame and fixed bug (#56)

---
 utils/rocvideodecode/roc_video_dec.cpp | 4 +++-
 utils/rocvideodecode/roc_video_dec.h   | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/utils/rocvideodecode/roc_video_dec.cpp b/utils/rocvideodecode/roc_video_dec.cpp
index ee62592390..32b467c100 100644
--- a/utils/rocvideodecode/roc_video_dec.cpp
+++ b/utils/rocvideodecode/roc_video_dec.cpp
@@ -482,6 +482,7 @@ int RocVideoDecoder::HandlePictureDisplay(RocdecParserDispInfo *pDispInfo) {
         DecFrameBuffer dec_frame = { 0 };
         dec_frame.frame_ptr = (uint8_t *)(src_dev_ptr[0]);
         dec_frame.pts = pDispInfo->pts;
+        dec_frame.picture_index = pDispInfo->picture_index;
         std::lock_guard<std::mutex> lock(mtx_vp_frame_);
         vp_frames_q_.push(dec_frame);
         decoded_frame_cnt_++;
@@ -504,6 +505,7 @@ int RocVideoDecoder::HandlePictureDisplay(RocdecParserDispInfo *pDispInfo) {
                     dec_frame.frame_ptr = new uint8_t[GetFrameSize()];
                 }
                 dec_frame.pts = pDispInfo->pts;
+                dec_frame.picture_index = pDispInfo->picture_index;
                 vp_frames_.push_back(dec_frame);
             }
             p_dec_frame = vp_frames_[decoded_frame_cnt_ - 1].frame_ptr;
@@ -592,7 +594,7 @@ int RocVideoDecoder::GetSEIMessage(RocdecSeiMessageInfo *pSEIMessageInfo) {
 
 int RocVideoDecoder::DecodeFrame(const uint8_t *data, size_t size, int pkt_flags, int64_t pts) {
     if (data && size) {
-        int decoded_frame_cnt_ = 0, decoded_frame_cnt_ret_ = 0;
+        decoded_frame_cnt_ = 0, decoded_frame_cnt_ret_ = 0;
         RocdecSourceDataPacket packet = { 0 };
         packet.payload = data;
         packet.payload_size = size;
diff --git a/utils/rocvideodecode/roc_video_dec.h b/utils/rocvideodecode/roc_video_dec.h
index 6281a568e3..1bdce4d57a 100644
--- a/utils/rocvideodecode/roc_video_dec.h
+++ b/utils/rocvideodecode/roc_video_dec.h
@@ -111,8 +111,9 @@ static inline int align(int value, int alignment) {
 }
 
 typedef struct DecFrameBuffer_ {
-    uint8_t *frame_ptr;      /**< device memory pointer for the decoded frame */
-    int64_t  pts;          // timestamp
+    uint8_t *frame_ptr;       /**< device memory pointer for the decoded frame */
+    int64_t  pts;             /**<  timestamp for the decoded frame */
+    int picture_index;         /**<  surface index for the decoded frame */
 } DecFrameBuffer;