Skip to content

Commit ea27902

Browse files
authored
rx codec selection (#65)
* bump pixelpilot * fix air channel bug * bump pixelpilot
1 parent 0d5b4ab commit ea27902

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

package/pixelpilot/files/gsmenu.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ case "$@" in
507507
;;
508508
"get air wfbng air_channel")
509509
channel=$(get_wfb_value '.wireless.channel' | tr -d '\n')
510-
iw list | grep "\[$channel\]" | tr -d '[]' | awk '{print $4 " (" $2 " " $3 ")"}' | sort -n | uniq | tr -d '\n'| head -c -1
510+
iw list | grep "\[$channel\]" | tr -d '[]' | awk '{print $4 " (" $2 " " $3 ")"}' | sort -n | uniq | tr -d '\n'
511511
;;
512512
"get air wfbng width")
513513
get_wfb_value '.wireless.width'
@@ -711,6 +711,9 @@ case "$@" in
711711
"values gs wfbng txpower")
712712
echo -n -e "1\n100"
713713
;;
714+
"values gs system rx_codec")
715+
echo -n -e "h264\nh265"
716+
;;
714717
"values gs system video_scale")
715718
echo -n 0.5 1.0
716719
;;
@@ -726,7 +729,10 @@ case "$@" in
726729
"values gs system rec_fps")
727730
echo -n -e "60\n90\n120"
728731
;;
729-
732+
"get gs system rx_codec")
733+
. /etc/default/pixelpilot
734+
echo $PIXELPILOT_CODEC
735+
;;
730736
"get gs system rx_mode")
731737
. /etc/default/wifibroadcast
732738
if [ x$WIFIBROADCAST_ENABLED = x"false" ]
@@ -747,6 +753,9 @@ case "$@" in
747753
. /etc/default/pixelpilot
748754
echo $PIXELPILOT_DVR_FRAMERATE
749755
;;
756+
"set gs system rx_codec"*)
757+
sed -i "s/^PIXELPILOT_CODEC=.*/PIXELPILOT_CODEC=\"$5\"/" /etc/default/pixelpilot
758+
;;
750759
"set gs system rx_mode"*)
751760
EXCLUDE_IFACE="wlan0"
752761
SSID="${6:-OpenIPC}"

package/pixelpilot/files/pixelpilot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ PIXELPILOT_OSD_ARGS="--osd --osd-custom-message --osd-config $PIXELPILOT_OSD_CON
33
PIXELPILOT_CONFIG_YAML="$([ -f /media/dvr/pixelpilot.yaml ] && echo /media/dvr/pixelpilot.yaml || echo /etc/pixelpilot.yaml)"
44
PIXELPILOT_SCREEN_MODE="1920x1080@60"
55
PIXELPILOT_DVR_FRAMERATE="60"
6+
PIXELPILOT_CODEC="h265"
67
PIXELPILOT_VIDEO_SCALE=1.0
78

8-
PIXELPILOT_ARGS="--config $PIXELPILOT_CONFIG_YAML $PIXELPILOT_OSD_ARGS --screen-mode $PIXELPILOT_SCREEN_MODE --video-scale $PIXELPILOT_VIDEO_SCALE --dvr-framerate $PIXELPILOT_DVR_FRAMERATE --dvr-fmp4 --dvr-sequenced-files --dvr-template /media/dvr/record_%Y-%m-%d_%H-%M-%S.mp4"
9+
PIXELPILOT_ARGS="--config $PIXELPILOT_CONFIG_YAML $PIXELPILOT_OSD_ARGS --codec $PIXELPILOT_CODEC --screen-mode $PIXELPILOT_SCREEN_MODE --video-scale $PIXELPILOT_VIDEO_SCALE --dvr-framerate $PIXELPILOT_DVR_FRAMERATE --dvr-fmp4 --dvr-sequenced-files --dvr-template /media/dvr/record_%Y-%m-%d_%H-%M-%S.mp4"

package/pixelpilot/pixelpilot.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
###############################################################################
66

7-
PIXELPILOT_VERSION=828a501bfaea6dd0a2c483451417298f16c5221f
7+
PIXELPILOT_VERSION=0fc9cc8f66310c8efcc81fa9fb24449212f73480
88
PIXELPILOT_SITE=https://github.com/OpenIPC/PixelPilot_rk.git
99
PIXELPILOT_SITE_METHOD = git
1010
PIXELPILOT_GIT_SUBMODULES = YES

0 commit comments

Comments
 (0)