Linuxビルドを修正。(その2)

rigaya · Feb 27, 2024 · 20a7429 · 20a7429
1 parent b1ea3b6
commit 20a7429
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/NVEncCore/NVEncFilterNvvfx.cpp b/NVEncCore/NVEncFilterNvvfx.cpp
@@ -69,12 +69,12 @@ bool NVEncFilterNvvfxEffect::compareModelDir(const tstring& modelDir) const {
 }
 
 RGY_ERR NVEncFilterNvvfxEffect::initEffect(const tstring& modelDir) {
-    if (!m_effect) {
-        AddMessage(RGY_LOG_DEBUG, _T("initEffect %s.\n"), m_effectName.c_str());
 #if !ENABLE_NVVFX
-        AddMessage(RGY_LOG_ERROR, _T("nvvfx filters are not supported on x86 exec file, please use x64 exec file.\n"));
-        return RGY_ERR_UNSUPPORTED;
+    AddMessage(RGY_LOG_ERROR, _T("nvvfx filters are not supported on x86 exec file, please use x64 exec file.\n"));
+    return RGY_ERR_UNSUPPORTED;
 #else
+    if (!m_effect) {
+        AddMessage(RGY_LOG_DEBUG, _T("initEffect %s.\n"), m_effectName.c_str());
         NvVFX_Handle effHandle = nullptr;
         auto err = err_to_rgy(NvVFX_CreateEffect(m_effectName.c_str(), &effHandle));
         if (err != RGY_ERR_NONE) {

diff --git a/NVEncCore/rgy_frame.h b/NVEncCore/rgy_frame.h
@@ -122,16 +122,16 @@ struct RGYFrame {
     RGYFrame() {};
     virtual ~RGYFrame() { }
     virtual bool isempty() const = 0;
-    std::array<void*, _countof(RGYFrameInfo::ptr)> ptr() const {
+    std::array<void*, RGY_MAX_PLANES> ptr() const {
         auto frame = getInfo();
-        std::array<void*, _countof(RGYFrameInfo::ptr)> ptrarray;
+        std::array<void*, RGY_MAX_PLANES> ptrarray;
         for (size_t i = 0; i < ptrarray.size(); i++) {
             ptrarray[i] = (void *)getPlane(&frame, (RGY_PLANE)i).ptr[0];
         }
         return ptrarray;
     }
     void ptrArray(void *array[3], bool bRGB) {
-        auto frame = getInfo(); bRGB;
+        auto frame = getInfo();
         for (size_t i = 0; i < 3; i++) {
             array[i] = (void *)getPlane(&frame, (RGY_PLANE)i).ptr[0];
         }

diff --git a/NVEncCore/rgy_resource.cpp b/NVEncCore/rgy_resource.cpp
@@ -162,7 +162,7 @@ static const RGYResourceData RGY_RESOURCE_DATA[] = {
 
 #endif //#if ENCODER_QSV || ENCODER_VCEENC || ENCODER_MPP
 #if ENCODER_NVENC
-    { _T("EXE_DATA"), _T("NVENC_FILTER_COLRSPACE_FUNC_HEADER"), _binary_NVEncCore_NVEncFilterColorspaceFunc_h_start, _binary_NVEncCore_NVEncFilterColorspaceFunc_h_end }
+    { _T("EXE_DATA"), _T("NVENC_FILTER_COLRSPACE_FUNC_HEADER"), _binary_NVEncCore_NVEncFilterColorspaceFunc_h_start, _binary_NVEncCore_NVEncFilterColorspaceFunc_h_end },
 #endif //#if ENCODER_NVENC
     { _T("PERF_MONITOR_SRC"), _T("PERF_MONITOR_PYW"), _binary_PerfMonitor_perf_monitor_pyw_start, _binary_PerfMonitor_perf_monitor_pyw_end }
 };

diff --git a/configure b/configure
@@ -638,7 +638,7 @@ gpuz_info.cpp          logo.cpp \
 rgy_aspect_ratio.cpp   rgy_avlog.cpp               rgy_avutil.cpp               rgy_bitstream.cpp \
 rgy_chapter.cpp        rgy_cmd.cpp                 rgy_codepage.cpp             rgy_def.cpp \
 rgy_env.cpp            rgy_err.cpp                 rgy_event.cpp \
-rgy_faw.cpp            rgy_filesystem.cpp          rgy_frame.cpp \
+rgy_faw.cpp            rgy_filesystem.cpp          rgy_filter.cpp               rgy_frame.cpp                rgy_frame_info.cpp \
 rgy_hdr10plus.cpp      rgy_ini.cpp                 rgy_input.cpp                rgy_input_avcodec.cpp        rgy_input_avi.cpp \
 rgy_input_avs.cpp      rgy_input_raw.cpp           rgy_input_sm.cpp             rgy_input_vpy.cpp            rgy_language.cpp \
 rgy_level_av1.cpp      rgy_level_h264.cpp          rgy_level_hevc.cpp \