Request 6614 (accepted)

avidemux3.changes Changed

avidemux3.spec Changed

avidemux2-2.8.2.git20261018.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_nvdec.cpp -> avidemux2-2.8.2.git20261020.tar.xz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_nvdec.cpp Changed

@@ -627,6 +627,7 @@
     // Code compiled from libavutil/hwcontext_cuda.c and libavcodec/nvdec.c
     int r;
     bool fatal;
+    CUresult err;
     CudaFunctions *cudaFunc;
     CuvidFunctions *cuvidFunc;
     CUVIDDECODECAPS caps;
@@ -646,39 +647,31 @@
 
     r = cuda_load_functions(&cudaFunc, NULL);
 
-    if(r < 0 || !cudaFunc)
+    if(r < 0)
     {
         ADM_info("Cannot load CUDA functions, NVDEC is not available.\n");
         return false;
     }
 
-    if(!cudaFunc->cuInit || !cudaFunc->cuDeviceGet ||
-       !cudaFunc->cuCtxCreate || !cudaFunc->cuCtxDestroy ||
-       !cudaFunc->cuCtxPushCurrent || !cudaFunc->cuCtxPopCurrent)
-    {
-        ADM_warning("Necessary CUDA functions not found, bailing out.\n");
-        goto fail2;
-    }
-
-    r = cudaFunc->cuInit(0);
+    err = cudaFunc->cuInit(0);
 
-    if(r != CUDA_SUCCESS)
+    if(err != CUDA_SUCCESS)
     {
         ADM_warning("Cannot init CUDA, NVDEC is not available.\n");
         goto fail2;
     }
 
-    r = cudaFunc->cuDeviceGet(&dev, 0);
+    err = cudaFunc->cuDeviceGet(&dev, 0);
 
-    if(r != CUDA_SUCCESS)
+    if(err != CUDA_SUCCESS)
     {
         ADM_warning("Cannot get CUDA device, NVDEC is not available.\n");
         goto fail2;
     }
 
-    r = cudaFunc->cuCtxCreate(&ctx, CU_CTX_SCHED_BLOCKING_SYNC, dev);
+    err = cudaFunc->cuCtxCreate(&ctx, CU_CTX_SCHED_BLOCKING_SYNC, dev);
 
-    if(r != CUDA_SUCCESS)
+    if(err != CUDA_SUCCESS)
     {
         ADM_warning("Cannot create CUDA context, NVDEC is not available.\n");
         goto fail2;
@@ -702,9 +695,9 @@
         goto fail2;
     }
 
-    r = cudaFunc->cuCtxPushCurrent(ctx);
+    err = cudaFunc->cuCtxPushCurrent(ctx);
 
