Projects
Multimedia
h264enc
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 375
View file
h264enc.spec
Changed
@@ -1,7 +1,7 @@ # norootforbuild Name: h264enc -Version: 10.2.9 +Version: 10.3.0 Release: 1 License: GPL-2.0+ @@ -58,6 +58,13 @@ %changelog +* Mon Sep 29 2014 Grozdan Nikolov <neutrino8@gmail.com> 10.3.0 + * Get rid of the $RATIO var in the ratio_and_pixels_func() function + * Support disabling of all video filters at once through the config file + * Support disabling of cropping and subtitles + * Support disabling of all audio filters at once + * Support disabling of asking for DVD/BD angles and chapters encode + * Sat Sep 27 2014 Grozdan Nikolov <neutrino8@gmail.com> 10.2.9 * Colorize the output of detected subtitles and DVD/VCD titles * Merge the two case statements of the ratio_and_pixels_func() function
View file
h264enc-10.2.9.tar.gz/doc/ChangeLog -> h264enc-10.3.0.tar.gz/doc/ChangeLog
Changed
@@ -1,3 +1,10 @@ +2014-09-29- h264enc 10.3.0 + * Get rid of the $RATIO var in the ratio_and_pixels_func() function + * Support disabling of all video filters at once through the config file + * Support disabling of cropping and subtitles + * Support disabling of all audio filters at once + * Support disabling of asking for DVD/BD angles and chapters encode + 2014-09-27 - h264enc 10.2.9 * Colorize the output of detected subtitles and DVD/VCD titles * Merge the two case statements of the ratio_and_pixels_func() function
View file
h264enc-10.2.9.tar.gz/h264enc -> h264enc-10.3.0.tar.gz/h264enc
Changed
@@ -1,5 +1,5 @@ #!/usr/bin/env bash -# $Id: h264enc, v 10.2.9, 2014/09/27, gn Exp $ +# $Id: h264enc, v 10.3.0, 2014/09/29, gn Exp $ # # Encode BDs/DVDs/VCDs/video files to the H.264/AVC/MPEG-4 Part 10 # video format using MEncoder from MPlayer @@ -23,8 +23,8 @@ shopt -u expand_aliases export PATH=$PATH:/usr/local/bin -version=10.2.9 -configversion=32 +version=10.3.0 +configversion=33 green() { echo -e "\e[1;32m$1\e[0;39;49m"; } @@ -134,6 +134,19 @@ # For use with the -e option EDITOR="nano" +# If one or more of the below +# variables is set to "y", it +# disables the specific function +DISABLE_ALL_VID_FILTERS="n" +DISABLE_VID_CROP_FILTER="n" +DISABLE_SUBTITLES="n" +DISABLE_ALL_AUD_FILTERS="n" + +DISABLE_ASK_DVD_ANGLE="n" +DISABLE_ASK_DVD_CHAPTERS="n" +DISABLE_ASK_BD_ANGLE="n" +DISABLE_ASK_BD_CHAPTERS="n" + # Video filters ALLOW_VID_DEINTERLACE="y" ALLOW_VID_INTERLACE="y" @@ -3362,41 +3375,56 @@ } video_filters_func() { - if [ "$vfilters" = "y" ]; then - echo - brown "+==================================+" - brown "| Pre/Postprocessing Video Filters |" - brown "+==================================+" - echo - test "$ALLOW_VID_DEINTERLACE" = "y" && video_deinterlace_func - test "$ALLOW_VID_INTERLACE" = "y" && video_interlace_func - test "$ALLOW_VID_DEBLOCK" = "y" && video_deblock_func - test "$ALLOW_VID_DELOGO" = "y" && video_delogo_func - test "$ALLOW_VID_DENOISE" = "y" && video_denoise_func - test "$ALLOW_VID_DEBAND" = "y" && video_deband_func - test "$ALLOW_VID_NOISE" = "y" && video_noise_func - test "$ALLOW_VID_UNSHARP" = "y" && video_unsharp_func - test "$ALLOW_VID_BRIGHTNESS" = "y" && video_brightness_func - test "$ALLOW_VID_EQUALIZER" = "y" && video_equalizer_func + if [ "$DISABLE_ALL_VID_FILTERS" = "n" ]; then + vfilters=$(get_selection_func "Would you like to use Pre/Postprocessing video filters? [y/N]: ") + if [ "$vfilters" = "y" ]; then + echo + brown "+==================================+" + brown "| Pre/Postprocessing Video Filters |" + brown "+==================================+" + echo + test "$ALLOW_VID_DEINTERLACE" = "y" && video_deinterlace_func + test "$ALLOW_VID_INTERLACE" = "y" && video_interlace_func + test "$ALLOW_VID_DEBLOCK" = "y" && video_deblock_func + test "$ALLOW_VID_DELOGO" = "y" && video_delogo_func + test "$ALLOW_VID_DENOISE" = "y" && video_denoise_func + test "$ALLOW_VID_DEBAND" = "y" && video_deband_func + test "$ALLOW_VID_NOISE" = "y" && video_noise_func + test "$ALLOW_VID_UNSHARP" = "y" && video_unsharp_func + test "$ALLOW_VID_BRIGHTNESS" = "y" && video_brightness_func + test "$ALLOW_VID_EQUALIZER" = "y" && video_equalizer_func + else + interlaced=":nointerlaced" + fi else interlaced=":nointerlaced" fi - if [ "$ALLOW_VID_AUTOCROP" = "y" ]; then - # Skip autocropping for directory - # batch encoding mode - case "$source" in - file|dvd|vcd|bd) - video_crop_func - ;; - esac - else - cropping=$(get_selection_func "Would you like to Crop the $type? [y/N]: ") - if [ "$cropping" = "y" ]; then - video_crop_func + if [ "$DISABLE_VID_CROP_FILTER" = "n" ]; then + if [ "$ALLOW_VID_AUTOCROP" = "y" ]; then + # Skip autocropping for directory + # batch encoding mode + case "$source" in + file|dvd|vcd|bd) + video_crop_func + ;; + esac + else + cropping=$(get_selection_func "Would you like to Crop the $type? [y/N]: ") + if [ "$cropping" = "y" ]; then + video_crop_func + fi fi fi } +ask_video_subtitles_func() { + if [ "$DISABLE_SUBTITLES" = "n" ]; then + video_subtitles_func + else + true + fi +} + ############################################################# ############## BD/DVD/VCD/video file settings ############### @@ -3472,7 +3500,7 @@ if [ -x "$MKVEXTRACT" -o -x "$MP4BOX" ]; then case "${infile##*.}" in mkv|MKV|mp4|MP4|m4v|M4V) - dumpchaps=$(get_selection_func "Extract Chapters Info to a file? [y/N]: ") + dumpchaps=$(get_selection_func "Extract Chapters Info to a File? [y/N]: ") if [ "$dumpchaps" = "y" ]; then dump_chaps_info_func() { case "$1" in @@ -3525,9 +3553,8 @@ ;; esac fi - vfilters=$(get_selection_func "Would you like to use Pre/Postprocessing video filters? [y/N]: ") video_filters_func - video_subtitles_func + ask_video_subtitles_func ;; dir) type="Video files" @@ -3567,9 +3594,8 @@ fi fi OUTPUT="$OUTPUTDIR/\${i%.*}.avi" - vfilters=$(get_selection_func "Would you like to use Pre/Postprocessing video filters? [y/N]: ") video_filters_func - video_subtitles_func + ask_video_subtitles_func ;; bd) type="Blu-ray" @@ -3654,49 +3680,52 @@ else sourcetype="br://$title" fi - BDTITLE="$(echo $sourcetype | sed 's|br://||')" - angle=$(get_selection_func "Would you like to encode from a different $type Angle? [y/N]: ") - if [ "$angle" = "y" ]; then - echo - green "-> Scanning for angles in title $BDTITLE..." - $MPLAYER $sourcetype $MPLAYEROPTS $device $MPOPTS 2>/dev/null > "$TEMPDIR/angles" - BDANGLE="$(grep "^ID_BLURAY_TITLE_${BDTITLE}_ANGLE" "$TEMPDIR/angles" | awk -F= '{print $2}')" - if [ ! -z "$BDANGLE" ]; then - green "-> Found $BDANGLE angles" - else - error "-> Could not detect any angles in this $type title!" - fi - rm -f "$TEMPDIR/angles" - echo - printf "From which Angle to encode the $type? [default is 1]: " - read bdangle - if [ ! -z "$bdangle" ]; then - movieangle="-bluray-angle $bdangle" - fi - fi - chap=$(get_selection_func "Would you like to encode only Specific Chapters? [y/N]: ") - if [ "$chap" = "y" ]; then - echo - green "-> Scanning for chapters in title $BDTITLE..." - $MPLAYER $sourcetype $MPLAYEROPTS $device $MPOPTS 2>/dev/null > "$TEMPDIR/chapters" - BDCHAPS="$(grep "^ID_BLURAY_TITLE_${BDTITLE}_CHAPTERS" "$TEMPDIR/chapters" | awk -F= '{print $2}')" - if [ ! -z "$BDCHAPS" -a "$BDCHAPS" != "0" ]; then - green "-> Found $BDCHAPS chapters" - else - error "-> Could not detect any chapters in this $type title!" - fi - rm -f "$TEMPDIR/chapters" - chapters_example_func - printf "Which chapter(s) to encode from this $type title? [press 'Enter' to skip]: " - read chapenc - if [ ! -z "$chapenc" ]; then - chapters="-chapter $chapenc" + if [ "$DISABLE_ASK_BD_ANGLE" = "n" ]; then + BDTITLE="$(echo $sourcetype | sed 's|br://||')" + angle=$(get_selection_func "Would you like to encode from a Different $type Angle? [y/N]: ") + if [ "$angle" = "y" ]; then + echo
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
.