Bump version to 24.4.2

canonical · Nov 1, 2024 · 2147ca8 · 2147ca8
1 parent 8205ad5
commit 2147ca8
Show file tree

Hide file tree

Showing 59 changed files with 472 additions and 3,462 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 
 
 # Througout this project MFX_VERSION refers to uAPI version and MEDIA_VERSION refers to product version
-set(MEDIA_VERSION 24.3.4) # auto-update
+set(MEDIA_VERSION 24.4.2) # auto-update
 set(MEDIA_VERSION_STR "${MEDIA_VERSION}${MEDIA_VERSION_EXTRA}" CACHE STRING "" FORCE)
 
 if(CMAKE_SYSTEM_NAME MATCHES WindowsStore)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 Intel® Video Processing Library (Intel® VPL) GPU Runtime is a Runtime implementation of [Intel® VPL](https://github.com/intel/libvpl/)
 API for Intel Gen GPUs. Runtime provides access to hardware-accelerated video decode, encode and filtering.
 
-**Supported video encoders**: HEVC, AVC, MPEG-2, JPEG, VP9  
+**Supported video encoders**: HEVC, AVC, MPEG-2, JPEG, VP9, AV1  
 **Supported video decoders**: HEVC, AVC, VP8, VP9, MPEG-2, VC1, JPEG, AV1, VVC  
 **Supported video pre-processing filters**: Color Conversion, Deinterlace, Denoise, Resize, Rotate, Composition  
 
@@ -38,6 +38,7 @@ Intel® VPL Gen Runtime implementation supports the following hardware platforms
 - Alchemist(DG2)/ATSM
 - MTL/ARL (MTL: Meteor Lake, ARL-S/H: Arrow Lake)
 - LNL (Lunar Lake)
+- BMG (Battlemage)
 
 # Dependencies
 Intel® VPL GPU Runtime depends on [LibVA](https://github.com/intel/libva/).

diff --git a/_studio/mfx_lib/CMakeLists.txt b/_studio/mfx_lib/CMakeLists.txt
@@ -119,12 +119,14 @@ target_include_directories(mfxcore
   PUBLIC
     scheduler/include
     ${OPENCL_INCLUDE}
+    ${VULKAN_INCLUDE}
   )
 
 if (CMAKE_SYSTEM_NAME MATCHES Linux)
   target_include_directories(mfxcore
     PUBLIC
       scheduler/linux/include
+      ${VULKAN_INCLUDE}
   )
 endif()
 

diff --git a/_studio/mfx_lib/decode/CMakeLists.txt b/_studio/mfx_lib/decode/CMakeLists.txt
@@ -81,6 +81,7 @@ if (MFX_ENABLE_MJPEG_VIDEO_DECODE)
     ${MSDK_UMC_ROOT}/codec/color_space_converter/include
     mjpeg/include
     ${OPENCL_INCLUDE}
+    ${VULKAN_INCLUDE}
   )
 
   set(MJPEG_VIDEO_DECODE_SRC

diff --git a/_studio/mfx_lib/decode/av1/src/mfx_av1_dec_decode.cpp b/_studio/mfx_lib/decode/av1/src/mfx_av1_dec_decode.cpp
@@ -205,14 +205,9 @@ mfxStatus VideoDECODEAV1::Init(mfxVideoParam* par)
 
     m_init_par = (mfxVideoParamWrapper)(*par);
 
-    if (0 == m_init_par.mfx.FrameInfo.FrameRateExtN || 0 == m_init_par.mfx.FrameInfo.FrameRateExtD)
-    {
-        m_init_par.mfx.FrameInfo.FrameRateExtD = 1;
-        m_init_par.mfx.FrameInfo.FrameRateExtN = 30;
-    }
-
     m_first_par = m_init_par;
-    m_in_framerate = (mfxF64) m_first_par.mfx.FrameInfo.FrameRateExtD / m_first_par.mfx.FrameInfo.FrameRateExtN;
+    m_in_framerate = (m_first_par.mfx.FrameInfo.FrameRateExtD && m_first_par.mfx.FrameInfo.FrameRateExtN) ?
+        ((mfxF64) m_first_par.mfx.FrameInfo.FrameRateExtD / m_first_par.mfx.FrameInfo.FrameRateExtN) : (mfxF64)1.0 / 30;
     m_decoder->SetInFrameRate(m_in_framerate);
 
     //mfxFrameAllocResponse response{};
@@ -506,13 +501,9 @@ mfxStatus VideoDECODEAV1::Reset(mfxVideoParam* par)
 
     m_first_par = *par;
 
-    if (0 == m_first_par.mfx.FrameInfo.FrameRateExtN || 0 == m_first_par.mfx.FrameInfo.FrameRateExtD)
-    {
-        m_first_par.mfx.FrameInfo.FrameRateExtD = 1;
-        m_first_par.mfx.FrameInfo.FrameRateExtN = 30;
-    }
+    m_in_framerate = (m_first_par.mfx.FrameInfo.FrameRateExtD && m_first_par.mfx.FrameInfo.FrameRateExtN) ?
+        ((mfxF64)m_first_par.mfx.FrameInfo.FrameRateExtD / m_first_par.mfx.FrameInfo.FrameRateExtN) : (mfxF64)1.0 / 30;
 
-    m_in_framerate = (mfxF64) m_first_par.mfx.FrameInfo.FrameRateExtD / m_first_par.mfx.FrameInfo.FrameRateExtN;
     m_decoder->SetInFrameRate(m_in_framerate);
 
     return MFX_ERR_NONE;

diff --git a/_studio/mfx_lib/decode/h265/src/mfx_h265_dec_decode.cpp b/_studio/mfx_lib/decode/h265/src/mfx_h265_dec_decode.cpp
@@ -549,8 +549,8 @@ mfxStatus VideoDECODEH265::GetVideoParam(mfxVideoParam *par)
 
         if (!par->mfx.FrameInfo.FrameRateExtD && !par->mfx.FrameInfo.FrameRateExtN)
         {
-            par->mfx.FrameInfo.FrameRateExtN = 30;
-            par->mfx.FrameInfo.FrameRateExtD = 1;
+            par->mfx.FrameInfo.FrameRateExtN = 0;
+            par->mfx.FrameInfo.FrameRateExtD = 0;
         }
     }
 

diff --git a/_studio/mfx_lib/decode/mjpeg/include/mfx_mjpeg_dec_decode.h b/_studio/mfx_lib/decode/mjpeg/include/mfx_mjpeg_dec_decode.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2020 Intel Corporation
+// Copyright (c) 2004-2024 Intel Corporation
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -32,10 +32,6 @@
 
 #include <mutex>
 
-#ifdef MFX_ENABLE_JPEG_SW_FALLBACK
-#include <queue>
-#endif
-
 #include "mfx_task.h"
 #include "umc_media_data.h"
 
@@ -134,38 +130,6 @@ class VideoDECODEMJPEGBase_HW : public VideoDECODEMJPEGBase
     UMC::VideoAccelerator * m_va;
 };
 
