Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.5.6.tar.gz/ChangeLog -> ffhevc-3.5.7.tar.gz/ChangeLog Changed

ffhevc-3.5.6.tar.gz/ffhevc -> ffhevc-3.5.7.tar.gz/ffhevc Changed

@@ -2,7 +2,7 @@
 #
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 3.5.6
+# Version: 3.5.7
 # Date: 2018-02-16
 #
 # ffhevc is free software ; you can redistribute it and/or modify
@@ -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.6"
+version="3.5.7"
 
 CFG="$HOME/.ffhevc"
 cfgversion="38"
@@ -1293,7 +1293,27 @@
 	printf "Set HDR VUI Options? y/N: "
 	read hdr
 	if  "$hdr" = "y" -o "$hdr" = "Y" ; then
-		printf "Specify the SMPTE ST 2086 Master Display Color Volume press 'Enter' to skip: "
+		printf "Scan for HDR Side Data? y/N: "
+		read hdr_sd
+		if  "$hdr_sd" = "y" -o "$hdr_sd" = "Y" ; then
+			echo
+			green "-> Scanning for HDR Side Data..."
+			$FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries side_data -read_intervals %+1 > "$OUTDIR/hdr_sd$$"
+			
+			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}" "$OUTDIR/hdr_sd$$" | tail -1 | awk -F= '{print $2}' | awk -F/ '{print $1}')"
+				if  -z "${hdrsdi}" ; then
+					hdrsdi="ENOT_AVAILABLE"
+				fi
+			done
+			rm -f "$OUTDIR/hdr_sd$$"
+			
+			green "-> master-display: G(${hdrsd0},${hdrsd1})B(${hdrsd2},${hdrsd3})R(${hdrsd4},${hdrsd5})WP(${hdrsd6},${hdrsd7})L(${hdrsd9},${hdrsd8})"
+			green "-> max-cll: ${hdrsd10},${hdrsd11}"
+			echo
+		fi
+		printf "Specify the SMPTE-ST-2086 Master Display Color Volume (master-display) press 'Enter' to skip: "
 		read mdcv
 		test ! -z "$mdcv" && master_display=":master-display=\"$mdcv\""
 		printf "Specify the Content Light Level Info (max-cll) press 'Enter' to skip: "

ffhevc-3.5.6.tar.gz/hdr -> ffhevc-3.5.7.tar.gz/hdr Changed

@@ -10,25 +10,16 @@
 
 ffprobe -i "$FILE" -v quiet -select_streams v:0 -show_entries side_data -read_intervals %+1 > "$hdrfile"
 
-G_X="$(grep '^green_x' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-G_Y="$(grep '^green_y' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
+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)
 
-B_X="$(grep '^blue_x' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-B_Y="$(grep '^blue_y' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
+for i in {0..11}; do
+	hdri="$(grep "^${sdarrayi}" "$hdrfile" | tail -1 | awk -F= '{print $2}' | awk -F/ '{print $1}')"
+	if  -z "${hdri}" ; then
+		hdri="ENOT_AVAILABLE"
+	fi
+done
 
-R_X="$(grep '^red_x' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-R_Y="$(grep '^red_y' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-
-WP_X="$(grep '^white_point_x' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-WP_Y="$(grep '^white_point_y' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-
-L_MIN="$(grep '^min_luminance' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-L_MAX="$(grep '^max_luminance' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-
-MAX_C="$(grep '^max_content' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-MAX_AVG="$(grep '^max_average' "$hdrfile" | awk -F= '{print $2}' | awk -F/ '{print $1}' | tail -1)"
-
-echo "master-display: G($G_X,$G_Y)B($B_X,$B_Y)R($R_X,$R_Y)WP($WP_X,$WP_Y)L($L_MAX,$L_MIN)"
-echo "max-cll: $MAX_C,$MAX_AVG"
+echo "-> master-display: G(${hdr0},${hdr1})B(${hdr2},${hdr3})R(${hdr4},${hdr5})WP(${hdr6},${hdr7})L(${hdr9},${hdr8})"
+echo "-> max-cll: ${hdr10},${hdr11}"
 
 rm -f "$hdrfile"

Changes of Revision 88