-    if(r != CUDA_SUCCESS)
+    if(err != CUDA_SUCCESS)
     {
         ADM_warning("Cannot push CUDA context, bailing out.\n");
         cuvid_free_functions(&cuvidFunc);
@@ -720,8 +713,8 @@
     caps.eChromaFormat   = cudaVideoChromaFormat_##chroma; \
     caps.nBitDepthMinus8 = bit_depth - 8; \
     ADM_info("Checking " #codec " %d bits %s\n", bit_depth, chromaFormatDesc(caps.eChromaFormat)); \
-    r = cuvidFunc->cuvidGetDecoderCaps(&caps); \
-    if(r != CUDA_SUCCESS) \
+    err = cuvidFunc->cuvidGetDecoderCaps(&caps); \
+    if(err != CUDA_SUCCESS) \
     { \
         ADM_warning("Quering decoder capabilities for " #codec " has failed.\n"); \
         if(fatal) \

avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreNvenc Added

avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreNvenc/CMakeLists.txt Added

avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreNvenc/include Added

avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreNvenc/include/ADM_coreNvenc.h Added

@@ -0,0 +1,27 @@
+/***************************************************************************
+    \fn ADM_coreNvenc.h
+    \brief Probe codecs supported by NVENC interface and hw
+
+    copyright            : (C) 2018 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+#include "ADM_default.h"
+#include "ADM_coreVideoEncoder6_export.h"
+
+#define ADM_NVENC_H264_IS_SUPPORTED 1
+#define ADM_NVENC_HEVC_IS_SUPPORTED (1<<1)
+#define ADM_NVENC_AV1_IS_SUPPORTED  (1<<2)
+
+ADM_COREVIDEOENCODER6_EXPORT bool ADM_getNvencCodecSupportFlags(uint32_t *flags);
+
+// EOF

avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreNvenc/src Added

avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreNvenc/src/ADM_coreNvenc.cpp Added

@@ -0,0 +1,330 @@
+/***************************************************************************
+    \fn ADM_coreNvenc.cpp
+    \brief Probe codecs supported by NVENC interface and hw
+
+    copyright            : (C) 2018 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_coreNvenc.h"
+
+extern "C" {
+#include "dynlink_loader.h"
+#include "nvEncodeAPI.h"
+}
+
+#define ADM_NVENC_NOT_PROBED 0xFFFF0000
+
+static uint32_t nvEncCodecSupportFlags = ADM_NVENC_NOT_PROBED;
+
+// Code stolen from libavcodec/nvenc.{c,h}
+
+#define LAVC_NVENCAPI_CHECK_VERSION(major, minor) \
+    ((major) < NVENCAPI_MAJOR_VERSION || \
+    ((major) == NVENCAPI_MAJOR_VERSION && (minor) <= NVENCAPI_MINOR_VERSION))
+
+static void nvencPrintDriverReq(void)
+{
+#if LAVC_NVENCAPI_CHECK_VERSION(13, 2)
+    const char *minVersion = "(unknown)";
+#elif LAVC_NVENCAPI_CHECK_VERSION(13, 1)
+    const char *minVersion = "610.00";
+#elif LAVC_NVENCAPI_CHECK_VERSION(13, 0)
+    const char *minVersion = "570.0";
+#elif LAVC_NVENCAPI_CHECK_VERSION(12, 2)
+# ifdef _WIN32
+    const char *minVersion = "551.76";
+# else
+    const char *minVersion = "550.54.14";
+# endif
+#elif LAVC_NVENCAPI_CHECK_VERSION(12, 1)
+# ifdef _WIN32
+    const char *minVersion = "531.61";
+# else
+    const char *minVersion = "530.41.03";
+# endif
+#elif LAVC_NVENCAPI_CHECK_VERSION(12, 0)
+# ifdef _WIN32
+    const char *minVersion = "522.25";
+# else
+    const char *minVersion = "520.56.06";
+# endif
+#else
+# ifdef _WIN32
+    const char *minVersion = "471.41";
+# else
+    const char *minVersion = "470.57.02";
+# endif
+#endif
+    ADM_error("The minimum required NVIDIA driver for NVENC is %s\n", minVersion);
+}
+
+static bool checkNvEnc(void)
+{
+    CudaFunctions *cudaDynl = NULL;
+    NvencFunctions *nvencDynl = NULL;
+    NV_ENCODE_API_FUNCTION_LIST nvencFunc;
+    NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS params;
+
+    NVENCSTATUS err;
+    CUresult cuerr;
+    uint32_t nvenc_max_ver, nbGuids;
+    GUID *guids;
+    int ret;
+    int nbDevices = 0;
+
+    typedef struct { const char *name; GUID guid; } namedGuid;
+
+    namedGuid allGuids = {
+         { "H264", NV_ENC_CODEC_H264_GUID }
+        ,{ "HEVC", NV_ENC_CODEC_HEVC_GUID }
+#if LAVC_NVENCAPI_CHECK_VERSION(12, 0)
+        ,{ "AV1", NV_ENC_CODEC_AV1_GUID }
+#endif
+    };
+
+    if (!(nvEncCodecSupportFlags & ADM_NVENC_NOT_PROBED))
+    {
+        ADM_info("Already probed, skipping check.\n");
+        return (nvEncCodecSupportFlags & (ADM_NVENC_H264_IS_SUPPORTED + ADM_NVENC_HEVC_IS_SUPPORTED + ADM_NVENC_AV1_IS_SUPPORTED));
+    }
+    nvEncCodecSupportFlags &= ~ADM_NVENC_NOT_PROBED;
+
+    ret = cuda_load_functions(&cudaDynl, NULL);
+    if (ret < 0)
+        return false;
+
+    ret = nvenc_load_functions(&nvencDynl, NULL);
+    if (ret < 0)
+    {
+        nvencPrintDriverReq();
+        cuda_free_functions(&cudaDynl);
+        return false;
+    }
+
+    err = nvencDynl->NvEncodeAPIGetMaxSupportedVersion(&nvenc_max_ver);
+    if (err != NV_ENC_SUCCESS)
+    {
+        ADM_warning("Failed to query NVENC max version.\n");
+        goto fail;
+    }
+
+    ADM_info("Loaded NVENC version %d.%d\n", nvenc_max_ver >> 4, nvenc_max_ver & 0xf);
+
+    if ((NVENCAPI_MAJOR_VERSION << 4 | NVENCAPI_MINOR_VERSION) > nvenc_max_ver)
+    {
+        ADM_error("Driver supports NVENC API up to version %d.%d but %d.%d is required.\n",
+                nvenc_max_ver >> 4, nvenc_max_ver & 0xF,
+                NVENCAPI_MAJOR_VERSION, NVENCAPI_MINOR_VERSION);
+        nvencPrintDriverReq();
+        goto fail;
+    }
+
+    nvencFunc.version = NV_ENCODE_API_FUNCTION_LIST_VER;
+
+    err = nvencDynl->NvEncodeAPICreateInstance(&nvencFunc);
+    if (err != NV_ENC_SUCCESS)
+    {
+        ADM_error("Failed to create NVENC instance.\n");
+        goto fail;
+    }
+
+    ADM_info("NVENC libraries loaded and instance created successfully.\n");
+
+    cuerr = cudaDynl->cuInit(0);
+    if (cuerr != CUDA_SUCCESS)
+    {
+        ADM_error("Cannot init CUDA, NVENC is not available.\n");
+        goto fail;
+    }
+
+    cuerr = cudaDynl->cuDeviceGetCount(&nbDevices);
+    if (cuerr != CUDA_SUCCESS)
+    {
+        ADM_error("Cannot query CUDA-capable devices.\n");
+        goto fail;
+    }
+
+    if (!nbDevices)
+    {
+        ADM_warning("No CUDA-capable devices found, NVENC is not available.\n");
+        goto fail;
+    }
+
+    ADM_info("%d CUDA-capable device(s) found.\n", nbDevices);
+
+    for (int i = 0; i < nbDevices; i++)
+    {
+#define GPU_NAME_BUF_SIZE 128
+        char gpuGPU_NAME_BUF_SIZE = {0};
+        CUdevice dev;
+        CUcontext ctx, dummy;
+        void *encoder = NULL;
+        int major, minor;
+
+        cuerr = cudaDynl->cuDeviceGet(&dev, i);
+        if (cuerr != CUDA_SUCCESS)
+        {
+            ADM_error("Cannot get CUDA device %d.\n", i);
+            continue;
+        }
+
+        cuerr = cudaDynl->cuDeviceGetName(gpu, GPU_NAME_BUF_SIZE, dev);
+        if (cuerr != CUDA_SUCCESS)
+        {
+            ADM_error("Cannot query CUDA device %d name.\n", i);
+            continue;
+        }
+
+        gpuGPU_NAME_BUF_SIZE - 1 = 0;
+        ADM_info("Checking CUDA device %d \"%s\"\n", i, gpu);
+
+        cuerr = cudaDynl->cuDeviceComputeCapability(&major, &minor, dev);
+        if (cuerr != CUDA_SUCCESS)
+        {
+            ADM_error("Cannot query CUDA device %d compute capabilities.\n", i);
+            continue;
+        }
+
+        ADM_info("GPU #%d - \"%s\" streaming multiprocessor version: %d.%d\n", i, gpu, major, minor);
+        if (((major << 4) | minor) < 0x30)
+        {
+            ADM_warning("Version too low for NVENC\n");
+            continue;
+        }
+
+        cuerr = cudaDynl->cuCtxCreate(&ctx, 0, dev);
+        if (cuerr != CUDA_SUCCESS)
+        {
+            ADM_warning("Cannot create CUDA context.\n");
+            continue;
+        }
+
+        cuerr = cudaDynl->cuCtxPopCurrent(&dummy);
+        if (cuerr != CUDA_SUCCESS)
+        {
+            ADM_warning("Cannot pop CUDA context.\n");
+            cuerr = cudaDynl->cuCtxDestroy(ctx);
+            if (cuerr != CUDA_SUCCESS)
+            {
+                ADM_error("Cannot destroy CUDA context, bailing out.\n");
+                goto fail;
+            }
+            ctx = NULL;
+            continue;
+        }
+
+        memset(&params, 0, sizeof(params));
+        params.version = NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER;
+        params.apiVersion = NVENCAPI_VERSION;
+        params.device = ctx;
+        params.deviceType = NV_ENC_DEVICE_TYPE_CUDA;
+
+        err = nvencFunc.nvEncOpenEncodeSessionEx(&params, &encoder);
+        if (err != NV_ENC_SUCCESS)
+        {
+            ADM_warning("Failed to open session.\n");
+            err = nvencFunc.nvEncDestroyEncoder(encoder);
+            encoder = NULL;
+            if (err != NV_ENC_SUCCESS)
+            {
+                ADM_error("Cannot destroy encoder instance, bailing out.\n");
+                goto fail;
+            }
+            continue;
+        }
+        nbGuids = 0;
+        err = nvencFunc.nvEncGetEncodeGUIDCount(encoder, &nbGuids);
+        if (err != NV_ENC_SUCCESS || !nbGuids)
+        {
+            ADM_warning("Encoder does not support any codecs.\n");
+            err = nvencFunc.nvEncDestroyEncoder(encoder);
+            encoder = NULL;
+            if (err != NV_ENC_SUCCESS)
+            {
+                ADM_error("Cannot destroy encoder instance, bailing out.\n");
+                nvenc_free_functions(&nvencDynl);
+                cuda_free_functions(&cudaDynl);
+                return false;
+            }
+            continue;
+        }
+
+        guids = (GUID *) ADM_alloc(nbGuids * sizeof(GUID));
+        ADM_assert(guids);
+        err = nvencFunc.nvEncGetEncodeGUIDs(encoder, guids, nbGuids, &nbGuids);
+        if (err != NV_ENC_SUCCESS || !nbGuids)
+        {
+            ADM_warning("Encoder does not support any codecs.\n");
+            ADM_dealloc(guids);
+            guids = NULL;
+            err = nvencFunc.nvEncDestroyEncoder(encoder);
+            encoder = NULL;
+            if (err != NV_ENC_SUCCESS)
+            {
+                ADM_error("Cannot destroy encoder instance, bailing out.\n");
+                cudaDynl->cuCtxPopCurrent(&dummy);
+                cudaDynl->cuCtxDestroy(ctx);
+                goto fail;
+            }
+            continue;
+        }
+
+        for (int j = 0; j < nbGuids; j++)
+        {
+             for (int k = 0; k < sizeof(allGuids) / sizeof(namedGuid); k++)
+             {
+                 if (!memcmp(&(guidsj), &(allGuidsk.guid), sizeof(*guids)))
+                 {
+                     ADM_info("%s is supported.\n", allGuidsk.name);
+                     if (!strcmp("H264", allGuidsk.name))
+                         nvEncCodecSupportFlags |= ADM_NVENC_H264_IS_SUPPORTED;
+                     else if (!strcmp("HEVC", allGuidsk.name))
+                         nvEncCodecSupportFlags |= ADM_NVENC_HEVC_IS_SUPPORTED;
+                     else if (!strcmp("AV1", allGuidsk.name))
+                         nvEncCodecSupportFlags |= ADM_NVENC_AV1_IS_SUPPORTED;
+                 }
+             }
+        }
+
+        ADM_dealloc(guids);
+        guids = NULL;
+
+        err = nvencFunc.nvEncDestroyEncoder(encoder);
+        encoder = NULL;
+
+        cudaDynl->cuCtxPopCurrent(&dummy);
+        cudaDynl->cuCtxDestroy(ctx);
+
+        if (err != NV_ENC_SUCCESS)
+        {
+            ADM_warning("Cannot destroy encoder instance!\n");
+            goto fail;
+        }
+    }
+
+fail:
+    nvenc_free_functions(&nvencDynl);
+    cuda_free_functions(&cudaDynl);
+
+    return (nvEncCodecSupportFlags & (ADM_NVENC_H264_IS_SUPPORTED + ADM_NVENC_HEVC_IS_SUPPORTED + ADM_NVENC_AV1_IS_SUPPORTED));
+}
+
+bool ADM_getNvencCodecSupportFlags(uint32_t *flags)
+{
+    bool r = checkNvEnc();
+    if (flags)
+        *flags = nvEncCodecSupportFlags & 0xFFFF;
+    return r;
+}
+
+// EOF

avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/ADM_coreNvenc/src/CMakeLists.txt Added

avidemux2-2.8.2.git20261018.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/CMakeLists.txt -> avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/ADM_coreVideoEncoder/ADM_hwAccelEncoder/CMakeLists.txt Changed

avidemux2-2.8.2.git20261018.tar.xz/avidemux_core/CMakeLists.txt -> avidemux2-2.8.2.git20261020.tar.xz/avidemux_core/CMakeLists.txt Changed

avidemux2-2.8.2.git20261018.tar.xz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/CMakeLists.txt -> avidemux2-2.8.2.git20261020.tar.xz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/CMakeLists.txt Changed

avidemux2-2.8.2.git20261018.tar.xz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp -> avidemux2-2.8.2.git20261020.tar.xz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp Changed

@@ -19,6 +19,7 @@
 #include "ADM_default.h"
 #include "ADM_ffNvEnc.h"
 #include "ADM_coreVideoEncoderInternal.h"
+#include "ADM_coreNvenc.h"
 #include "ffnvenc_desc.cpp"
 extern bool            ffNvEncConfigure(void);
 extern ffnvenc_encoder NvEncSettings;
@@ -30,51 +31,24 @@
 	memcpy(&NvEncSettings, &defaultConf, sizeof(ffnvenc_encoder));
 }
 
-
-/**
- *  \fn nvCheckDll
- */
-
-static bool nvCheckDll(const char *zwin64, const char *zwin32, const char *zlinux)
-{
-        const char *dll;
-#ifdef _WIN32
-        #ifdef _WIN64
-            dll=zwin64;
-        #else
-            dll=zwin32;
-        #endif
-#else
-        dll=zlinux;
-#endif
-        
-        ADM_LibWrapper wrapper;
-        bool r=wrapper.loadLibrary(dll);
-        ADM_info("\t checking %s-> %d\n",dll,r);
-        return r;
-}
 /**
  * \fn nvEncProbe
  */
-extern "C"
+static bool nvEncProbe(void)
 {
-    static bool nvEncProbe(void)
-    {
-        // Step 1 : Try to load cuda
-        if(!nvCheckDll("nvcuda.dll","nvcuda.dll","libcuda.so"))
-        {
-            ADM_warning("Cannot load cuda dll\n");
-            return false;
-        }
-        // Step 2 : Try to load encoder
+    uint32_t flags;
+    if (false == ADM_getNvencCodecSupportFlags(&flags))
+        return false;
 
-        if(!nvCheckDll("nvEncodeAPI64.dll","nvEncodeAPI.dll","libnvidia-encode.so.1"))
-        {
-            ADM_warning("Cannot load nvidia encode dll\n");
-            return false;
-        }
-        return true;
-    }
+    return (flags &
+#ifdef H265_ENCODER
+        ADM_NVENC_HEVC_IS_SUPPORTED
+#elif defined(AV1_ENCODER)
+        ADM_NVENC_AV1_IS_SUPPORTED
+#else
+        ADM_NVENC_H264_IS_SUPPORTED
+#endif
+    );
 }
 
 ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffNvEncEncoder);

Overview

Request 6614 (accepted)

Request History