Changes of Revision 92

ffhevc.changes Changed
x
 
1
@@ -1,4 +1,16 @@
2
 -------------------------------------------------------------------
3
+Sat Feb 24 10:50:00 UTC 2018 - neutrino8@opensuse.org
4
+
5
+- Update to version 3.6.0
6
+  * Set the eq saturation default value to 1.0 (same as filter default)
7
+  * Add the colorspace and colormatrix filters when doing an HDR
8
+    to SDR conversion
9
+  * Lower tonemap desat strength to 2.8
10
+  * Support white point adaptation for HDR to SDR
11
+  * Moved the colorspace filter after the scale one
12
+  * Moved the pixel format filter near the end of the filter chain
13
+
14
+-------------------------------------------------------------------
15
 Thu Feb 22 10:40:00 UTC 2018 - neutrino8@opensuse.org
16
 
17
 - Update to version 3.5.9
18
ffhevc.spec Changed
10
 
1
@@ -17,7 +17,7 @@
2
 
3
 
4
 Name:           ffhevc
5
-Version:        3.5.9
6
+Version:        3.6.0
7
 Release:        0
8
 Summary:        A small shell script for encoding to H.265/HEVC with ffmpeg
9
 License:        GPL-2.0+
10
ffhevc-3.5.9.tar.gz/ChangeLog -> ffhevc-3.6.0.tar.gz/ChangeLog Changed
14
 
1
@@ -1,3 +1,12 @@
2
+2018-02-24 - ffhevc 3.6.0
3
+   * Set the eq saturation default value to 1.0 (same as filter default)
4
+   * Add the colorspace and colormatrix filters when doing an HDR
5
+     to SDR conversion
6
+   * Lower tonemap desat strength to 2.8
7
+   * Support white point adaptation for HDR to SDR
8
+   * Moved the colorspace filter after the scale one
9
+   * Moved the pixel format filter near the end of the filter chain
10
+   
11
 2018-02-22 - ffhevc 3.5.9
12
    * Support per-file HDR side data when running in batch mode
13
    * Minor code optimizations
14
ffhevc-3.5.9.tar.gz/ffhevc -> ffhevc-3.6.0.tar.gz/ffhevc Changed
109
 
1
@@ -2,8 +2,8 @@
2
 #
3
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
4
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
5
-# Version: 3.5.9
6
-# Date: 2018-02-22
7
+# Version: 3.6.0
8
+# Date: 2018-02-24
9
 #
10
 # ffhevc is free software ; you can redistribute it and/or modify
11
 # it under the terms of the GNU General Public License as published by
12
@@ -24,7 +24,7 @@
13
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
14
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
15
 
16
-version="3.5.9"
17
+version="3.6.0"
18
 
19
 CFG="$HOME/.ffhevc"
20
 cfgversion="38"
21
@@ -991,16 +991,16 @@
22
            echo " 5 -> Hable"
23
            echo " 6 -> Mobius"
24
            echo
25
-           printf "Specify the Tone Mapping Algorithm [default is 6]: "
26
+           printf "Specify the Tone Mapping Algorithm [default is 4]: "
27
            read tmaopt
28
            case "$tmaopt" in
29
                0)  tm_algo="none" ;;
30
                1)  tm_algo="clip" ;;
31
                2)  tm_algo="linear" ;;
32
                3)  tm_algo="gamma" ;;
33
-               4)  tm_algo="reinhard" ;;
34
+               4|"")   tm_algo="reinhard" ;;
35
                5)  tm_algo="hable" ;;
36
-               6|"")   tm_algo="mobius" ;;
37
+               6)  tm_algo="mobius" ;;
38
                *)
39
                error "-> Invalid option!"
40
                exit 1
41
@@ -1016,19 +1016,19 @@
42
                3)
43
                printf "Specify the Exponent of the Function [default is 1.8]: "
44
                ;;
45
-               4)
46
+               4|"")
47
                printf "Specify the local Contrast Coefficient at the Display Peak [default is 0.5]: "
48
                ;;
49
-               6|"")
50
+               6)
51
                printf "Specify the Transition Point from Linear to Mobius Transform [default is 0.3]: "
