From 69ddfc135f058abf6dfe1c70aaac89882cac57df Mon Sep 17 00:00:00 2001 From: ViktorBarzin Date: Tue, 3 Apr 2018 12:00:02 +0300 Subject: [PATCH] Add new stuff --- .bash_aliases | 21 ++++++++++++--------- .vimrc | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.bash_aliases b/.bash_aliases index 534bff4..9f4c248 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -234,19 +234,22 @@ alias hosts="sudo vim /etc/hosts" # INRES="1920x1080" # input resolution # OUTRES="1920x1080" # output resolution INRES="$(xdpyinfo | awk '/dimensions/{print $2}')" - OUTRES="$(xdpyinfo | awk '/dimensions/{print $2}')" - FPS="24" # target FPS - GOP="48" # i-frame interval, should be double of FPS, + # OUTRES="$(xdpyinfo | awk '/dimensions/{print $2}')" + # OUTRES="1280x720" + OUTRES="2560x1440" + # OUTRES="3840x2160" + FPS="15" # target FPS + GOP="29" # i-frame interval, should be double of FPS, GOPMIN="15" # min i-frame interval, should be equal to fps, - THREADS="2" # max 6 - CBR="1000k" # constant bitrate (should be between 1000k - 3000k) - QUALITY="slow" # one of the many FFMPEG preset + THREADS="0" # max 6 + CBR="4000k" # constant bitrate (yuvj444p) + QUALITY="ultrafast" # one of the many FFMPEG preset AUDIO_RATE="44100" # STREAM_KEY="$1" # use the terminal command Streaming streamkeyhere to stream your video to twitch or justin - ffmpeg -f x11grab -s "$INRES" -r "$FPS" -i :0.0 -f alsa -i pulse -f flv -ac 2 -ar $AUDIO_RATE \ - -vcodec libx264 -g $GOP -keyint_min $GOPMIN -b:v $CBR -minrate $CBR -maxrate $CBR -pix_fmt yuv420p\ - -s $OUTRES -preset $QUALITY -tune film -acodec libmp3lame -threads $THREADS -strict normal \ + ffmpeg -thread_queue_size 512 -f x11grab -s "$INRES" -r "$FPS" -i :0.0 -f alsa -i pulse -f flv -ac 2 -ar $AUDIO_RATE \ + -vcodec libx264 -g $GOP -keyint_min $GOPMIN -b:v $CBR -minrate $CBR -maxrate $CBR -pix_fmt yuv444p\ + -s $OUTRES -preset $QUALITY -tune zerolatency -acodec libmp3lame -threads $THREADS -strict normal \ -bufsize $CBR $STREAM_URI } alias gg="xset dpms force off" diff --git a/.vimrc b/.vimrc index 5b43418..1ce237c 100644 --- a/.vimrc +++ b/.vimrc @@ -359,10 +359,10 @@ let g:SuperTabDefaultCompletionType = "" " cd ~/.vim/bundle " git clone git://github.com/davidhalter/jedi-vim.git " let g:jedi#usages_command = "z" -let g:jedi#popup_on_dot = 0 +let g:jedi#popup_on_dot = 1 " let g:jedi#popup_select_first = 0 " let g:jedi#force_py_version = 3 -" let g:jedi#completions_command = '.' +let g:jedi#completions_command = '.' " map b Oimport ipdb; ipdb.set_trace() # BREAKPOINT " Map C-a to select entire file