@@ -1,4 +1,23 @@

 -------------------------------------------------------------------

+Mon Nov 07 16:25:00 UTC 2016 - neutrino8@opensuse.org

+

+- Update to version 2.9.5

+  * Cosmetics in the code for deinterlacing

+  * Instead of skipping FPS conversion if the FPS can't be detected,

+    ask the user to provide it

+  * Use single brackets instead of double ones in the nosound

+    setup code

+  * Added license snippet at the top of the script

+  * Added support for outputting to additional container formats

+  * Do some checking on supported audio codecs for the supported

+    containers

+  * Check specified container and warn and exit if it's not supported

+  * Support setting the FLAC compression level

+  * Break out of the if conditionals in the audio code and replace

+    them with two case statements

+  * Update to the README file

+  

+-------------------------------------------------------------------

 Sun Nov 06 09:52:00 UTC 2016 - neutrino8@opensuse.org

 - Update to version 2.9.4

​

@@ -17,7 +17,7 @@

 Name:           ffhevc

-Version:        2.9.4

+Version:        2.9.5

 Release:        0

 Summary:        A small shell script for encoding to H.265/HEVC with ffmpeg

 License:        GPL-2.0+

​

@@ -1,3 +1,19 @@

+2016-11-07 - ffhevc 2.9.5

+   * Cosmetics in the code for deinterlacing

+   * Instead of skipping FPS conversion if the FPS can't be detected,

+     ask the user to provide it

+   * Use single brackets instead of double ones in the nosound

+     setup code

+   * Added license snippet at the top of the script

+   * Added support for outputting to additional container formats

+   * Do some checking on supported audio codecs for the supported

+     containers

+   * Check specified container and warn and exit if it's not supported

+   * Support setting the FLAC compression level

+   * Break out of the if conditionals in the audio code and replace

+     them with two case statements

+   * Update to the README file

+   

 2016-11-06 - ffhevc 2.9.4

    * Bugfix: resampling wasn't working for fdk-aac due to missing

      value in the case statement

​

@@ -27,6 +27,7 @@

 - it supports cover art for the MKV container.

 - it supports the x265 presets and tune profiles.

 - it supports custom written preset files.

+- it can output to more than one container.

 Parameters:

​

@@ -2,15 +2,28 @@

 #

 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.

 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>

-# Version: 2.9.4

-# Date: 2016-11-06

-# License: GNU GPLv2+

+# Version: 2.9.5

+# Date: 2016-11-07

+#

+# ffhevc is free software ; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation ; either version 2 of the License, or

+# (at your option) any later version.

+#

+# ffhevc is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY ; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program ; if not, write to the Free Software

+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }

 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }

 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }

-version="2.9.4"

+version="2.9.5"

 CFG="$HOME/.ffhevc"

 cfgversion="28"

@@ -355,11 +368,55 @@

        read confmt

        test -z "$confmt" && CON="mkv" || CON="$confmt"

    fi

+   

    CON="$(echo "$CON" | tr '[:upper:]' '[:lower:]')"

+   

    case "$CON" in

-       mp4|m4v|mov)    movflags="-movflags +faststart" ;;

+       mp4)    movflags="-movflags +faststart" ;;

+       mkv)    true ;;

+       *)

+       error "-> HEVC video not supported by chosen container!"

+       error "-> Supported containers are: mkv and mp4"

+       error "-> Check your config file, if needed, in '$CFG'"

+       exit 1

+       ;;

    esac

+   printf "Output to Additional Container Formats? [y/N]: "

+   read acf

+   if [ "$acf" = "y" -o "$acf" = "Y" ]; then

+       printf "Specify the Container Formats [example: mp4,mkv - press 'Enter' to skip]: "

+       read econ

+       test ! -z "$econ" && extracon="$(echo "$econ" | sed 's|,| |g' | tr '[:upper:]' '[:lower:]')"

+       if [ ! -z "$extracon" ]; then

+           for i in $extracon; do

+               if [ "$i" = "$CON" ]; then

+                   error "-> Additional container matches the main output container!"

+                   exit 1

+               fi

+               case "$i" in

+                   mkv|mp4) true ;;

+                   *)

+                   error "-> HEVC video not supported by the $i container!"

+                   error "-> Supported containers are: mkv and mp4"

+                   exit 1

+                   ;;

+               esac

+               echo

+               case "$i" in

+                   mkv)

+                   green "-> Note: additional container $i supports all the audio codecs"

+                   ;;

+                   mp4)

+                   green "-> Note: additional container $i supports the following audio codecs:"

+                   green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|copy|nosound"

+                   ;;

+               esac

+           done

+           echo

+       fi

+   fi

