| Message ID | 1480082356-23380-3-git-send-email-kbingham@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Kieran, Thank you for the patch. On Friday 25 Nov 2016 13:59:13 Kieran Bingham wrote: > From: Kieran Bingham <kieran@bingham.xyz> > > Identify the size and format from the test output filename, and pass > to raw2rgbpnm for conversion to a PNM file. > > From there we can convert easily to a PNG output file. > > Signed-off-by: Kieran Bingham <kieran@bingham.xyz> > --- > scripts/Makefile | 2 +- > scripts/bin2png.sh | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 35 insertions(+), 1 deletion(-) > create mode 100755 scripts/bin2png.sh > > diff --git a/scripts/Makefile b/scripts/Makefile > index 8c452f4c54ce..6586b2989aed 100644 > --- a/scripts/Makefile > +++ b/scripts/Makefile > @@ -1,4 +1,4 @@ > -SCRIPTS=logger.sh vsp-lib.sh > +SCRIPTS=$(wildcard *.sh) > > all: > > diff --git a/scripts/bin2png.sh b/scripts/bin2png.sh > new file mode 100755 > index 000000000000..527c5546514d > --- /dev/null > +++ b/scripts/bin2png.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +FILE="$1" > + > +fmt=$(echo $FILE | sed -e > 's/.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin/\1/') > +size=$(echo $FILE | > sed -e 's/.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin/\2/') > + > +case $fmt in > + yuv410m|yvu410m|yuv411m|yuv420m|yvu420m|yuv422m|yvu422m|yuv444m| yvu444m) > + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` > + fmt=`echo $fmt | tr 'M' 'P'` > + ;; > + nv12m|nv21m|nv16m|nv61m) > + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` > + fmt=`echo $fmt | tr -d 'M'` > + ;; > + argb555|xrgb555) > + fmt=RGB555X > + ;; > + argb32|xrgb32) > + fmt=RGB32 > + ;; > + abgr32|xbgr32) > + fmt=BGR32 > + ;; > + *) > + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` > + ;; > +esac > + > +# Only run pnmtopng if the conversion to PNM succeeds > +raw2rgbpnm -s $size -f $fmt $FILE $FILE.pnm && \ How about stripping the .bin suffix to avoid calling the output file *.bin.png ? > + pnmtopng $FILE.pnm > $FILE.png We already have a dependency on ImageMagick (although on the target side, not the host side). Shoould we use convert instead of pnmtopng ? > +rm $FILE.pnm
Hi Laurent, Thanks for the review :D On 25/11/16 17:55, Laurent Pinchart wrote: > Hi Kieran, > > Thank you for the patch. > > On Friday 25 Nov 2016 13:59:13 Kieran Bingham wrote: >> From: Kieran Bingham <kieran@bingham.xyz> >> >> Identify the size and format from the test output filename, and pass >> to raw2rgbpnm for conversion to a PNM file. >> >> From there we can convert easily to a PNG output file. >> >> Signed-off-by: Kieran Bingham <kieran@bingham.xyz> >> --- >> scripts/Makefile | 2 +- >> scripts/bin2png.sh | 34 ++++++++++++++++++++++++++++++++++ >> 2 files changed, 35 insertions(+), 1 deletion(-) >> create mode 100755 scripts/bin2png.sh >> >> diff --git a/scripts/Makefile b/scripts/Makefile >> index 8c452f4c54ce..6586b2989aed 100644 >> --- a/scripts/Makefile >> +++ b/scripts/Makefile >> @@ -1,4 +1,4 @@ >> -SCRIPTS=logger.sh vsp-lib.sh >> +SCRIPTS=$(wildcard *.sh) >> >> all: >> >> diff --git a/scripts/bin2png.sh b/scripts/bin2png.sh >> new file mode 100755 >> index 000000000000..527c5546514d >> --- /dev/null >> +++ b/scripts/bin2png.sh >> @@ -0,0 +1,34 @@ >> +#!/bin/sh >> + >> +FILE="$1" >> + >> +fmt=$(echo $FILE | sed -e >> 's/.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin/\1/') >> +size=$(echo $FILE | >> sed -e 's/.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin/\2/') >> + >> +case $fmt in >> + yuv410m|yvu410m|yuv411m|yuv420m|yvu420m|yuv422m|yvu422m|yuv444m| > yvu444m) >> + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` >> + fmt=`echo $fmt | tr 'M' 'P'` >> + ;; >> + nv12m|nv21m|nv16m|nv61m) >> + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` >> + fmt=`echo $fmt | tr -d 'M'` >> + ;; >> + argb555|xrgb555) >> + fmt=RGB555X >> + ;; >> + argb32|xrgb32) >> + fmt=RGB32 >> + ;; >> + abgr32|xbgr32) >> + fmt=BGR32 >> + ;; >> + *) >> + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` >> + ;; >> +esac >> + >> +# Only run pnmtopng if the conversion to PNM succeeds >> +raw2rgbpnm -s $size -f $fmt $FILE $FILE.pnm && \ > > How about stripping the .bin suffix to avoid calling the output file *.bin.png > ? Yeah, we can probably manage this :D >> + pnmtopng $FILE.pnm > $FILE.png > > We already have a dependency on ImageMagick (although on the target side, not > the host side). Shoould we use convert instead of pnmtopng ? Ahh - excellent plan. Actually I'd been using this script on the host only, using convert makes it easy to run this on the target as well. That means in fact that I can convert 'bin' files from tmpfs storage and output small png's without hammering the network on NFS usage. Sounds like a win to me ! > >> +rm $FILE.pnm >
diff --git a/scripts/Makefile b/scripts/Makefile index 8c452f4c54ce..6586b2989aed 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -1,4 +1,4 @@ -SCRIPTS=logger.sh vsp-lib.sh +SCRIPTS=$(wildcard *.sh) all: diff --git a/scripts/bin2png.sh b/scripts/bin2png.sh new file mode 100755 index 000000000000..527c5546514d --- /dev/null +++ b/scripts/bin2png.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +FILE="$1" + +fmt=$(echo $FILE | sed -e 's/.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin/\1/') +size=$(echo $FILE | sed -e 's/.*-\([[:alnum:]]*\)-\([0-9]*x[0-9]*\).*.bin/\2/') + +case $fmt in + yuv410m|yvu410m|yuv411m|yuv420m|yvu420m|yuv422m|yvu422m|yuv444m|yvu444m) + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` + fmt=`echo $fmt | tr 'M' 'P'` + ;; + nv12m|nv21m|nv16m|nv61m) + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` + fmt=`echo $fmt | tr -d 'M'` + ;; + argb555|xrgb555) + fmt=RGB555X + ;; + argb32|xrgb32) + fmt=RGB32 + ;; + abgr32|xbgr32) + fmt=BGR32 + ;; + *) + fmt=`echo $fmt | tr '[:lower:]' '[:upper:]'` + ;; +esac + +# Only run pnmtopng if the conversion to PNM succeeds +raw2rgbpnm -s $size -f $fmt $FILE $FILE.pnm && \ + pnmtopng $FILE.pnm > $FILE.png +rm $FILE.pnm