Merge branch 'BELABOX:debug_overlay' into main

irlserver · Jan 11, 2025 · 607ee52 · 607ee52
2 parents e1ba7a6 + 94ca129
commit 607ee52
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 9 deletions.
diff --git a/pipeline/jetson/h265_libuvch264_1080p60 b/pipeline/jetson/h265_libuvch264_1080p60
@@ -1,6 +1,6 @@
 libuvch264src ! video/x-h264,framerate=60/1 !
 queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! nvv4l2decoder ! nvvidconv interpolation-method=5 !
-video/x-raw(memory:NVMM),width=1920,height=1080 !
+video/x-raw,width=1920,height=1080 !
 identity name=v_delay signal-handoffs=TRUE ! 
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue ! 
 nvvidconv interpolation-method=5 ! 

diff --git a/pipeline/jetson/h265_libuvch264_1440p60 b/pipeline/jetson/h265_libuvch264_1440p60
@@ -0,0 +1,12 @@
+libuvch264src ! video/x-h264,framerate=60/1 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! nvv4l2decoder ! nvvidconv interpolation-method=5 !
+video/x-raw,width=2560,height=1440 !
+identity name=v_delay signal-handoffs=TRUE ! 
+textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue ! 
+nvvidconv interpolation-method=5 ! 
+nvv4l2h265enc control-rate=1 qp-range="28,50:0,38:0,50" iframeinterval=60 preset-level=4 maxperf-enable=true EnableTwopassCBR=true insert-sps-pps=true name=venc_bps ! 
+h265parse config-interval=-1 ! queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mux. 
+alsasrc device=hw:2 ! identity name=a_delay signal-handoffs=TRUE ! volume volume=1.0 ! 
+audioconvert ! voaacenc bitrate=128000 ! aacparse ! queue max-size-time=10000000000 max-size-buffers=1000 ! mux. 
+mpegtsmux name=mux ! 
+appsink name=appsink
diff --git a/pipeline/jetson/h265_libuvch264_4k_2160p30 b/pipeline/jetson/h265_libuvch264_4k_2160p30
@@ -0,0 +1,11 @@
+libuvch264src ! video/x-h264,width=3840,height=2160,framerate=30/1 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! nvv4l2decoder ! nvvidconv interpolation-method=5 !
+identity name=v_delay signal-handoffs=TRUE !
+textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
+nvvidconv interpolation-method=5 !
+nvv4l2h265enc control-rate=1 qp-range="28,50:0,38:0,50" iframeinterval=60 preset-level=4 maxperf-enable=true EnableTwopassCBR=true insert-sps-pps=true name=venc_bps !
+h265parse config-interval=-1 ! queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mux.
+alsasrc device=hw:2 ! identity name=a_delay signal-handoffs=TRUE ! volume volume=1.0 !
+audioconvert ! voaacenc bitrate=128000 ! aacparse ! queue max-size-time=10000000000 max-size-buffers=1000 ! mux.
+mpegtsmux name=mux !
+appsink name=appsink
diff --git a/pipeline/rk3588/h265_libuvch264 b/pipeline/rk3588/h265_libuvch264
@@ -1,5 +1,5 @@
 libuvch264src index=0 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !

diff --git a/pipeline/rk3588/h265_libuvch264_1080p b/pipeline/rk3588/h265_libuvch264_1080p
@@ -1,5 +1,5 @@
 libuvch264src index=0 ! video/x-h264,width=1920,height=1080 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !

diff --git a/pipeline/rk3588/h265_libuvch264_1080p25 b/pipeline/rk3588/h265_libuvch264_1080p25
@@ -1,5 +1,5 @@
 libuvch264src index=0 ! video/x-h264,width=1920,height=1080,framerate=25/1 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=50 name=venc_bps !

diff --git a/pipeline/rk3588/h265_libuvch264_1080p30 b/pipeline/rk3588/h265_libuvch264_1080p30
@@ -1,5 +1,5 @@
 libuvch264src index=0 ! video/x-h264,width=1920,height=1080,framerate=30/1 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !

diff --git a/pipeline/rk3588/h265_libuvch264_1080p60 b/pipeline/rk3588/h265_libuvch264_1080p60
@@ -1,5 +1,5 @@
 libuvch264src index=0 ! video/x-h264,framerate=60/1 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec width=1920 height=1080 format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec width=1920 height=1080 format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !

diff --git a/pipeline/rk3588/h265_libuvch264_1440p60 b/pipeline/rk3588/h265_libuvch264_1440p60
@@ -0,0 +1,10 @@
+libuvch264src index=0 ! video/x-h264,framerate=60/1 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec width=2560 height=1440 format=11 !
+identity name=v_delay signal-handoffs=TRUE !
+textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
+mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !
+h265parse config-interval=-1 ! queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mux.
+alsasrc device=hw:5 ! identity name=a_delay signal-handoffs=TRUE ! volume volume=1.0 !
+audioconvert ! voaacenc bitrate=128000 ! aacparse ! queue max-size-time=10000000000 max-size-buffers=1000 ! mux.
+mpegtsmux name=mux !
+appsink name=appsink
diff --git a/pipeline/rk3588/h265_libuvch264_4k_2160p30 b/pipeline/rk3588/h265_libuvch264_4k_2160p30
@@ -0,0 +1,10 @@
+libuvch264src index=0 ! video/x-h264,width=3840,height=2160,framerate=30/1 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
+identity name=v_delay signal-handoffs=TRUE !
+textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
+mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !
+h265parse config-interval=-1 ! queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mux.
+alsasrc device=hw:5 ! identity name=a_delay signal-handoffs=TRUE ! volume volume=1.0 !
+audioconvert ! voaacenc bitrate=128000 ! aacparse ! queue max-size-time=10000000000 max-size-buffers=1000 ! mux.
+mpegtsmux name=mux !
+appsink name=appsink
diff --git a/pipeline/rk3588/h265_libuvch264_720p b/pipeline/rk3588/h265_libuvch264_720p
@@ -1,5 +1,5 @@
 libuvch264src index=0 ! video/x-h264,width=1280,height=720 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !

diff --git a/pipeline/rk3588/h265_libuvch264_720p25 b/pipeline/rk3588/h265_libuvch264_720p25
@@ -1,5 +1,5 @@
 libuvch264src index=0 ! video/x-h264,width=1280,height=720,framerate=25/1 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=50 name=venc_bps !

diff --git a/pipeline/rk3588/h265_libuvch264_720p30 b/pipeline/rk3588/h265_libuvch264_720p30
@@ -1,5 +1,5 @@
 libuvch264src index=0 ! video/x-h264,width=1280,height=720,framerate=30/1 !
-queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=3 !
+queue max-size-time=10000000000 max-size-buffers=1000 max-size-bytes=41943040 ! mppvideodec format=11 !
 identity name=v_delay signal-handoffs=TRUE !
 textoverlay text='' valignment=top halignment=right font-desc="Monospace, 5" name=overlay ! queue !
 mpph265enc zero-copy-pkt=0 qp-max=51 gop=60 name=venc_bps !