From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 17 Dec 2023 00:34:39 +0000 (-0700)
Subject: Credit Andrew & Andrea - change netBSD script to ffmpeg v6 & add av1_vaapi render... 
X-Git-Tag: 2024-01~11
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=33758f9c7af61e85cc5934a22a5ca300703b233a;p=goodguy%2Fcinelerra.git

Credit Andrew & Andrea - change netBSD script to ffmpeg v6 & add av1_vaapi render formats
---

diff --git a/cinelerra-5.1/blds/netbsd.bld b/cinelerra-5.1/blds/netbsd.bld
index 5d961ee9..0e2c97a6 100755
--- a/cinelerra-5.1/blds/netbsd.bld
+++ b/cinelerra-5.1/blds/netbsd.bld
@@ -1,16 +1,16 @@
 #!/bin/bash
-#use: patch -p2 < bsd.patch
+#patch not needed anymore
 export CONFIG_SHELL=/bin/bash
 export MAKE=gmake
-export C_INCLUDE_PATH=/usr/local/include:/usr/X11R7/include:/usr/pkg/include:/usr/pkg/include/ffmpeg4
+export C_INCLUDE_PATH=/usr/local/include:/usr/X11R7/include:/usr/pkg/include:/usr/pkg/include/ffmpeg6
 export CPLUS_INCLUDE_PATH=/usr/local/include
 export LIBRARY_PATH=/usr/local/lib
-export LDFLAGS="-L/usr/X11R7/lib -L/usr/pkg/lib"
-export CFLAGS="-I/usr/pkg/include -I/usr/pkg/include/ffmpeg4 -pthread -I/usr/pkg/include -I/usr/pkg/include/OpenEXR -I/usr/pkg/include -I/usr/pkg/include/Imath"
+export LDFLAGS="-L/usr/X11R7/lib -L/usr/pkg/lib -L/usr/pkg/lib/ffmpeg6 "
+export CFLAGS1="-I/usr/pkg/include -I/usr/pkg/include/ffmpeg6 -pthread -I/usr/pkg/include -I/usr/pkg/include/OpenEXR -I/usr/pkg/include -I/usr/pkg/include/Imath"
 
 alias make=gmake
 ( ./autogen.sh
-  BSD=1 CC=gcc CXX=g++ CFLAGS="-g -fpermissive -O2 -DFFMPEG3" \
+  BSD=1 CC=gcc CXX=g++ CFLAGS=" ${CFLAGS1} -g -fpermissive -O2" \
   ./configure --with-single-user \
     --disable-static-build --without-lv2 --disable-lame --disable-twolame \
     --with-oss --without-alsa --without-firewire --without-dv --without-dvb \
diff --git a/cinelerra-5.1/ffmpeg/video/av1_vaapi.dfl b/cinelerra-5.1/ffmpeg/video/av1_vaapi.dfl
new file mode 100644
index 00000000..c158dbd5
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/av1_vaapi.dfl
@@ -0,0 +1 @@
+av1_vaapi.webm
diff --git a/cinelerra-5.1/ffmpeg/video/av1_vaapi.webm b/cinelerra-5.1/ffmpeg/video/av1_vaapi.webm
new file mode 100644
index 00000000..cc80552f
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/av1_vaapi.webm
@@ -0,0 +1,8 @@
+webm av1_vaapi
+# Nvidia 4000+ series (better nvenc/vdpau)
+# AMD Radeon 7000+ series
+# Intel Xe2, Arc+ series
+cin_hw_dev=vaapi
+g=30
+# profile=high #(main, professional)
+rc_mode=QVBR
diff --git a/cinelerra-5.1/ffmpeg/video/hdr.hdr b/cinelerra-5.1/ffmpeg/video/hdr.hdr
index a83465b6..747ff429 100644
--- a/cinelerra-5.1/ffmpeg/video/hdr.hdr
+++ b/cinelerra-5.1/ffmpeg/video/hdr.hdr
@@ -1,3 +1,8 @@
 image2 hdr
 # this codec creates a set of image files in a directory
 # use an image2 file name like /dir/t%05d.tiff
+# Next 3 parameters are what YouTube HDR uses
+colorspace bt2020nc
+color_trc smpte2084
+color_primaries bt2020
+