diff mbox

[v2,3/4] vsp-lib: Support RPF frame cropping

Message ID c732195e24dccdec607abd89eabd21c17b587a88.1486733302.git-series.kieran.bingham@ideasonboard.com (mailing list archive)
State Not Applicable
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Kieran Bingham Feb. 10, 2017, 1:30 p.m. UTC 
From: Kieran Bingham <kieran.bingham@ideasonboard.com>

Pass the optional '--crop (X,Y)/WxH' parameter through reference_frame
allowing the input to be cropped for comparison

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 scripts/vsp-lib.sh | 52 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 10 deletions(-)

Comments

Laurent Pinchart Feb. 12, 2017, 9:46 p.m. UTC | #1 
Hi Kieran,

Thank you for the patch.

On Friday 10 Feb 2017 13:30:07 Kieran Bingham wrote:
> From: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> Pass the optional '--crop (X,Y)/WxH' parameter through reference_frame
> allowing the input to be cropped for comparison
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> ---
>  scripts/vsp-lib.sh | 52 +++++++++++++++++++++++++++++++++++++----------
>  1 file changed, 42 insertions(+), 10 deletions(-)
> 
> diff --git a/scripts/vsp-lib.sh b/scripts/vsp-lib.sh
> index 9e5e57b8c4ba..d13e7b6cde31 100755
> --- a/scripts/vsp-lib.sh
> +++ b/scripts/vsp-lib.sh
> @@ -147,6 +147,9 @@ reference_frame() {
>  		clu)
>  			options="$options --clu $value"
>  			;;
> +		crop)
> +			options="$options --crop $value"
> +			;;
>  		hflip)
>  			[ x$value = x1 ] && options="$options --hflip"
>  			;;
> @@ -662,22 +665,51 @@ format_rpf_wpf() {
>  	local infmt=$(format_v4l2_to_mbus $3)
>  	local size=$4
>  	local outfmt=$(format_v4l2_to_mbus $5)
> -	local crop=$6
> +	local rpfcrop=
> +	local wpfcrop=
> +	local rpfoutsize=
>  	local outsize=
> +	local option=
> +
> +	__vsp_rpf_format=$3
> +	__vsp_wpf_format=$5
> +
> +	shift 5
> +
> +	for option in $* ; do
> +		case $option in
> +		--rpfcrop=*)
> +			rpfcrop=${option/--rpfcrop=/}
> +			;;
> +
> +		--wpfcrop=*)
> +			wpfcrop=${option/--wpfcrop=/}
> +			;;
> +		*)
> +			echo "format_rpf_wpf: Unrecognised arguments"

Let's also print the argument value to ease debugging.

> +			return 1
> +			;;
> +		esac
> +	done
> 
> -	if [ x$crop != 'x' ] ; then
> -		crop="crop:$crop"
> -		outsize=$(echo $crop | sed 's/.*\///')
> +	if [ x$rpfcrop != 'x' ] ; then
> +		rpfcrop="crop:$rpfcrop"
> +		rpfoutsize=$(echo $rpfcrop | sed 's/.*\///')
>  	else
> -		outsize=$size
> +		rpfoutsize=$size
>  	fi
> 
> -	$mediactl -d $mdev -V "'$dev rpf.$rpf':0 [fmt:$infmt/$size]"
> -	$mediactl -d $mdev -V "'$dev wpf.$wpf':0 [fmt:$infmt/$size $crop]"
> -	$mediactl -d $mdev -V "'$dev wpf.$wpf':1 [fmt:$outfmt/$outsize]"
> +	if [ x$wpfcrop != 'x' ] ; then
> +		wpfcrop="crop:$wpfcrop"
> +		outsize=$(echo $wpfcrop | sed 's/.*\///')
> +	else
> +		outsize=$rpfoutsize
> +	fi
> 
> -	__vsp_rpf_format=$3
> -	__vsp_wpf_format=$5
> +	$mediactl -d $mdev -V "'$dev rpf.$rpf':0 [fmt:$infmt/$size $rpfcrop]"
> +	$mediactl -d $mdev -V "'$dev rpf.$rpf':1 [fmt:$infmt/$rpfoutsize]"
> +	$mediactl -d $mdev -V "'$dev wpf.$wpf':0 [fmt:$infmt/$rpfoutsize
> $wpfcrop]" +	$mediactl -d $mdev -V "'$dev wpf.$wpf':1
> [fmt:$outfmt/$outsize]" }
> 
>  format_wpf() {
diff mbox

Patch

diff --git a/scripts/vsp-lib.sh b/scripts/vsp-lib.sh
index 9e5e57b8c4ba..d13e7b6cde31 100755
--- a/scripts/vsp-lib.sh
+++ b/scripts/vsp-lib.sh
@@ -147,6 +147,9 @@  reference_frame() {
 		clu)
 			options="$options --clu $value"
 			;;
+		crop)
+			options="$options --crop $value"
+			;;
 		hflip)
 			[ x$value = x1 ] && options="$options --hflip"
 			;;
@@ -662,22 +665,51 @@  format_rpf_wpf() {
 	local infmt=$(format_v4l2_to_mbus $3)
 	local size=$4
 	local outfmt=$(format_v4l2_to_mbus $5)
-	local crop=$6
+	local rpfcrop=
+	local wpfcrop=
+	local rpfoutsize=
 	local outsize=
+	local option=
+
+	__vsp_rpf_format=$3
+	__vsp_wpf_format=$5
+
+	shift 5
+
+	for option in $* ; do
+		case $option in
+		--rpfcrop=*)
+			rpfcrop=${option/--rpfcrop=/}
+			;;
+
+		--wpfcrop=*)
+			wpfcrop=${option/--wpfcrop=/}
+			;;
+		*)
+			echo "format_rpf_wpf: Unrecognised arguments"
+			return 1
+			;;
+		esac
+	done
 
-	if [ x$crop != 'x' ] ; then
-		crop="crop:$crop"
-		outsize=$(echo $crop | sed 's/.*\///')
+	if [ x$rpfcrop != 'x' ] ; then
+		rpfcrop="crop:$rpfcrop"
+		rpfoutsize=$(echo $rpfcrop | sed 's/.*\///')
 	else
-		outsize=$size
+		rpfoutsize=$size
 	fi
 
-	$mediactl -d $mdev -V "'$dev rpf.$rpf':0 [fmt:$infmt/$size]"
-	$mediactl -d $mdev -V "'$dev wpf.$wpf':0 [fmt:$infmt/$size $crop]"
-	$mediactl -d $mdev -V "'$dev wpf.$wpf':1 [fmt:$outfmt/$outsize]"
+	if [ x$wpfcrop != 'x' ] ; then
+		wpfcrop="crop:$wpfcrop"
+		outsize=$(echo $wpfcrop | sed 's/.*\///')
+	else
+		outsize=$rpfoutsize
+	fi
 
-	__vsp_rpf_format=$3
-	__vsp_wpf_format=$5
+	$mediactl -d $mdev -V "'$dev rpf.$rpf':0 [fmt:$infmt/$size $rpfcrop]"
+	$mediactl -d $mdev -V "'$dev rpf.$rpf':1 [fmt:$infmt/$rpfoutsize]"
+	$mediactl -d $mdev -V "'$dev wpf.$wpf':0 [fmt:$infmt/$rpfoutsize $wpfcrop]"
+	$mediactl -d $mdev -V "'$dev wpf.$wpf':1 [fmt:$outfmt/$outsize]"
 }
 
 format_wpf() {