Add free logic of picParams->pDeltaQp for avoiding memory leak.

Fixes intel#611. Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
wangyan42164 · May 21, 2019 · 69470ed · 69470ed
1 parent f39c5dc
commit 69470ed
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/media_driver/linux/common/codec/ddi/media_ddi_encode_avc.cpp b/media_driver/linux/common/codec/ddi/media_ddi_encode_avc.cpp
@@ -2066,3 +2066,14 @@ uint32_t DdiEncodeAvc::getQMatrixBufferSize()
 {
     return sizeof(VAIQMatrixBufferH264);
 }
+
+void DdiEncodeAvc::ClearPicParams()
+{
+    uint8_t ppsIdx = ((PCODEC_AVC_ENCODE_SLICE_PARAMS)(m_encodeCtx->pSliceParams))->pic_parameter_set_id;
+    PCODEC_AVC_ENCODE_PIC_PARAMS  picParams = (PCODEC_AVC_ENCODE_PIC_PARAMS)m_encodeCtx->pPicParams + ppsIdx;
+
+    if (picParams != nullptr && picParams->pDeltaQp != nullptr)
+    {
+        MOS_FreeMemory(picParams->pDeltaQp);
+    }
+}
diff --git a/media_driver/linux/common/codec/ddi/media_ddi_encode_avc.h b/media_driver/linux/common/codec/ddi/media_ddi_encode_avc.h
@@ -180,6 +180,8 @@ class DdiEncodeAvc : public DdiEncodeBase
         DDI_MEDIA_CONTEXT *mediaCtx,
         void              *ptr);
 
+    virtual void ClearPicParams() override;
+
     //!
     //! \brief    Convert slice struct from VA to codechal
     //! \details  Convert slice struct from VA to codechal

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
@@ -75,6 +75,7 @@ VAStatus DdiEncodeBase::EndPicture(
     DDI_CHK_NULL(mediaCtx, "Null mediaCtx", VA_STATUS_ERROR_INVALID_CONTEXT);
 
     VAStatus status = EncodeInCodecHal(m_encodeCtx->dwNumSlices);
+    ClearPicParams();
     if (VA_STATUS_SUCCESS != status)
     {
         DDI_ASSERTMESSAGE("DDI:DdiEncode_EncodeInCodecHal return failure.");
@@ -1354,3 +1355,7 @@ uint32_t DdiEncodeBase::getQMatrixBufferSize()
 {
     return 0xffffffff;
 }
+
+void DdiEncodeBase::ClearPicParams()
+{
+}
diff --git a/media_driver/linux/common/codec/ddi/media_ddi_encode_base.h b/media_driver/linux/common/codec/ddi/media_ddi_encode_base.h
@@ -306,6 +306,14 @@ class DdiEncodeBase : public DdiMediaBase
         DDI_MEDIA_CONTEXT *mediaCtx,
         void *             ptr) = 0;
 
+    //!
+    //! \brief    Clear picture params
+    //! \details  Clear picture params called by EndPicture
+    //!
+    //! \return   void
+    //!
+    virtual void ClearPicParams();
+
     //!
     //! \brief    get Slice Parameter Buffer Size
     //!