+   

    OUTPUT="$OUTPUT.$CON"

    test -e "$OUTPUT" && mv -f "$OUTPUT" "$OUTPUT.old"

@@ -528,8 +585,8 @@

    esac

    green "-> Detected $fparity Parity"

    if [ "$fp" = "progressive" ]; then

-       error "-> Your file appears to be progressive but"

-       error "   this may be a misdetection!"

+       error "-> The video stream appears to be progressive"

+       error "   but this may be a misdetection!"

    elif [ "$fp" = "???" ]; then

        error "-> Could not detect the Field Parity!"

    fi

@@ -576,16 +633,15 @@

            video_fps_func

            if [ ! -z "$GETFPS" ]; then

                FPS1="$(echo "$GETFPS" | awk -F/ '{print $1}')"

-               FPS2="$(echo "$GETFPS"| awk -F/ '{print $2}')"

+               FPS2="$(echo "$GETFPS" | awk -F/ '{print $2}')"

                OFPS="$(($FPS1*2))/$FPS2"

                green "-> Detected: $FPS1/$FPS2 FPS"

                green "-> Setting output FPS to: $OFPS"

-               echo

                ofps="-r $OFPS"

            else

                error "-> Could not detect the FPS value!"

-               echo

            fi

+           echo

            video_deinterlace_func bob

            bob="1"

            ;;

@@ -750,7 +806,7 @@

            sleep 1

            video_fps_func

            if [ ! -z "$GETFPS" ]; then

-               green "-> Detected: $GETFPS FPS"

+               green "-> Detected $GETFPS FPS"

            else

                error "-> Could not detect the FPS value!"

            fi

@@ -760,141 +816,147 @@

                echo

                error "-> Detected FPS is not supported yet!"

                error "-> Supported FPS are: 24/1, 25/1, 24000/1001 and 30000/1001"

-               error "-> Skipping FPS conversion!"

-               skipfps="1"

+               echo

+               printf "Specify the FPS value of the Input File [no default!]: "

+               read infps

+               case "$infps" in

+                   24/1|25/1|24000/1001|30000/1001) true ;;

+                   ""|*)

+                   error "-> No value or unsupported value given!"

+                   exit 1

+                   ;;

+               esac

                ;;

            esac

            echo

-           if [ -z "$skipfps" ]; then

-               brown " FPS Conversion Filters"

-               brown " ~~~~~~~~~~~~~~~~~~~~~~"

-               echo " 0 -> fps (converts by duplicating/dropping of frames)"

-               echo " 1 -> setpts + atempo (converts by PTS + audio speedup/down)"

-               echo

-               printf "Specify the FPS conversion method [default is 0]: "

-               read fcm

+           brown " FPS Conversion Filters"

+           brown " ~~~~~~~~~~~~~~~~~~~~~~"

+           echo " 0 -> fps (converts by duplicating/dropping of frames)"

+           echo " 1 -> setpts + atempo (converts by PTS + audio speedup/down)"

+           echo

+           printf "Specify the FPS conversion method [default is 0]: "

+           read fcm

+           case "$fcm" in

+               0|1|"") true ;;

+               *)

+               error "-> Invalid option!"

+               exit 1

+               ;;

+           esac

+           echo

+           brown " NTSC <-> PAL and NTSC <-> NTSC FPS Conversion"

+           brown " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

+           echo " 0 --> 23.976 FPS (24000/1001) to 24 FPS"

+           echo " 1 --> 23.976 FPS (24000/1001) to 25 FPS"

+           echo " 2 --> 23.976 FPS (24000/1001) to 29.970 FPS"

+           echo

+           echo " 3 --> 24 FPS to 23.976 FPS (24000/1001)"

+           echo " 4 --> 24 FPS to 25 FPS"

+           echo " 5 --> 24 FPS to 29.970 FPS (30000/1001)"

+           echo

+           echo " 6 --> 25 FPS to 23.976 FPS (24000/1001)"

+           echo " 7 --> 25 FPS to 24 FPS"

+           echo " 8 --> 25 FPS to 29.970 FPS (30000/1001)"

+           echo

+           echo " 9 --> 29.970 FPS (30000/1001) to 23.976 FPS (24000/1001)"

+           echo " 10 -> 29.970 FPS (30000/1001) to 24 FPS"

+           echo " 11 -> 29.970 FPS (30000/1001) to 25 FPS"

+           echo

+           printf "Specify the FPS Conversion option [press 'Enter' to skip]: "

+           read fpsopt

+           case "$fpsopt" in

+               0)

                case "$fcm" in

-                   0|1|"") true ;;

-                   *)

-                   error "-> Invalid option!"

-                   exit 1

-                   ;;

+                   0|"")   fps="fps=fps=24," ;;

​