@@ -119,7 +119,7 @@ help() {
119119 echo " -h264enc libx264|h264_nvenc|h264_vaapi"
120120 echo " -hevcenc hevc_nvenc|hevc_vaapi"
121121 echo " -aaclib libfdk_aac|libfaac|aac"
122- echo " -hwaccel cuvid|vaapi"
122+ echo " -hwaccel cuvid|vaapi|vdpau "
123123 echo " -vdr <path_to_vdr>"
124124 exit
125125}
@@ -1180,6 +1180,11 @@ case "$hwaccel" in
11801180 deinterlace=" deinterlace_vaapi"
11811181 [ " $scale " != " " ] && add_vf scale_vaapi=$scale
11821182 ;;
1183+ " vdpau" )
1184+ export DISPLAY=:0.0
1185+ HWACC=" -hwaccel vdpau"
1186+ [ " $scale " != " " ] && add_vf scale=$scale
1187+ ;;
11831188 * )
11841189 [ " $scale " != " " ] && add_vf scale=$scale
11851190 ;;
@@ -1197,6 +1202,7 @@ inf() {
11971202}
11981203
11991204set_h264 () {
1205+ # set -x
12001206 # maxr="-maxrate "$br"k -bufsize 1835k"
12011207 h264_profile=high
12021208 level=" -level $h264_level "
@@ -1212,6 +1218,7 @@ set_h264() {
12121218 # [ "$hwaccel" == "cuvid" ] && OPT_G="$OPT_G $decode_cuvid"
12131219 [ " $hwaccel " == " cuvid" ] && OPT_I=" $OPT_I $decode_cuvid "
12141220 vcodec=" h264"
1221+ # exit
12151222}
12161223
12171224set_hevc () {
@@ -1275,6 +1282,7 @@ analyze() {
12751282 # set -x
12761283 ffprobe -hide_banner $ffmpeg_i 2>&1 | grep " Stream" > $t
12771284 cat $t
1285+ # exit
12781286 which mediainfo 2> /dev/null
12791287 if [ $? -eq 0 ]
12801288 then
@@ -1965,7 +1973,11 @@ server_kill() {
19651973 if [ -e /proc/$pid ]
19661974 then
19671975 kill -15 $pid
1976+ else
1977+ echo " not running"
19681978 fi
1979+ else
1980+ echo " not running"
19691981 fi
19701982 exit
19711983}
0 commit comments