Projects
Multimedia
h264enc
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 386
View file
h264enc.spec
Changed
@@ -1,7 +1,7 @@ # norootforbuild Name: h264enc -Version: 10.4.0 +Version: 10.4.1 Release: 1 License: GPL-2.0+ @@ -58,6 +58,15 @@ %changelog +* Tue Jun 23 2015 Grozdan Nikolov <neutrino8@gmail.com> 10.4.1 + * Modified the mail func for dir batch encodes to report the input + directory instead of the last encoded file from it + * Get rid of some commented out code which is no longer used + * The -a52drc option only has an effect if input audio is AC-3. + Since we currently don't store the audio codec detected into + a usable var, disable this option for the time being. + * Increased the detault audio bitrate for AAC from 128 to 192kbps + * Sun May 03 2015 Grozdan Nikolov <neutrino8@gmail.com> 10.4.0 * Accept relative paths for the output file * Do a second crop detection run in case the first try fails
View file
h264enc-10.4.0.tar.gz/doc/ChangeLog -> h264enc-10.4.1.tar.gz/doc/ChangeLog
Changed
@@ -1,3 +1,12 @@ +2015-06-23 - h264enc 10.4.1 + * Modified the mail func for dir batch encodes to report the input + directory instead of the last encoded file from it + * Get rid of some commented out code which is no longer used + * The -a52drc option only has an effect if input audio is AC-3. + Since we currently don't store the audio codec detected into + a usable var, disable this option for the time being. + * Increased the detault audio bitrate for AAC from 128 to 192kbps + 2015-05-03 - h264enc 10.4.0 * Accept relative paths for the output file * Do a second crop detection run in case the first try fails
View file
h264enc-10.4.0.tar.gz/h264enc -> h264enc-10.4.1.tar.gz/h264enc
Changed
@@ -1,5 +1,5 @@ #!/usr/bin/env bash -# $Id: h264enc, v 10.4.0, 2015/05/03, gn Exp $ +# $Id: h264enc, v 10.4.1, 2015/06/23, gn Exp $ # # Encode BDs/DVDs/VCDs/video files to the H.264/AVC/MPEG-4 Part 10 # video format using MEncoder from MPlayer @@ -23,7 +23,7 @@ shopt -u expand_aliases export PATH=$PATH:/usr/local/bin -version=10.4.0 +version=10.4.1 configversion=35 green() { echo -e "\e1;32m$1\e0;39;49m"; } @@ -335,6 +335,10 @@ echo "test -f \"$HOME/.mailrc\" && echo -e \"$MAILMSG\n\nEncoding for \\\"\$(basename \"${OUTPUT%.*}\")\\\" finished on \$(date)\" | $MAIL -s \"$MAILSUBJ\" \"$EMAIL\"" echo ;; + dir) + echo "test -f \"$HOME/.mailrc\" && echo -e \"$MAILMSG\n\nEncoding for directory \\\"\$(dirname \"$infile\")\\\" finished on \$(date)\" | $MAIL -s \"$MAILSUBJ\" \"$EMAIL\"" + echo + ;; *) test -f "$HOME/.mailrc" && echo -e "$MAILMSG\n\nEncoding for \"$(basename "${OUTPUT%.*}")\" finished on $(date)" | $MAIL -s "$MAILSUBJ" "$EMAIL" ;; @@ -4462,9 +4466,8 @@ demuxer="-demuxer lavf" fi $MPLAYER "$sourcetype" $MPLAYEROPTS $device $vid $demuxer $cache -vo null -nosound -identify -frames 1 2>/dev/null > "$TEMPDIR/resolution" - #GETRES="$(grep '^VIDEO:' "$TEMPDIR/resolution" | tail -n 1 | awk '{print $3}' | sed 's|,$||')" - WORIG=$(awk -F= '/^ID_VIDEO_WIDTH/ { print $2 }' < "$TEMPDIR/resolution" ) - HORIG=$(awk -F= '/^ID_VIDEO_HEIGHT/ { print $2 }' < "$TEMPDIR/resolution" ) + WORIG=$(awk -F= '/^ID_VIDEO_WIDTH/ { print $2 }' < "$TEMPDIR/resolution") + HORIG=$(awk -F= '/^ID_VIDEO_HEIGHT/ { print $2 }' < "$TEMPDIR/resolution") GETRES="${WORIG}x${HORIG}" fi @@ -5139,7 +5142,7 @@ $MPLAYER "$sourcetype" $MPLAYEROPTS $device $demuxer $cache -vo null -ao null -identify -frames 1 2>/dev/null > "$AUDTRKS" TRKS="$(grep '^\lavf\' "$AUDTRKS" | awk '{print $4}' | grep 'audio' | wc -l)" if "$TRKS" = "0" ; then - error "-> Could not detect audio tracks and info!" + error "-> Could not detect any audio tracks and info!" else TRKID="$(($TRKS-1))" for i in $(seq 0 $TRKID); do @@ -5470,12 +5473,12 @@ lavc_ac3_audio_func() { ac3_bitrate_func - printf "Track $i: Specify the Dynamic Range Compression 0.0-1.0, higher is stronger - default is 0.0: " - read drc$i - if ! -z "${drc$i}" ; then - ac3drc$i="-a52drc ${drc$i}" - fi - acodec$i="-oac lavc -lavcopts acodec=ac3:abitrate=${abitrate$i} ${ac3drc$i}" + #printf "Track $i: Specify the Dynamic Range Compression 0.0-1.0, higher is stronger - default is 0.0: " + #read drc$i + #if ! -z "${drc$i}" ; then + # ac3drc$i="-a52drc ${drc$i}" + #fi + acodec$i="-oac lavc -lavcopts acodec=ac3:abitrate=${abitrate$i}" } eac3_audio_func() { @@ -5537,10 +5540,10 @@ read aacmode$i case "${aacmode$i}" in a*|A*|"") - printf "Track $i: Specify the AAC Average Bitrate default is 128: " + printf "Track $i: Specify the AAC Average Bitrate default is 192: " read abitrate$i if -z "${abitrate$i}" ; then - br$i="br=128" + br$i="br=192" else br$i="br=${abitrate$i}" fi @@ -5617,7 +5620,7 @@ case "${aacmode$i}" in a*|A*|"") case "${AACTYPE$i}" in - LC-AAC) defaacbr$i="128" ;; + LC-AAC) defaacbr$i="192" ;; HE-AACv1) defaacbr$i="55" ;; HE-AACv2) defaacbr$i="25" ;; esac @@ -5641,7 +5644,7 @@ echo "5 -> 80 kbps 12 -> 256 kbps" echo "6 -> 96 kbps 13 -> 320 kbps" echo - printf "Track $i: Select the AAC Audio Bitrate default is 8: " + printf "Track $i: Select the AAC Audio Bitrate default is 10: " read ab$i case "${ab$i}" in 0) neroaacbr$i="-cbr 32000 ${aacprof$i}" ;; @@ -5652,9 +5655,9 @@ 5) neroaacbr$i="-cbr 80000 ${aacprof$i}" ;; 6) neroaacbr$i="-cbr 96000 ${aacprof$i}" ;; 7) neroaacbr$i="-cbr 112000 ${aacprof$i}" ;; - 8|"") neroaacbr$i="-cbr 128000 ${aacprof$i}" ;; + 8) neroaacbr$i="-cbr 128000 ${aacprof$i}" ;; 9) neroaacbr$i="-cbr 160000 ${aacprof$i}" ;; - 10) neroaacbr$i="-cbr 192000 ${aacprof$i}" ;; + 10|"") neroaacbr$i="-cbr 192000 ${aacprof$i}" ;; 11) neroaacbr$i="-cbr 224000 ${aacprof$i}" ;; 12) neroaacbr$i="-cbr 256000 ${aacprof$i}" ;; 13) neroaacbr$i="-cbr 320000 ${aacprof$i}" ;; @@ -5667,8 +5670,9 @@ ;; v*|V*) SKIPBTRCALC=yes + # Assuming Stereo channels case "${AACTYPE$i}" in - LC-AAC) defaacbr$i="0.35" ;; + LC-AAC) defaacbr$i="0.4" ;; HE-AACv1) defaacbr$i="0.22" ;; HE-AACv2) defaacbr$i="0.11" ;; esac @@ -5704,10 +5708,10 @@ qt|qthq|ag1|ag1hq|ipc|ipchq|ip|iphq|iph|iphhq|atv|atvhq|ar|arhq|ar5|ar5hq|bb|bbhq|nks60|nks60hq|psp|psphq|ps3|ps3hq|mz|mzhq|mx|mxhq) aacprof$i="-t 2" AACTYPE$i="LC-AAC" - printf "Track $i: Specify the AAC Audio Bitrate in kbps default is 128: " + printf "Track $i: Specify the AAC Audio Bitrate in kbps default is 192: " read ab$i if -z "${ab$i}" ; then - fdkaacbr$i="-r 128000 ${aacprof$i} -a 1" + fdkaacbr$i="-r 192000 ${aacprof$i} -a 1" else fdkaacbr$i="-r $((${ab$i}*1000)) ${aacprof$i} -a 1" fi @@ -5727,7 +5731,7 @@ printf "Track $i: Which AAC Profile to use? LC/HE/HEv2 - default is LC: " read aac_profile$i case "${aac_profile$i}" in - LC|lc|"") aacprof$i="-t 2"; AACTYPE$i="LC-AAC"; defaacbr$i="128" ;; + LC|lc|"") aacprof$i="-t 2"; AACTYPE$i="LC-AAC"; defaacbr$i="192" ;; HE|he) aacprof$i="-t 5"; AACTYPE$i="HE-AACv1"; defaacbr$i="55" ;; HEv2|hev2) aacprof$i="-t 29"; AACTYPE$i="HE-AACv2"; defaacbr$i="25" ;; *) @@ -8848,7 +8852,7 @@ echo >> "$BATCH" echo "done" >> "$BATCH" echo >> "$BATCH" - send_email_func exp >> "$BATCH" + send_email_func dir >> "$BATCH" echo "#################### END OF COMMANDS ####################" >> "$BATCH" ;; *) @@ -8870,12 +8874,6 @@ fi done case "${audiocodec1}" in - #aac|"") - #echo - #error "-> AAC audio only supported by the MKV/MP4/TS containers!" - #echo - #exit_func 1 - #;; neroaac|fdkaac|aac+|aftenac3|eac3|vorbis|opus|flac|dts|fftruehd) echo error "-> ${audiocodec1} audio not supported by the AVI container!"
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
.