* Upgrade presets for NVIDIA Video Codec SDK 11.1.5

bytedeco · Jul 29, 2021 · b603f85 · b603f85
1 parent 3fc9eb7
commit b603f85
Show file tree

Hide file tree

Showing 24 changed files with 249 additions and 59 deletions.
diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml
@@ -95,8 +95,8 @@ runs:
 
         if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
           echo Installing NVIDIA Video Codec SDK
-          python3 -m gdown.cli https://drive.google.com/uc?id=1cBohhcptNDSF5pxsQ7n4-qcGsgiWUxga
-          unzip Video_Codec_SDK_11.0.10.zip -d /usr/local
+          python3 -m gdown.cli https://drive.google.com/uc?id=1dh3P5JLUUe9EXE0GSJj6VDWYlr7W89dO
+          unzip Video_Codec_SDK_11.1.5.zip -d /usr/local
           ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
         fi
 

diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -135,8 +135,8 @@ runs:
 
         if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
           echo Installing NVIDIA Video Codec SDK
-          python3 -m gdown.cli https://drive.google.com/uc?id=1cBohhcptNDSF5pxsQ7n4-qcGsgiWUxga
-          unzip Video_Codec_SDK_11.0.10.zip -d /usr/local
+          python3 -m gdown.cli https://drive.google.com/uc?id=1dh3P5JLUUe9EXE0GSJj6VDWYlr7W89dO
+          unzip Video_Codec_SDK_11.1.5.zip -d /usr/local
           ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
         fi
 

diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml
@@ -83,9 +83,9 @@ runs:
 
         if "%CI_DEPLOY_MODULE%"=="nvcodec" (
           echo Installing NVIDIA Video Codec SDK
-          python -m gdown.cli https://drive.google.com/uc?id=1cBohhcptNDSF5pxsQ7n4-qcGsgiWUxga
-          unzip Video_Codec_SDK_11.0.10.zip
-          move Video_Codec_SDK_11.0.10 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\VideoCodecSDK"
+          python -m gdown.cli https://drive.google.com/uc?id=1dh3P5JLUUe9EXE0GSJj6VDWYlr7W89dO
+          unzip Video_Codec_SDK_11.1.5.zip
+          move Video_Codec_SDK_11.1.5 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\VideoCodecSDK"
         )
 
         if "%CI_DEPLOY_MODULE%"=="tensorrt" (

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@
  * Build FFmpeg with libxml2, enabling support for DASH demuxing ([pull #1033](https://github.com/bytedeco/javacpp-presets/pull/1033)), and libsrt for SRT protocol support ([pull #1036](https://github.com/bytedeco/javacpp-presets/pull/1036))
  * Add `@MemberGetter` for `av_log_default_callback()` in presets for FFmpeg ([issue #812](https://github.com/bytedeco/javacpp-presets/issues/812))
  * Include `cudaGL.h` and `cuda_gl_interop.h` header files in presets for CUDA ([pull #1027](https://github.com/bytedeco/javacpp-presets/pull/1027))
- * Add presets for libffi 3.4.2 ([issue #833](https://github.com/bytedeco/javacpp-presets/issues/833)), NVIDIA Video Codec SDK 11.0.10 ([pull #1020](https://github.com/bytedeco/javacpp-presets/pull/1020)), PyTorch 1.9.0 ([issue #623](https://github.com/bytedeco/javacpp-presets/issues/623)), TensorFlow Lite 2.5.0, DepthAI 2.8.0, ModSecurity 3.0.5 ([pull #1012](https://github.com/bytedeco/javacpp-presets/pull/1012))
+ * Add presets for libffi 3.4.2 ([issue #833](https://github.com/bytedeco/javacpp-presets/issues/833)), NVIDIA Video Codec SDK 11.1.5 ([pull #1020](https://github.com/bytedeco/javacpp-presets/pull/1020)), PyTorch 1.9.0 ([issue #623](https://github.com/bytedeco/javacpp-presets/issues/623)), TensorFlow Lite 2.5.0, DepthAI 2.8.0, ModSecurity 3.0.5 ([pull #1012](https://github.com/bytedeco/javacpp-presets/pull/1012))
  * Map `std::vector<cv::Range>` to `RangeVector` in `opencv_core.Mat` for convenience ([issue bytedeco/javacv#1607](https://github.com/bytedeco/javacv/issues/1607))
  * Include `genericaliasobject.h`, `context.h`, `tracemalloc.h`, and `datetime.h` for CPython ([issue #1017](https://github.com/bytedeco/javacpp-presets/issues/1017))
  * Add samples using LLVM modules to deal with bitcode and object files ([pull #1016](https://github.com/bytedeco/javacpp-presets/pull/1016))

diff --git a/README.md b/README.md
@@ -207,15 +207,15 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * CUDA 11.4.x  https://developer.nvidia.com/cuda-downloads
    * cuDNN 8.2.x  https://developer.nvidia.com/cudnn
    * NCCL 2.10.x  https://developer.nvidia.com/nccl
- * NVIDIA Video Codec SDK 11.0.x  https://developer.nvidia.com/nvidia-video-codec-sdk
+ * NVIDIA Video Codec SDK 11.1.x  https://developer.nvidia.com/nvidia-video-codec-sdk
  * OpenCL 3.0  https://github.com/KhronosGroup/OpenCL-ICD-Loader
  * MXNet 1.8.0  https://github.com/apache/incubator-mxnet
  * PyTorch 1.9.x  https://github.com/pytorch/pytorch
  * TensorFlow 1.15.x  https://github.com/tensorflow/tensorflow
  * TensorFlow Lite 2.5.x  https://github.com/tensorflow/tensorflow
  * TensorRT 8.x  https://developer.nvidia.com/tensorrt
  * The Arcade Learning Environment 0.6.x  https://github.com/mgbellemare/Arcade-Learning-Environment
- * DepthAI 2.7.x  https://github.com/luxonis/depthai-core
+ * DepthAI 2.8.x  https://github.com/luxonis/depthai-core
  * ONNX 1.9.x  https://github.com/onnx/onnx
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
  * ONNX Runtime 1.8.x  https://github.com/microsoft/onnxruntime

diff --git a/nvcodec/README.md b/nvcodec/README.md
@@ -17,7 +17,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * NVIDIA Video Codec SDK 11.0.10  https://developer.nvidia.com/nvidia-video-codec-sdk
+ * NVIDIA Video Codec SDK 11.1.5  https://developer.nvidia.com/nvidia-video-codec-sdk
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -31,7 +31,7 @@ Java API documentation is available here:
 
 Sample Usage
 ------------
-Here is a simple example ported to Java from C code based on `Samples/AppEncode/AppEncCuda` and `Samples/AppDecode/AppDec` included in `Video_Codec_SDK_11.0.10.zip` available at:
+Here is a simple example ported to Java from C code based on `Samples/AppEncode/AppEncCuda` and `Samples/AppDecode/AppDec` included in `Video_Codec_SDK_11.1.5.zip` available at:
 
  * https://developer.nvidia.com/nvidia-video-codec-sdk/download
 
@@ -55,7 +55,7 @@ You can find more encoder and decoder samples in the [`samples`](samples) subdir
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>nvcodec-platform</artifactId>
-            <version>11.0.10-1.5.6-SNAPSHOT</version>
+            <version>11.1.5-1.5.6-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA -->

diff --git a/nvcodec/platform/pom.xml b/nvcodec/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>nvcodec-platform</artifactId>
-  <version>11.0.10-${project.parent.version}</version>
+  <version>11.1.5-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for NVIDIA Video Codec SDK</name>
 
   <properties>

diff --git a/nvcodec/pom.xml b/nvcodec/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>nvcodec</artifactId>
-  <version>11.0.10-${project.parent.version}</version>
+  <version>11.1.5-${project.parent.version}</version>
   <name>JavaCPP Presets for NVIDIA Video Codec SDK</name>
 
   <dependencies>

diff --git a/nvcodec/samples/pom.xml b/nvcodec/samples/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>nvcodec-platform</artifactId>
-            <version>11.0.10-1.5.6-SNAPSHOT</version>
+            <version>11.1.5-1.5.6-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA -->

diff --git a/nvcodec/samples/simple/pom.xml b/nvcodec/samples/simple/pom.xml
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>nvcodec-platform</artifactId>
-            <version>11.0.10-1.5.6-SNAPSHOT</version>
+            <version>11.1.5-1.5.6-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA -->

diff --git a/nvcodec/src/gen/java/org/bytedeco/nvcodec/global/nvcuvid.java b/nvcodec/src/gen/java/org/bytedeco/nvcodec/global/nvcuvid.java
@@ -20,7 +20,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /*
  * This copyright notice applies to this header file only:
  *
- * Copyright (c) 2010-2020 NVIDIA Corporation
+ * Copyright (c) 2010-2021 NVIDIA Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -76,7 +76,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /** Video codec enums
 /** These enums are used in CUVIDDECODECREATEINFO and CUVIDDECODECAPS structures
 /*********************************************************************************/
-/** enum cudaVideoCodec_enum */
+/** enum cudaVideoCodec */
 public static final int
     /**  MPEG1             */
     cudaVideoCodec_MPEG1 = 0,
@@ -121,7 +121,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /** Video surface format enums used for output format of decoded output
 /** These enums are used in CUVIDDECODECREATEINFO structure
 /*********************************************************************************/
-/** enum cudaVideoSurfaceFormat_enum */
+/** enum cudaVideoSurfaceFormat */
 public static final int
     /** Semi-Planar YUV [Y plane followed by interleaved UV plane]     */
     cudaVideoSurfaceFormat_NV12 = 0,
@@ -141,7 +141,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /** Use cudaVideoDeinterlaceMode_Weave for progressive content and for content that doesn't need deinterlacing
 /** cudaVideoDeinterlaceMode_Adaptive needs more video memory than other DImodes
 /******************************************************************************************************************/
-/** enum cudaVideoDeinterlaceMode_enum */
+/** enum cudaVideoDeinterlaceMode */
 public static final int
     /** Weave both fields (no deinterlacing) */
     cudaVideoDeinterlaceMode_Weave = 0,
@@ -155,7 +155,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /** Chroma format enums
 /** These enums are used in CUVIDDECODECREATEINFO and CUVIDDECODECAPS structures
 /**************************************************************************************************************/
-/** enum cudaVideoChromaFormat_enum */
+/** enum cudaVideoChromaFormat */
 public static final int
     /** MonoChrome */
     cudaVideoChromaFormat_Monochrome = 0,
@@ -171,7 +171,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /** Decoder flag enums to select preferred decode path
 /** cudaVideoCreate_Default and cudaVideoCreate_PreferCUVID are most optimized, use these whenever possible
 /*************************************************************************************************************/
-/** enum cudaVideoCreateFlags_enum */
+/** enum cudaVideoCreateFlags */
 public static final int
     /** Default operation mode: use dedicated video engines                        */
     cudaVideoCreate_Default     = 0x00,
@@ -188,7 +188,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /** Decode status enums
 /** These enums are used in CUVIDGETDECODESTATUS structure
 /*************************************************************************/
-/** enum cuvidDecodeStatus_enum */
+/** enum cuvidDecodeStatus */
 public static final int
     cuvidDecodeStatus_Invalid         = 0,   // Decode status is not valid
     cuvidDecodeStatus_InProgress      = 1,   // Decode is in progress
@@ -426,7 +426,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /*
  * This copyright notice applies to this header file only:
  *
- * Copyright (c) 2010-2020 NVIDIA Corporation
+ * Copyright (c) 2010-2021 NVIDIA Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation