diff options
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 20 |
1 files changed, 10 insertions, 10 deletions
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 src=\"$stem.ogv\" type=\"video/ogg\" />" +_source_ogv="<source src=\"$stem.ogv\" type=\"video/ogg\" />" _source_webm="<source src=\"$stem.webm\" type=\"video/webm\" />" _source_webm_vp9="<source src=\"${stem}_vp9.webm\" type='video/ogg; codecs=\"vp9, opus\"' />" _source_mp4="<source src=\"$stem.mp4\" type=\"video/mp4\" />" @@ -865,7 +865,7 @@ _source_mp4="<source src=\"$stem.mp4\" type=\"video/mp4\" />" _object_flash="<object$__width$__heightplus type=\"application/x-shockwave-flash\" data=\"$flashplayer.swf\">" _param_name="<param name=\"movie\" value=\"$flashplayer.swf\" />" _param_flashvars="<param name=\"flashvars\" value=\"image=$stem.jpg&file=$stem.mp4\" />" -__oggfile=${ogg:+open format <a href=\"$stem.ogv\">Ogg/Thera</a>} +__ogvfile=${ogv:+open format <a href=\"$stem.ogv\">Ogg/Thera</a>} __webmfile=${webm:+open format <a href=\"$stem.webm\">WebM/VP8</a>} __webm_vp9_file=${vp9:+open format <a href=\"${stem}_vp9.webm\">WebM/VP9</a>} __mp4file=${mp4:+closed format <a href=\"$stem.mp4\">MPEG-4/AVC</a>} @@ -876,7 +876,7 @@ cat >"$stem.html" <<EOF ${mp4:+$_source_mp4 }${webm_vp9:+$_source_webm_vp9 }${webm:+$_source_webm -}${ogg:+$_source_ogg +}${ogv:+$_source_ogv }${flash:+$_object_flash $_param_name $_param_flashvars @@ -887,7 +887,7 @@ ${flash:+</object> <p><strong>Download Video:</strong><ul> ${webm_vp9:+<li>$__webm_vp9_file }${webm:+<li>$__webmfile -}${ogg:+<li>$__oggfile +}${ogv:+<li>$__ogvfile }${mp4:+<li>$__mp4file }</ul></p> EOF |