Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.5.8.tar.gz/ChangeLog -> ffhevc-3.5.9.tar.gz/ChangeLog Changed

ffhevc-3.5.8.tar.gz/ffhevc -> ffhevc-3.5.9.tar.gz/ffhevc Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 3.5.8
-# Date: 2018-02-17
+# Version: 3.5.9
+# Date: 2018-02-22
 #
 # ffhevc is free software ; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 brown() { echo -e "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="3.5.8"
+version="3.5.9"
 
 CFG="$HOME/.ffhevc"
 cfgversion="38"
@@ -1304,9 +1304,7 @@
 			sdarray=(0=green_x 1=green_y 2=blue_x 3=blue_y 4=red_x 5=red_y 6=white_point_x 7=white_point_y 8=min_luminance 9=max_luminance 10=max_content 11=max_average)
 			for i in {0..11}; do
 				hdrsdi="$(grep "^${sdarrayi}" "$HDRFILE" | tail -1 | awk -F= '{print $2}' | awk -F/ '{print $1}')"
-				if  -z "${hdrsdi}" ; then
-					hdrsdi="ENOT_AVAIL"
-				fi
+				test -z "${hdrsdi}" && hdrsdi="ENOT_AVAIL"
 			done
 			rm -f "$HDRFILE"
 			echo
@@ -1346,6 +1344,31 @@
 	if  ! -z "$master_display" -o ! -z "$max_cll" -o ! -z "$dhdr10" ; then
 		hdr_encopts=":open-gop=0:repeat-headers=1"
 	fi
+	
+	if  ! -z "$batchmode" ; then
+		printf "Auto-Detect and Add HDR Side Data to All Encodes? y/N: "
+		read addhdr
+		if  "$addhdr" = "y" -o "$addhdr" = "Y" ; then
+			echo
+			error "-> NOTE: all input files must contain valid HDR side data (master-display and max-cll)!"
+			echo
+			hdr_sd_func() {
+				echo "    HDRFILE=\"$(dirname "$OUTPUT")/hdr_sd_$$\""
+				echo "    $FFPROBE -i \"\$i\" -v quiet -select_streams v:0 -show_entries side_data -read_intervals %+1 > \"\$HDRFILE\""
+				echo "    sdarray=(0=green_x 1=green_y 2=blue_x 3=blue_y 4=red_x 5=red_y 6=white_point_x 7=white_point_y 8=min_luminance 9=max_luminance 10=max_content 11=max_average)"
+				echo "    for sd in {0..11}; do"
+				echo "        hdrsdsd=\"\$(grep \"^\${sdarraysd}\" \"\$HDRFILE\" | tail -1 | awk -F= '{print \$2}' | awk -F/ '{print \$1}')\""
+				echo "    done"
+				echo "    rm -f \"\$HDRFILE\""
+				echo "    hdr_encopts=\":open-gop=0:repeat-headers=1\""
+				echo "    mast_disp=\"G(\${hdrsd0},\${hdrsd1})B(\${hdrsd2},\${hdrsd3})R(\${hdrsd4},\${hdrsd5})WP(\${hdrsd6},\${hdrsd7})L(\${hdrsd9},\${hdrsd8})\""
+				echo "    max_cll=\":max-cll=\${hdrsd10},\${hdrsd11}\""
+			}
+			hdr_encopts="\$hdr_encopts"
+			master_display=":master-display=\"\$mast_disp\""
+			max_cll="\$max_cll"
+		fi
+	fi
 fi
 
 # Used by cropping and bitrate
@@ -1353,7 +1376,7 @@
 video_length_func() {
 	case "$1" in
 		file)	VLENGTH="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print $1}')" ;;
-		batch)	echo "VLENGTH=\"\$($FFPROBE -i \"\$i\" -v quiet -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print \$1}')\"" ;;
+		batch)	echo "    VLENGTH=\"\$($FFPROBE -i \"\$i\" -v quiet -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print \$1}')\"" ;;
 	esac
 }
 
@@ -1362,8 +1385,8 @@
 		printf "Auto-Crop the Input Files? y/N: "
 		read autocrop
 		if  "$autocrop" = "y" -o "$autocrop" = "Y" ; then
-			CROPVAL="\$($FFMPEG -ss \$((\$VLENGTH/2)) -i \"\$i\" -map 0:0 -vf cropdetect=24:4 -frames:v 1000 -f null - 2>&1 | awk '/crop/ {print \$NF}' | awk -F= '{print \$2}' | tail -1)"
-			crop="crop=\$CROPVAL,"
+			CROPVAL="    \$($FFMPEG -ss \$((\$VLENGTH/2)) -i \"\$i\" -map 0:0 -vf cropdetect=24:4 -frames:v 1000 -f null - 2>&1 | awk '/crop/ {print \$NF}' | awk -F= '{print \$2}' | tail -1)"
+			crop="    crop=\$CROPVAL,"
 		fi
 	else
 		echo
@@ -3125,8 +3148,11 @@
 	echo "" >> "$OUTFILE"
 	echo "$FORLOOP_START" >> "$OUTFILE"
 	echo "$CHKFILE_START" >> "$OUTFILE"
-	if  "$autocrop" = "y" -o "$autocrop" = "Y" ; then
+	if  "$addhdr" = "y" -o "$addhdr" = "Y" ; then
+		hdr_sd_func >> "$OUTFILE"
 		echo "" >> "$OUTFILE"
+	fi
+	if  "$autocrop" = "y" -o "$autocrop" = "Y" ; then
 		echo "echo" >> "$OUTFILE"
 		echo "green \"-> Detecting crop values for '\$(basename \"\$i\")'...\"" >> "$OUTFILE"
 		video_length_func batch >> "$OUTFILE"

ffhevc-3.5.8.tar.gz/hdr -> ffhevc-3.5.9.tar.gz/hdr Changed

Changes of Revision 90