Add NVEnc encoder. (Round 3) (#1437)

Adding the Nvidia NVEnc H.264 and H.265 encoders.
Based on Initial work by sgothel

--enable-nvenc is the new compile time configure option to enable for builds.

2 files changed, 9 insertions, 0 deletions

diff --git a/make/configure.py b/make/configure.py
index abe6abe47..4ec254fa6 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1319,6 +1319,10 @@ def createCLI():
     grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
     grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
 
+    h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
+
+
     cli.add_option_group( grp )
 
     ## add launch options
@@ -1845,6 +1849,7 @@ int main()
     doc.add( 'FEATURE.vce',        int( options.enable_vce ))
     doc.add( 'FEATURE.xcode',      int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) ))
     doc.add( 'FEATURE.x265',       int( options.enable_x265 ))
+    doc.add( 'FEATURE.nvenc',      int( options.enable_nvenc ))
 
     if not Tools.xcodebuild.fail and not options.disable_xcode:
         doc.addBlank()
diff --git a/make/include/main.defs b/make/include/main.defs
index dac1985e9..d56b752d4 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -70,6 +70,10 @@ ifeq (1,$(FEATURE.vce))
     MODULES += contrib/amf
 endif
 
+ifeq (1,$(FEATURE.nvenc))
+    MODULES += contrib/nvenc
+endif
+
 ifneq (,$(filter $(BUILD.system),darwin))
     MODULES += contrib/xz
 endif