52
                ;;
53
            esac
54
            read tmparam
55
            test ! -z "$tmparam" && tm_param=":param=$tmparam"
56
            
57
-           printf "Specify the Tonemap Desaturation Strength [default is 4.2]: "
58
+           printf "Specify the Tonemap Desaturation Strength [default is 2.8]: "
59
            read desat
60
-           test -z "$desat" && tm_desat=":desat=4.2" || tm_desat=":desat=$desat"
61
+           test -z "$desat" && tm_desat=":desat=2.8" || tm_desat=":desat=$desat"
62
            echo
63
            video_chars_func vchars
64
            echo
65
@@ -1059,24 +1059,29 @@
66
                    colcopy="1"
67
                fi
68
                ;;
69
-               1)  zscale="zscale=transfer=bt709"; colorprim=":transfer=bt709:colorprim=bt709:colormatrix=bt709" ;;
70
-               2)  zscale="zscale=transfer=bt470bg"; colorprim=":transfer=bt470bg:colorprim=bt470bg:colormatrix=bt470bg" ;;
71
-               3)  zscale="zscale=transfer=smpte170m"; colorprim=":transfer=smpte170m:colorprim=smpte170m:colormatrix=smpte170m" ;;
72
+               1)  zscale="zscale=transfer=bt709"; colorspace="colormatrix=bt2020:bt709,colorspace=all=bt709:dither=fsb"; colorprim=":transfer=bt709:colorprim=bt709:colormatrix=bt709" ;;
73
+               2)  zscale="zscale=transfer=bt470bg"; colorspace="colormatrix=bt2020:bt470bg,colorspace=all=bt470bg:dither=fsb"; colorprim=":transfer=bt470bg:colorprim=bt470bg:colormatrix=bt470bg" ;;
74
+               3)  zscale="zscale=transfer=smpte170m"; colorspace="colormatrix=bt2020:smpte170m,colorspace=all=smpte170m:dither=fsb"; colorprim=":transfer=smpte170m:colorprim=smpte170m:colormatrix=smpte170m" ;;
75
                *)
76
                error "-> Invalid option!"
77
                exit 1
78
                ;;
79
            esac
80
            if [ ! -z "$zscale" -a -z "$colcopy" ]; then
81
+               printf "Set the White Point Adaptation [bradford/vonkries/identity - default is bradford]: "
82
+               read wpa
83
+               test -z "$wpa" && wpadapt=":wpadapt=bradford" || wpadapt=":wpadapt=$wpa"
84
+               
85
                printf "Apply a Color Saturation Correction? [y/N]: "
86
                read satcor
87
                if [ "$satcor" = "y" -o "$satcor" = "Y" ]; then
88
-                   printf "Specify the Saturation Strength [0.0-3.0 - default is 1.25]: "
89
+                   printf "Specify the Saturation Strength [0.0-3.0 - default is 1.0 (no change)]: "
90
                    read satval
91
-                   test -z "$satval" && eq="eq=saturation=1.25,$pixformat" || eq="eq=saturation=$satval,$pixformat"
92
+                   test ! -z "$satval" && eq="eq=saturation=$satval,"
93
                fi
94
            fi
95
            test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo$tm_param$tm_desat,$zscale,"
96
+           test ! -z "$colorspace" && colorspace="$colorspace$wpadapt,"
97
        fi
98
    fi
99
 }
100
@@ -3094,7 +3099,7 @@
101
 
102
 test "$CHAPS" = "n" && CHPS="-map_chapters -1"
103
 
104
-vidfilters="$(echo "$deinterlace$detelecine$tonemap$pixformat$colorspace$crop$deblock$denoise$scale$unsharp$eq$rotate$setpts$fps$framestep" | sed 's|,$||')"
105
+vidfilters="$(echo "$deinterlace$detelecine$tonemap$crop$deblock$denoise$scale$colorspace$unsharp$eq$rotate$pixformat$setpts$fps$framestep" | sed 's|,$||')"
106
 
107
 test ! -z "$vidfilters" && vfilters="-vf $vidfilters"
108
 
109