Merge remote-tracking branch 'origin/dev'

v4u6h4n · May 24, 2024 · 85a90aa · 85a90aa
2 parents 5ab4f98 + 65342c3
commit 85a90aa
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/configurator.sh b/configurator.sh
@@ -4227,28 +4227,44 @@ interpret_source_permission() {
             setting_update_system_loopback_start() {
 
                 # Desk Vaughan.
-                ffmpeg -hwaccel vaapi -f v4l2 -framerate 60 -video_size 1920x1080 -input_format mjpeg -i /dev/video0 -pix_fmt yuv420p -f v4l2 /dev/video50 -pix_fmt yuv420p -f v4l2 /dev/video51 & disown
+                # ffmpeg -hwaccel vaapi -f v4l2 -framerate 60 -video_size 1920x1080 -input_format mjpeg -i /dev/video0 -pix_fmt yuv420p -f v4l2 /dev/video50 -pix_fmt yuv420p -f v4l2 /dev/video51 & disown
+                ffmpeg -vaapi_device /dev/dri/renderD128 -f v4l2 -video_size 1920x1080 -framerate 60 -i /dev/video0 -pix_fmt yuv420p -f v4l2 /dev/video50 -pix_fmt yuv420p -f v4l2 /dev/video51 & disown
 
                 # Bed overhead.
-                ffmpeg -hwaccel vaapi -f v4l2 -framerate 30 -video_size 1920x1080 -input_format mjpeg -i /dev/video8 \
+                # ffmpeg -hwaccel vaapi -f v4l2 -framerate 30 -video_size 1920x1080 -input_format mjpeg -i /dev/video8 \
+                #     -i "/media/archive/Social Media/Stock/Stock Footage/Still/Waterfall.mkv" \
+                #     -filter_complex "[0:v]colorkey=0x00FF00:0.3:0.2[ckout];[1:v][ckout]overlay[out1];[out1]split=2[out2][out3]" \
+                #     -map "[out2]" -pix_fmt yuv420p -f v4l2 /dev/video70 \
+                #     -map "[out3]" -pix_fmt yuv420p -f v4l2 /dev/video71 \
+                #     & disown
+                ffmpeg -vaapi_device /dev/dri/renderD128 -f v4l2 -video_size 1920x1080 -framerate 30 -input_format mjpeg -i /dev/video8 \
                     -i "/media/archive/Social Media/Stock/Stock Footage/Still/Waterfall.mkv" \
                     -filter_complex "[0:v]colorkey=0x00FF00:0.3:0.2[ckout];[1:v][ckout]overlay[out1];[out1]split=2[out2][out3]" \
                     -map "[out2]" -pix_fmt yuv420p -f v4l2 /dev/video70 \
                     -map "[out3]" -pix_fmt yuv420p -f v4l2 /dev/video71 \
                     & disown
 
+
                 # Bed tripod.
-                ffmpeg -hwaccel vaapi -f v4l2 -framerate 30 -video_size 1920x1080 -input_format mjpeg -i /dev/video10 \
+                # ffmpeg -hwaccel vaapi -f v4l2 -framerate 30 -video_size 1920x1080 -input_format mjpeg -i /dev/video10 \
+                #        -i "/media/archive/Social Media/Stock/Stock Footage/Still/Waterfall.mkv" \
+                #        -filter_complex "[0:v]vflip[vflipped]; \
+                #                      [vflipped]hflip[hflipped]; \
+                #                      [hflipped]colorkey=0x00FF00:0.3:0.2[ckout]; \
+                #                      [1:v][ckout]overlay[out1]; \
+                #                      [out1]split=2[out2][out3]" \
+                #        -map "[out2]" -pix_fmt yuv420p -f v4l2 /dev/video60 \
+                #        -map "[out3]" -pix_fmt yuv420p -f v4l2 /dev/video61 \
+                #        & disown
+
+                ffmpeg -vaapi_device /dev/dri/renderD128 -f v4l2 -video_size 1920x1080 -framerate 30 -input_format mjpeg -i /dev/video10 \
                        -i "/media/archive/Social Media/Stock/Stock Footage/Still/Waterfall.mkv" \
-                       -filter_complex "[0:v]vflip[vflipped]; \
-                                     [vflipped]hflip[hflipped]; \
-                                     [hflipped]colorkey=0x00FF00:0.3:0.2[ckout]; \
-                                     [1:v][ckout]overlay[out1]; \
-                                     [out1]split=2[out2][out3]" \
-                       -map "[out2]" -pix_fmt yuv420p -f v4l2 /dev/video60 \
-                       -map "[out3]" -pix_fmt yuv420p -f v4l2 /dev/video61 \
+                       -filter_complex "[0:v]colorkey=0x00FF00:0.3:0.2[ckout];[1:v][ckout]overlay[out1];[out1]split=2[out2][out3]" \
+                       -map "[out2]" -f v4l2 /dev/video60 \
+                       -map "[out3]" -f v4l2 /dev/video61 \
                        & disown
 
+
             }
             setting_update_system_loopback_stop() {