so-rose
/
convmlv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Fixed #20 and #22, though MLV to DNG lags after completion. Also, fixed mkrelease.sh to work with 2.0.1 as opposed to the modularization branch. #22 fix is quite sloppy (-oP replaced with -E).

master
Tine Sørensen 2016-12-29 20:22:10 +01:00
parent 309c70c3d5
commit a3e38e49b7
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
convmlv.sh
View File

@ -66,7 +66,7 @@ INPUT_ARGS=$(echo "$@") #The original input argument string.
if [[ $OSTYPE == "linux-gnu" ]]; then if [[ $OSTYPE == "linux-gnu" ]]; then
THREADS=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | tail -1) THREADS=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | tail -1)
elif [[ $OSTYPE == "darwin11" ]]; then elif [[ $OSTYPE == "darwin11" || $OSTYPE == "darwin15" ]]; then
THREADS=$(sysctl -n hw.ncpu) THREADS=$(sysctl -n hw.ncpu)
else else
THREADS=4 THREADS=4
@ -119,7 +119,7 @@ setDefaults() { #Set all the default variables. Run here, and also after each AR
MAN_DEPS="mlv_dump raw2dng cr2hdr mlv2badpixels.sh balance.py sRange.py color-core" MAN_DEPS="mlv_dump raw2dng cr2hdr mlv2badpixels.sh balance.py sRange.py color-core"
if [[ $OSTYPE == "linux-gnu" ]]; then if [[ $OSTYPE == "linux-gnu" ]]; then
PYTHON="python3" PYTHON="python3"
elif [[ $OSTYPE == "darwin11" ]]; then elif [[ $OSTYPE == "darwin11" || $OSTYPE == "darwin15" ]]; then
PYTHON="python3" PYTHON="python3"
else else
PYTHON="python" PYTHON="python"
@ -1486,7 +1486,7 @@ mlvSet() {
ISO=`echo "$camDump" | grep 'ISO' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f2` ISO=`echo "$camDump" | grep 'ISO' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f2`
APERTURE=`echo "$camDump" | grep 'Aperture' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1` APERTURE=`echo "$camDump" | grep 'Aperture' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1`
LEN_FOCAL=`echo "$camDump" | grep 'Focal Len' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1` LEN_FOCAL=`echo "$camDump" | grep 'Focal Len' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1`
SHUTTER=`echo "$camDump" | grep 'Shutter' | sed 's/[[:alpha:] ]*: //' | grep -oP '\(\K[^)]+' | cut -d$'\n' -f1` SHUTTER=`echo "$camDump" | grep 'Shutter' | sed 's/[[:alpha:] ]*: //' | grep -E '\(\K[^)]+' | cut -d$'\n' -f1`
REC_DATE=`echo "$camDump" | grep 'Date' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1` REC_DATE=`echo "$camDump" | grep 'Date' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1`
REC_TIME=`echo "$camDump" | grep 'Time: [0-2][0-9]\:*' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1` REC_TIME=`echo "$camDump" | grep 'Time: [0-2][0-9]\:*' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1`
KELVIN=`echo "$camDump" | grep 'Kelvin' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1` KELVIN=`echo "$camDump" | grep 'Kelvin' | sed 's/[[:alpha:] ]*: //' | cut -d$'\n' -f1`
@ -1886,7 +1886,7 @@ for ARG in "${FILE_ARGS_ITER[@]}"; do #Go through FILE_ARGS_ITER array, copied f
$2 $3 $4 -o "${tmpOut}/${9}_" -f ${range} $6 --dng --batch | { #mlv_dump command. Uses frame range. $2 $3 $4 -o "${tmpOut}/${9}_" -f ${range} $6 --dng --batch | { #mlv_dump command. Uses frame range.
lastCur=0 lastCur=0
while IFS= read -r line; do while IFS= read -r line; do
output=$(echo $line | grep -Po 'V.*A' | cut -d':' -f2 | cut -d$' ' -f1) #Hacked my way to the important bit. output=$(echo $line | grep -E 'V.*A' | cut -d':' -f2 | cut -d$' ' -f1) #Hacked my way to the important bit.
if [[ $output == "" ]]; then continue; fi #If there's no important bit, don't print. if [[ $output == "" ]]; then continue; fi #If there's no important bit, don't print.
cur=$(echo "$output" | cut -d'/' -f1) #Current frame. cur=$(echo "$output" | cut -d'/' -f1) #Current frame.

6
mkrelease.sh
View File

@ -11,18 +11,16 @@ VERSION=$(echo "$(./convmlv.sh -v)" | sed -e 's/\./\_/g')
## It's reccommended that BINPATH is a folder in REP_PATH. ## It's reccommended that BINPATH is a folder in REP_PATH.
REP_PATH="$(pwd)" REP_PATH="$(pwd)"
BINPATH="${REP_PATH}/binaries"
RELEASE="${REP_PATH}/release" RELEASE="${REP_PATH}/release"
mkdir -p "$RELEASE" mkdir -p "$RELEASE"
if [[ $OSTYPE == "linux-gnu" ]]; then if [[ $OSTYPE == "linux-gnu" ]]; then
PLATFORM="linux" PLATFORM="linux"
elif [[ $OSTYPE == "darwin11" ]]; then elif [[ $OSTYPE == "darwin11" || $OSTYPE == "darwin15" ]]; then
PLATFORM="mac" PLATFORM="mac"
else else
echo "Platform not yet supported! Contact me at contact@sofusrose.com." echo "Platform not yet supported! Contact me at contact@sofusrose.com."
fi fi
cd "$BINPATH" tar -czvf $RELEASE/convmlv-${VERSION}-${PLATFORM}.tar.gz balance.py mlv2badpixels.sh mlv_dump raw2dng cr2hdr sRange.py CHANGELOG licence convmlv.sh color-core/ color-ext DEPENDENCIES docs/MANPAGE docs/docs.pdf docs/workflow.txt configs/*
tar -czvf $RELEASE/convmlv-${VERSION}-${PLATFORM}.tar.gz ../balance.py mlv2badpixels.sh mlv_dump raw2dng cr2hdr ../sRange.py ../CHANGELOG ../licence ../convmlv.sh ../color-core/ ../color-ext ../DEPENDENCIES ../docs/MANPAGE ../docs/docs.pdf ../docs/workflow.txt ../configs/*