Projects
Multimedia
ffx264
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 41
View file
ffx264.changes
Changed
@@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Jan 24 16:20:00 UTC 2017 - neutrino8@opensuse.org + +- Update to version 3.3.3 + * Removed one of the OUTPUT variables for batch mode. It is + no longer needed + * Rewrote the audio channel layout code. It is now based on + per-codec encoder support + * Repositioned the audio channel checking code + +------------------------------------------------------------------- Fri Jan 20 13:37:00 UTC 2017 - neutrino8@opensuse.org - Update to version 3.3.2
View file
ffx264.spec
Changed
@@ -17,7 +17,7 @@ Name: ffx264 -Version: 3.3.2 +Version: 3.3.3 Release: 0 Summary: A small shell script for encoding to H.264 with ffmpeg License: GPL-2.0+
View file
ffx264-3.3.2.tar.gz/ChangeLog -> ffx264-3.3.3.tar.gz/ChangeLog
Changed
@@ -1,3 +1,10 @@ +2017-01-24 - ffx264 3.3.3 + * Removed one of the OUTPUT variables for batch mode. It is + no longer needed + * Rewrote the audio channel layout code. It is now based on + per-codec encoder support + * Repositioned the audio channel checking code + 2017-01-20 - ffx264 3.3.2 * Fixed a small issue in the output code for batch mode
View file
ffx264-3.3.2.tar.gz/ffx264 -> ffx264-3.3.3.tar.gz/ffx264
Changed
@@ -2,8 +2,8 @@ # # Small script to encode to H.264/AVC video using FFmpeg and libx264. # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org> -# Version: 3.3.2 -# Date: 2017-01-20 +# Version: 3.3.3 +# Date: 2017-01-24 # # ffx264 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 "\e[0;33m$1\e[0;39;49m"; } error() { echo -e "\e[1;31m$1\e[0;39;49m"; } -version="3.3.2" +version="3.3.3" CFG="$HOME/.ffx264" cfgversion="30" @@ -506,7 +506,6 @@ mv -f "$OUTPUT" "$OUTPUT.$$.old" fi else - OUTPUT="$(dirname "$OUTPUT")/\${i%.*}.$CONFMT" CHDIR="cd \"$(dirname "$input")\"" FORLOOP_START="for i in *; do" CHKFILE_START="if [ -f \"\$i\" ]; then" @@ -1830,55 +1829,6 @@ printf "Track $i: How many Channels to Encode? [${chanrange[i]} - default is ${defchan[i]}]: " read achan[i] test -z "${achan[i]}" && ach[i]="${defchan[i]}" || ach[i]="${achan[i]}" - case "${ach[i]}" in - 1) chlayout[i]="mono"; achmeta[i]="Mono" ;; - 2) chlayout[i]="stereo"; achmeta[i]="Stereo" ;; - 3) chlayout[i]="3.0"; achmeta[i]="3.0" ;; - 4) - printf "Track $i: Use Quad or 4.0 Layout? [quad/4.0 - default is quad]: " - read acl - case "$(echo "$acl" | tr '[:upper:]' '[:lower:]')" in - quad|"") - case "${acodec[i]}" in - dts) chlayout[i]="quad(side)" ;; - alac) - echo - error "-> Quad channel layout not supported by ALAC encoder!" - error "-> Use 4.0 instead but channel order may be wrong" - echo - exit 1 - ;; - ""|*) chlayout[i]="quad" ;; - esac - achmeta[i]="4.0" - ;; - 4.0|4) - if [ "${acodec[i]}" = "dts" ]; then - echo - error "-> 4.0 channel layout not supported by DTS encoder!" - error "-> Use Quad instead but channel order may be wrong" - echo - exit 1 - fi - achmeta[i]="4.0" - chlayout[i]="4.0" - ;; - *) - error "-> Invalid value!" - exit 1 - ;; - esac - ;; - 5) achmeta[i]="5.0"; test "${acodec[i]}" = "dts" && chlayout[i]="5.0(side)" || chlayout[i]="5.0" ;; - 6) achmeta[i]="5.1"; test "${acodec[i]}" = "dts" && chlayout[i]="5.1(side)" || chlayout[i]="5.1" ;; - 7) achmeta[i]="6.1"; test "${acodec[i]}" = "alac" && chlayout[i]="6.1(back)" || chlayout[i]="6.1" ;; - 8) achmeta[i]="7.1"; test "${acodec[i]}" = "alac" && chlayout[i]="7.1(wide)" || chlayout[i]="7.1" ;; - *) - error "-> ${ach[i]} channels not supported!" - exit 1 - ;; - esac - case "${acodec[i]}" in ac3|eac3|"") case "${ach[i]}" in @@ -1943,8 +1893,284 @@ ;; esac + echo + brown " Audio Channel Layouts" + brown " ~~~~~~~~~~~~~~~~~~~~~" + case "${acodec[i]}" in + ac3|eac3|"") + echo " 0 -> Mono 4 -> Quad 8 --> 5.0" + echo " 1 -> Stereo 5 -> Quad(side) 9 --> 5.0(side)" + echo " 2 -> 3.0 6 -> 4.0 10 -> 5.1" + echo " 3 -> 3.0(back) 7 -> 4.1 11 -> 5.1(side)" + echo + printf "Specify the Audio Channel Layout [default is 10]: " + read achanlayout[i] + case "${achanlayout[i]}" in + 0) achlayout[i]="mono"; achmeta[i]="Mono" ;; + 1) achlayout[i]="stereo"; achmeta[i]="Stereo" ;; + 2) achlayout[i]="3.0"; achmeta[i]="3.0" ;; + 3) achlayout[i]="3.0(back)"; achmeta[i]="3.0" ;; + 4) achlayout[i]="quad"; achmeta[i]="Quad" ;; + 5) achlayout[i]="quad(side)"; achmeta[i]="Quad" ;; + 6) achlayout[i]="4.0"; achmeta[i]="4.0" ;; + 7) achlayout[i]="4.1"; achmeta[i]="4.1" ;; + 8) achlayout[i]="5.0"; achmeta[i]="5.0" ;; + 9) achlayout[i]="5.0(side)"; achmeta[i]="5.0" ;; + 10|"") achlayout[i]="5.1"; achmeta[i]="5.1" ;; + 11) achlayout[i]="5.1(side)"; achmeta[i]="5.1" ;; + *) + error "-> Invalid option!" + exit 1 + ;; + esac + ;; + dts) + echo " 0 -> Mono 3 -> 5.0(side)" + echo " 1 -> Stereo 4 -> 5.1(side)" + echo " 2 -> Quad(side)" + echo + printf "Specify the Audio Channel Layout [default is 4]: " + read achanlayout[i] + case "${achanlayout[i]}" in + 0) achlayout[i]="mono"; achmeta[i]="Mono" ;; + 1) achlayout[i]="stereo"; achmeta[i]="Stereo" ;; + 2) achlayout[i]="quad(side)"; achmeta[i]="Quad" ;; + 3) achlayout[i]="5.0(side)"; achmeta[i]="5.0" ;; + 4|"") achlayout[i]="5.1(side)"; achmeta[i]="5.1" ;; + *) + error "-> Invalid option!" + exit 1 + ;; + esac + ;; + aac) + echo " 0 -> Mono 4 -> 4.0 8 --> 5.0(side) 12 -> 7.1(wide)" + echo " 1 -> Stereo 5 -> Quad 9 --> 5.1 13 -> 7.1(wide-side)" + echo " 2 -> 3.0 6 -> Quad(side) 10 -> 5.1(side)" + echo " 3 -> 3.0(back) 7 -> 5.0 11 -> 7.1" + echo + printf "Specify the Audio Channel Layout [default is 11]: " + read achanlayout[i] + case "${achanlayout[i]}" in + 0) achlayout[i]="mono"; achmeta[i]="Mono" ;; + 1) achlayout[i]="stereo"; achmeta[i]="Stereo" ;; + 2) achlayout[i]="3.0"; achmeta[i]="3.0" ;; + 3) achlayout[i]="3.0(back)"; achmeta[i]="3.0" ;; + 4) achlayout[i]="4.0"; achmeta[i]="4.0" ;; + 5) achlayout[i]="quad"; achmeta[i]="Quad" ;; + 6) achlayout[i]="quad(side)"; achmeta[i]="Quad" ;; + 7) achlayout[i]="5.0"; achmeta[i]="5.0" ;; + 8) achlayout[i]="5.0(side)"; achmeta[i]="5.0" ;; + 9) achlayout[i]="5.1"; achmeta[i]="5.1" ;; + 10) achlayout[i]="5.1(side)"; achmeta[i]="5.1" ;; + 11|"") achlayout[i]="7.1"; achmeta[i]="7.1" ;; + 12) achlayout[i]="7.1(wide)"; achmeta[i]="7.1" ;; + 13) achlayout[i]="7.1(wide-side)"; achmeta[i]="7.1" ;; + *) + error "-> Invalid option!" + exit 1 + ;; + esac + ;; + fdk*) + echo " 0 -> Mono 4 -> 5.0" + echo " 1 -> Stereo 5 -> 5.1" + echo " 2 -> 3.0 6 -> 7.1" + echo " 3 -> 4.0 7 -> 7.1(wide)" + echo + printf "Specify the Audio Channel Layout [default is 6]: " + read achanlayout[i] + case "${achanlayout[i]}" in + 0) achlayout[i]="mono"; achmeta[i]="Mono" ;; + 1) achlayout[i]="stereo"; achmeta[i]="Stereo" ;; + 2) achlayout[i]="3.0"; achmeta[i]="3.0" ;; + 3) achlayout[i]="4.0"; achmeta[i]="4.0" ;; + 4) achlayout[i]="5.0"; achmeta[i]="5.0" ;; + 5) achlayout[i]="5.1"; achmeta[i]="5.1" ;; + 6|"") achlayout[i]="7.1"; achmeta[i]="7.1" ;; + 7) achlayout[i]="7.1(wide)"; achmeta[i]="7.1" ;; + *) + error "-> Invalid option!" + exit 1 + ;; + esac + ;; + vorbis) + echo " 0 -> Mono 4 -> Quad(side) 8 --> 5.1(side)" + echo " 1 -> Stereo 5 -> 5.0 9 --> 6.1" + echo " 2 -> 3.0 6 -> 5.0(side) 10 -> 7.1" + echo " 3 -> Quad 7 -> 5.1" + echo + printf "Specify the Audio Channel Layout [default is 10]: " + read achanlayout[i] + case "${achanlayout[i]}" in + 0) achlayout[i]="mono"; achmeta[i]="Mono" ;;
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.