NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

utils: rkisp1: sync topology with upstream driver in capture script

Browse source 
rkisp1 kernel driver was merged upstream with minor changes in the
topology from the original driver libcamera based it's first support to
rkisp1.

Adapt libcamera capture script to work with upstream driver.

* Remove subdevice dphy from the pipeline.
* Add resizer in the pipeline.
* Fix links.
* Update entity names.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Helen Koike 2020-01-24 17:25:38 -03:00 • committed by Niklas Söderlund
parent 8f6aa56036
commit b3dbccd328
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
utils/rkisp1/rkisp1-capture.sh
View file

@ -68,14 +68,15 @@ configure_pipeline() {
$mediactl -r $mediactl -r
$mediactl -l "'$sensor':0 -> 'rockchip-sy-mipi-dphy':0 [1]" $mediactl -l "'$sensor':0 -> 'rkisp1_isp':0 [1]"
$mediactl -l "'rockchip-sy-mipi-dphy':1 -> 'rkisp1-isp-subdev':0 [1]" $mediactl -l "'rkisp1_isp':2 -> 'rkisp1_resizer_mainpath':0 [1]"
$mediactl -l "'rkisp1-isp-subdev':2 -> 'rkisp1_mainpath':0 [1]" $mediactl -l "'rkisp1_resizer_mainpath':1 -> 'rkisp1_mainpath':0 [1]"
$mediactl -V "\"$sensor\":0 [$format]" $mediactl -V "\"$sensor\":0 [$format]"
$mediactl -V "'rockchip-sy-mipi-dphy':1 [$format]" $mediactl -V "'rkisp1_isp':0 [$format crop:(0,0)/$sensor_size]"
$mediactl -V "'rkisp1-isp-subdev':0 [$format crop:(0,0)/$sensor_size]" $mediactl -V "'rkisp1_isp':2 [fmt:$capture_mbus_code/$sensor_size crop:(0,0)/$sensor_size]"
$mediactl -V "'rkisp1-isp-subdev':2 [fmt:$capture_mbus_code/$capture_size crop:(0,0)/$capture_size]" $mediactl -V "'rkisp1_resizer_mainpath':0 [fmt:$capture_mbus_code/$sensor_size crop:(0,0)/$sensor_size]"
$mediactl -V "'rkisp1_resizer_mainpath':1 [fmt:$capture_mbus_code/$capture_size]"
} }
# Capture frames # Capture frames
@ -161,8 +162,8 @@ fi
sensor_name=$1 sensor_name=$1
modprobe mipi_dphy_sy modprobe phy_rockchip_dphy_rx0
modprobe video_rkisp1 modprobe rockchip_isp1
sensor=$(find_sensor $sensor_name) || exit sensor=$(find_sensor $sensor_name) || exit
mdev=$(find_media_device rkisp1) || exit mdev=$(find_media_device rkisp1) || exit