-#ifdef MFX_ENABLE_JPEG_SW_FALLBACK
-// Forward declaration of used classes
-class CJpegTask;
-
-class VideoDECODEMJPEGBase_SW : public VideoDECODEMJPEGBase
-{
-public:
-    VideoDECODEMJPEGBase_SW();
-
-    mfxStatus Init(mfxVideoParam *decPar, mfxFrameAllocRequest *request, mfxFrameAllocResponse *response, mfxFrameAllocRequest *request_internal, bool isUseExternalFrames, VideoCORE *core) override;
-    mfxStatus Reset(mfxVideoParam *par) override;
-    mfxStatus Close(void) override;
-
-    mfxStatus GetVideoParam(mfxVideoParam *par) override;
-    mfxStatus RunThread(void *pParam, mfxU32 threadNumber, mfxU32 callNumber) override;
-    mfxStatus CompleteTask(void *pParam, mfxStatus taskRes) override;
-    mfxStatus CheckTaskAvailability(mfxU32 maxTaskNumber) override;
-    mfxStatus ReserveUMCDecoder(UMC::MJPEGVideoDecoderBaseMFX* &pMJPEGVideoDecoder, mfxFrameSurface1 *surf) override;
-    void ReleaseReservedTask() override;
-    mfxStatus AddPicture(UMC::MediaDataEx *pSrcData, mfxU32 & numPic) override;
-    mfxStatus AllocateFrameData(UMC::FrameData *&data) override;
-    mfxStatus FillEntryPoint(MFX_ENTRY_POINT *pEntryPoint, mfxFrameSurface1 *surface_work, mfxFrameSurface1 *surface_out) override;
-
-protected:
-    CJpegTask *pLastTask;
-    // Free tasks queue (if SW is used)
-    std::queue<std::unique_ptr<CJpegTask>> m_freeTasks;
-    // Count of created tasks (if SW is used)
-    mfxU16  m_tasksCount;
-};
-#endif
-
 class VideoDECODEMJPEG : public VideoDECODE
 {
 public: