[Decode] move lock from element to pSurface/ pBuffer

Signed-off-by: Xu, Zhengguo <[email protected]>
intel · Apr 23, 2024 · fcab0cd · fcab0cd
1 parent 78a4bc4
commit fcab0cd
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 68 deletions.
diff --git a/media_driver/linux/common/codec/ddi/media_ddi_decode_base.cpp b/media_driver/linux/common/codec/ddi/media_ddi_decode_base.cpp
@@ -994,6 +994,7 @@ VAStatus DdiMediaDecode::CreateBuffer(
     buf->uiOffset      = 0;
     buf->bCFlushReq    = false;
     buf->pMediaCtx     = m_ddiDecodeCtx->pMediaCtx;
+    buf->lock          = MOS_New(std::shared_timed_mutex);
 
     switch ((int32_t)type)
     {
@@ -1122,6 +1123,7 @@ VAStatus DdiMediaDecode::CreateBuffer(
     if(buf)
     {
         MOS_FreeMemory(buf->pData);
+        MOS_Delete(buf->lock);
         MOS_FreeMemory(buf);
     }
     return va;

diff --git a/media_driver/linux/common/codec/ddi/media_ddi_encode_base.cpp b/media_driver/linux/common/codec/ddi/media_ddi_encode_base.cpp
@@ -917,6 +917,7 @@ VAStatus DdiEncodeBase::CreateBuffer(
     buf->uiNumElements = elementsNum;
     buf->uiType        = type;
     buf->uiOffset      = 0;
+    buf->lock          = MOS_New(std::shared_timed_mutex);
 
     uint32_t bufSize = 0;
     uint32_t expectedSize = 0xffffffff;

diff --git a/media_driver/linux/common/codec/ddi/media_libva_decoder.cpp b/media_driver/linux/common/codec/ddi/media_libva_decoder.cpp
@@ -408,7 +408,7 @@ VAStatus DdiDecode_StatusReport(PDDI_MEDIA_CONTEXT mediaCtx, CodechalDecode *dec
                     (tempNewReport.m_codecStatus == CODECHAL_STATUS_INCOMPLETE)     ||
                     (tempNewReport.m_codecStatus == CODECHAL_STATUS_RESET))
                 {
-                    mediaCtx->pSurfaceHeap->lock.lock_shared();
+                    mediaCtx->pSurfaceHeap->lock->lock_shared();
                     PDDI_MEDIA_SURFACE_HEAP_ELEMENT mediaSurfaceHeapElmt = (PDDI_MEDIA_SURFACE_HEAP_ELEMENT)mediaCtx->pSurfaceHeap->pHeapBase;
 
                     uint32_t j = 0;
@@ -423,7 +423,7 @@ VAStatus DdiDecode_StatusReport(PDDI_MEDIA_CONTEXT mediaCtx, CodechalDecode *dec
                             break;
                         }
                     }
-                    mediaCtx->pSurfaceHeap->lock.unlock_shared();
+                    mediaCtx->pSurfaceHeap->lock->unlock_shared();
                 }
                 else
                 {
@@ -490,7 +490,7 @@ VAStatus DdiDecode_StatusReport(PDDI_MEDIA_CONTEXT mediaCtx, DecodePipelineAdapt
                     (tempNewReport.codecStatus == CODECHAL_STATUS_INCOMPLETE)   ||
                     (tempNewReport.codecStatus == CODECHAL_STATUS_RESET))
                 {
-                    mediaCtx->pSurfaceHeap->lock.lock_shared();
+                    mediaCtx->pSurfaceHeap->lock->lock_shared();
                     PDDI_MEDIA_SURFACE_HEAP_ELEMENT mediaSurfaceHeapElmt = (PDDI_MEDIA_SURFACE_HEAP_ELEMENT)mediaCtx->pSurfaceHeap->pHeapBase;
 
                     uint32_t j = 0;
@@ -505,7 +505,7 @@ VAStatus DdiDecode_StatusReport(PDDI_MEDIA_CONTEXT mediaCtx, DecodePipelineAdapt
                             break;
                         }
                     }
-                    mediaCtx->pSurfaceHeap->lock.unlock_shared();
+                    mediaCtx->pSurfaceHeap->lock->unlock_shared();
                 }
                 else
                 {