4369ドライバでエンコードできない問題を修正。 ( #114 )

rigaya · May 18, 2023 · e81e47a · e81e47a
1 parent e640c5b
commit e81e47a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/QSVEnc/QSVEnc_readme.txt b/QSVEnc/QSVEnc_readme.txt
@@ -313,7 +313,10 @@ API v1.1  … Intel Media SDK v2.0
 
 
 【どうでもいいメモ】
-2023.05.14 (7.25)
+2023.05.18 (7.41)
+- 4369ドライバでエンコードできない問題を修正。
+
+2023.05.14 (7.40)
 [QSVEncC]
 - dshowのカメラ入力等に対応。
 - --audio-source, --sub-sourceのコマンドラインの区切りを変更。

diff --git a/QSVPipeline/qsv_pipeline.cpp b/QSVPipeline/qsv_pipeline.cpp
@@ -1100,7 +1100,8 @@ RGY_ERR CQSVPipeline::InitMfxEncodeParams(sInputParams *pInParams, std::vector<s
     }
 
 
-    if (check_lib_version(m_mfxVer, MFX_LIB_VERSION_2_9)) {
+    if (check_lib_version(m_mfxVer, MFX_LIB_VERSION_2_9)
+        && pInParams->tuneQuality != MFX_ENCODE_TUNE_DEFAULT) {
         INIT_MFX_EXT_BUFFER(m_tuneEncQualityPrm, MFX_EXTBUFF_TUNE_ENCODE_QUALITY);
         m_tuneEncQualityPrm.TuneQuality = (decltype(m_tuneEncQualityPrm.TuneQuality))(pInParams->tuneQuality);
         m_EncExtParams.push_back((mfxExtBuffer *)&m_tuneEncQualityPrm);

diff --git a/QSVPipeline/qsv_query.cpp b/QSVPipeline/qsv_query.cpp
@@ -295,7 +295,8 @@ QSVVideoParam::QSVVideoParam(uint32_t CodecId, mfxVersion mfxver_) :
         && check_lib_version(mfxVer, MFX_LIB_VERSION_2_5)) {
         buf.push_back((mfxExtBuffer *)&hyperModePrm);
     }
-    if (check_lib_version(mfxVer, MFX_LIB_VERSION_2_9)) {
+    if (ENABLE_QSV_TUNE_QUERY
+        && check_lib_version(mfxVer, MFX_LIB_VERSION_2_9)) {
         buf.push_back((mfxExtBuffer *)&tuneEncQualityPrm);
     }
 
@@ -774,7 +775,7 @@ uint64_t CheckEncodeFeature(MFXVideoSession& session, const int ratecontrol, con
         && (codecId == MFX_CODEC_AVC || codecId == MFX_CODEC_HEVC || codecId == MFX_CODEC_AV1)) {
         buf.push_back((mfxExtBuffer *)&hyperMode);
     }
-    if (check_lib_version(mfxVer, MFX_LIB_VERSION_2_9)) {
+    if (ENABLE_QSV_TUNE_QUERY && check_lib_version(mfxVer, MFX_LIB_VERSION_2_9)) {
         buf.push_back((mfxExtBuffer *)&tuneEncQuality);
     }
 
@@ -1025,7 +1026,13 @@ uint64_t CheckEncodeFeature(MFXVideoSession& session, const int ratecontrol, con
             videoPrm.mfx.FrameInfo.BitDepthChroma = 8;
             videoPrm.mfx.FrameInfo.Shift = 0;
         }
-        CHECK_FEATURE(tuneEncQuality.TuneQuality, MFX_ENCODE_TUNE_SSIM, MFX_ENCODE_TUNE_DEFAULT, MFX_LIB_VERSION_2_9);
+        if (check_lib_version(mfxVer, MFX_LIB_VERSION_2_9)) {
+            if (ENABLE_QSV_TUNE_QUERY) {
+                CHECK_FEATURE(tuneEncQuality.TuneQuality, ENC_FEATURE_TUNE_ENCODE_QUALITY, MFX_ENCODE_TUNE_SSIM, MFX_LIB_VERSION_2_9);
+            } else {
+                result |= ENC_FEATURE_TUNE_ENCODE_QUALITY;
+            }
+        }
 #undef PICTYPE
 #pragma warning(pop)
         //付随オプション

diff --git a/QSVPipeline/rgy_version.h b/QSVPipeline/rgy_version.h
@@ -31,9 +31,9 @@
 
 #include "rgy_rev.h"
 
-#define VER_FILEVERSION             0,7,40,0
-#define VER_STR_FILEVERSION          "7.40"
-#define VER_STR_FILEVERSION_TCHAR _T("7.40")
+#define VER_FILEVERSION             0,7,41,0
+#define VER_STR_FILEVERSION          "7.41"
+#define VER_STR_FILEVERSION_TCHAR _T("7.41")
 
 #ifdef _M_IX86
 #define BUILD_ARCH_STR _T("x86")
@@ -93,6 +93,7 @@ const char *get_encoder_version();
 #define ENABLE_AUTO_PICSTRUCT 0
 
 #define ENABLE_HYPER_MODE 1
+#define ENABLE_QSV_TUNE_QUERY 0
 
 #ifdef BUILD_AUO
 #define ENCODER_NAME             "QSVEnc"