From d2af80d0bbc244933ee0537e682e915148d43c0e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 9 Feb 2021 15:14:30 +0100 Subject: tidy: rename variables to disambiguate ogv (Ogg container with Theora) from ogg (Ogg Vorbis) --- localvideowebencode | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'localvideowebencode') diff --git a/localvideowebencode b/localvideowebencode index b8724eb..1c1f43d 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -453,7 +453,7 @@ esac for format in $(echo "$formats" | sed -e 's/,/ /g'); do case $format in - theora|ogg) ogg=yes;; + theora|ogg) ogv=yes;; avc|h264|mp4) mp4=yes;; vp8|webm) webm=yes;; vp9) webm_vp9=yes;; @@ -581,10 +581,10 @@ for vformat in vp8 vp9 avc; do eval "[ -n \"\$multipass_$vformat\" ] || singlepass_$vformat=yes" done if [ -n "$use_ffmpeg_vp8$use_ffmpeg_vp9$use_vpxenc" ]; then - [ -n "$use_oggenc" ] || use_ffmpeg_ogg=yes + [ -n "$use_oggenc" ] || use_ffmpeg_vorbis=yes [ -n "$use_opusenc" ] || use_ffmpeg_opus=yes [ -z "$use_oggenc$use_opusenc" ] || use_wav=yes - [ -z "$use_ffmpeg_ogg$use_ffmpeg_opus" ] || use_matroska=yes + [ -z "$use_ffmpeg_vorbis$use_ffmpeg_opus" ] || use_matroska=yes fi if [ -n "$use_ffmpeg_avc" ]; then use_matroska=yes @@ -596,7 +596,7 @@ use_ffmpeg_any="${webm:+$use_ffmpeg_vp8}${webm_vp9:+$use_ffmpeg_vp9}${mp4:+$use_ use_vpxenc_any="${webm:+$use_vpxenc}${webm_vp9:+$use_vpxenc}" use_opusenc_any="${webm:+$use_oggenc}${webm_vp9:+$use_opusenc}" use_oggenc_any="${webm:+$use_oggenc}${webm_vp9:+$use_opusenc}" -[ -n "$use_ffmpeg_any$use_vpxenc_any$use_oggenc_any" } || use_any_nomelt_video=yes +[ -n "$use_ffmpeg_any$use_vpxenc_any" } || use_any_nomelt_video=yes [ -z "$gpu" ] || echo >&2 "GPU platform enabled: $gpu" @@ -711,7 +711,7 @@ _oggenc_wav_in= _opusenc_wav_in= _melt_matroska_pcm="f=matroska $_melt_downmix $_melt_pcm vn=1 video_off=1" _ffmpeg_matroska_pcm_in="-f matroska" -_melt_ogg="f=ogg $_melt_video $_melt_theora ${silence:+an=1 audio_off=1}${channels:+$_melt_vorbis}" +_melt_ogv="f=ogg $_melt_video $_melt_theora ${silence:+an=1 audio_off=1}${channels:+$_melt_vorbis}" _ffmpeg_ogg_in="-f ogg" _ffmpeg_ogg_vorbis="-f ogg -vn $_ffmpeg_vorbis" _ffmpeg_ogg_opus="-f ogg -vn $_ffmpeg_opus" @@ -773,7 +773,7 @@ render melt $_melt_infiles \ ${_melt_loudness:+-filter loudness program=$lufs \ results="$_melt_loudness"}} \ $filters${channels:+ $_melt_postfilters_audio} \ - ${ogg:+${use_melt_theora:+-consumer avformat:$stem.ogv $_melt_ogg}} \ + ${ogv:+${use_melt_theora:+-consumer avformat:$stem.ogv $_melt_ogv}} \ ${webm:+${use_melt_vp8:+-consumer avformat:$stem.webm $_melt_webm \ ${multipass_vp8:+pass=2 passlogfile=${stem}_vp8}}} \ ${webm_vp9:+${use_melt_vp9:+-consumer avformat:${stem}_vp9.webm $_melt_webm_vp9 \ @@ -856,7 +856,7 @@ __width="${_width:+ width=\"$_width\"}" __height="${_height:+ height=\"$_height\"}" # Flash object needs extra space for controllers __heightplus=${_height:+ height=\"$((_height+4))\"} -_source_ogg="" +_source_ogv="" _source_webm="" _source_webm_vp9="" _source_mp4="" @@ -865,7 +865,7 @@ _source_mp4="" _object_flash="" _param_name="" _param_flashvars="" -__oggfile=${ogg:+open format Ogg/Thera} +__ogvfile=${ogv:+open format Ogg/Thera} __webmfile=${webm:+open format WebM/VP8} __webm_vp9_file=${vp9:+open format WebM/VP9} __mp4file=${mp4:+closed format MPEG-4/AVC} @@ -876,7 +876,7 @@ cat >"$stem.html" <

Download Video:

    ${webm_vp9:+
  • $__webm_vp9_file }${webm:+
  • $__webmfile -}${ogg:+
  • $__oggfile +}${ogv:+
  • $__ogvfile }${mp4:+
  • $__mp4file }

EOF -- cgit v1.2.3