[PATCH] scripts: bin2png: Support conversion of all files in a directory

[PATCH] scripts: bin2png: Support conversion of all files in a directory

[Laurent Pinchart]

When the first argument is a directory name instead of a file name,
convert all test script output binaries in that directory.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 scripts/bin2png.sh | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/scripts/bin2png.sh b/scripts/bin2png.sh
index 2563e87d4187..90fdfb077715 100755
--- a/scripts/bin2png.sh
+++ b/scripts/bin2png.sh
@@ -1,25 +1,40 @@
 #!/bin/sh
 
-FILE="$1"
+FILE=${1:-.}
 
-PNM=${FILE/.bin/.pnm}
-PNG=${FILE/.bin/.png}
+convert_image() {
+	local file=$1
+	local pnm=${file/%bin/pnm}
+	local png=${file/%bin/png}
 
-fmt=$(echo $FILE | sed -e 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\1|' | tr '[:lower:]' '[:upper:]')
-size=$(echo $FILE | sed -e 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\2|')
+	local format=$(echo $file | sed -e 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\1|' | tr '[:lower:]' '[:upper:]')
+	local size=$(echo $file   | sed -e 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\2|')
 
-case $fmt in
+	case $format in
 	yuv*|yvu*)
-		fmt=$(echo $fmt | tr 'M' 'P')
+		format=$(echo $format | tr 'M' 'P')
 		;;
 	nv*)
-		fmt=$(echo $fmt | tr -d 'M')
+		format=$(echo $format | tr -d 'M')
 		;;
 	*rgb*)
-		fmt=$(echo $fmt | tr -d 'AX')
+		format=$(echo $format | tr -d 'AX')
 		;;
-esac
+	esac
 
-raw2rgbpnm -s $size -f $fmt $FILE $PNM && \
-	convert $PNM $PNG
-rm $PNM
+	raw2rgbpnm -f $format -s $size $file $pnm && \
+		convert $pnm $png
+	rm $pnm
+}
+
+if [ -d $FILE ] ; then
+	if [ $(ls $FILE/vsp-unit-test-00*-*frame*.bin 2>/dev/null | wc -l) != 0 ] ; then
+		for f in $FILE/vsp-unit-test-00*-*frame*.bin ; do
+			convert_image $f
+		done
+	fi
+elif [ -f $FILE ] ; then
+	convert_image $FILE
+else
+	echo "Usage: $0 <file or directory>"
+fi
-- 
Regards,

Laurent Pinchart

[PATCH 1/1] scripts: bin2png.sh: Fix POSIX shell compliance

[Kieran Bingham]

From: Kieran Bingham <kieran.bingham@ideasonboard.com>

The string manipulations of the form ${VAR/search/replace} are not posix
compliant. Use string deletion, and append instead.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 scripts/bin2png.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bin2png.sh b/scripts/bin2png.sh
index 090f31fa992d..6422ee51bc33 100755
--- a/scripts/bin2png.sh
+++ b/scripts/bin2png.sh
@@ -4,8 +4,8 @@ FILE=${1:-.}
 
 convert_image() {
 	local file=$1
-	local pnm=${file/%bin/pnm}
-	local png=${file/%bin/png}
+	local pnm=${file%bin}pnm
+	local png=${file%bin}png
 
 	local format=$(echo $file | sed -e 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\1|' | tr '[:lower:]' '[:upper:]')
 	local size=$(echo $file   | sed -e 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\2|')
-- 
2.7.4

Re: [PATCH 1/1] scripts: bin2png.sh: Fix POSIX shell compliance

[Laurent Pinchart]

Hi Kieran,

Thank you for the patch.

On Wednesday 22 Feb 2017 15:52:43 Kieran Bingham wrote:
> From: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> The string manipulations of the form ${VAR/search/replace} are not posix
> compliant. Use string deletion, and append instead.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by, applied and pushed.

> ---
>  scripts/bin2png.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/bin2png.sh b/scripts/bin2png.sh
> index 090f31fa992d..6422ee51bc33 100755
> --- a/scripts/bin2png.sh
> +++ b/scripts/bin2png.sh
> @@ -4,8 +4,8 @@ FILE=${1:-.}
> 
>  convert_image() {
>  	local file=$1
> -	local pnm=${file/%bin/pnm}
> -	local png=${file/%bin/png}
> +	local pnm=${file%bin}pnm
> +	local png=${file%bin}png
> 
>  	local format=$(echo $file | sed -e
> 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\1|' | tr '[:lower:]'
> '[:upper:]') local size=$(echo $file   | sed -e
> 's|.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin|\2|')

-- 
Regards,

Laurent Pinchart