From 7e664b44209ff63c95d8dc468e6bb24e3f3dd598 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 23 Jan 2024 09:25:29 +0100 Subject: [PATCH] update various parameters and commands, use GPU --- src/home/telecaster/bin/py/transcode.py | 2 +- .../telecaster/bin/py/transcode_nv-pro.py | 3 +- src/home/telecaster/bin/py/transcode_nv.py | 4 +- .../telecaster/bin/telecaster_master-ae.sh | 37 +++++++++++-------- .../telecaster_master-crfpa-mp4-staging.sh | 14 ++++--- .../bin/telecaster_master-crfpa-mp4.sh | 16 +++----- .../telecaster/bin/telecaster_master-pro.sh | 2 +- 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/home/telecaster/bin/py/transcode.py b/src/home/telecaster/bin/py/transcode.py index c326a83..336802e 100644 --- a/src/home/telecaster/bin/py/transcode.py +++ b/src/home/telecaster/bin/py/transcode.py @@ -27,7 +27,7 @@ class TelemetaTranscode(object): 'png' : '-ss 0:5:0', } - date_limit = datetime.datetime(year=2021, month=6, day=24) + date_limit = datetime.datetime(year=2023, month=10, day=21) def __init__(self, args): self.args = args diff --git a/src/home/telecaster/bin/py/transcode_nv-pro.py b/src/home/telecaster/bin/py/transcode_nv-pro.py index 1c0161f..32c16eb 100644 --- a/src/home/telecaster/bin/py/transcode_nv-pro.py +++ b/src/home/telecaster/bin/py/transcode_nv-pro.py @@ -20,10 +20,9 @@ class Logger: class TelemetaTranscode(object): """docstring for TelemetaTranscode""" - source_formats = ['webm',] + source_formats = ['mp4',] dest_formats = { 'mp3' : '-vn -acodec libmp3lame -aq 6', - 'mp4' : '-c:v h264_nvenc -maxrate 1100k -c:a aac -b:a 128k', 'png' : '-ss 0:0:10', } diff --git a/src/home/telecaster/bin/py/transcode_nv.py b/src/home/telecaster/bin/py/transcode_nv.py index eebf26a..e55fe29 100644 --- a/src/home/telecaster/bin/py/transcode_nv.py +++ b/src/home/telecaster/bin/py/transcode_nv.py @@ -24,10 +24,10 @@ class TelemetaTranscode(object): dest_formats = { 'mp3' : '-vn -acodec libmp3lame -aq 6', 'mp4' : '-c:v h264_nvenc -maxrate 1100k -c:a aac -b:a 128k', - 'png' : '-ss 0:5:0', + 'png' : '-ss 0:0:10', } - date_limit = datetime.datetime(year=2021, month=6, day=24) + date_limit = datetime.datetime(year=2023, month=10, day=24) def __init__(self, args): self.args = args diff --git a/src/home/telecaster/bin/telecaster_master-ae.sh b/src/home/telecaster/bin/telecaster_master-ae.sh index 2d6948b..3ccf8bc 100755 --- a/src/home/telecaster/bin/telecaster_master-ae.sh +++ b/src/home/telecaster/bin/telecaster_master-ae.sh @@ -1,27 +1,34 @@ #!/bin/bash -media_dir=/home/telecaster/archives/Pre-Barreau/AE/ -tmp_log=/tmp/telecaster-remux-ae.log -log=/home/telecaster/log/remux-ae.log -tmp_dir=/home/telecaster/tmp/ -app_server=angus.parisson.com -media_server=angus.parisson.com -emails="webmaster@parisson.com,jeannot@parisson.com" -subject="TeleCaster remux (AE)" +organization=Pre-Barreau +department=AE year=`date '+%Y'` -#year=2020 year2=$((year-1)) -#echo $year2 +media_dir=/home/telecaster/archives/$organization/$department/$year/ +server_media_dir=/mnt/ae-videos/$organization/$department/$year/ +backup_dir=/mnt/nile/$organization/$department/$year/ +tmp_log=/tmp/telecaster-$department.log +remux_log=/home/telecaster/log/remux-$department.log +transcode_log=/home/telecaster/log/transcode-$department.log +import_log=/var/log/app/import_media.log +tmp_dir=/home/telecaster/tmp/ +app_server=malcom.parisson.com +app_path=/srv/ae-docker +media_server=malcom.parisson.com +emails="webmaster@parisson.com,jeannot@parisson.com" +subject="TeleCaster remux ($departement)" +bwlimit=20000 + -python ~/apps/Telemeta/scripts/transcode/remux_fix_media.py $media_dir $tmp_dir > $tmp_log +python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log -#cat $tmp_log >> $log +cat $tmp_log >> $remux_log -echo "$media_server:$media_dir" +python ~/bin/py/transcode_nv.py $media_dir $transcode_log -rsync -avuLKPr --delete --bwlimit=15000 --include="*/" --include="$year/**" --include="$year2/**" --exclude="*" $media_dir $media_server:$media_dir +rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --include="$year2/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$server_media_dir -ssh $app_server "~/bin/teleforma_import.sh" +ssh $app_server "docker compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $import_log" python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails diff --git a/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh b/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh index d20fae9..1668e9c 100755 --- a/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh +++ b/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh @@ -13,16 +13,18 @@ emails="webmaster@parisson.com,jeannot@parisson.com" subject="TeleCaster remux (CRFPA)" bwlimit=20000 -python ~/apps/Telemeta/scripts/transcode/remux_fix_media.py $media_dir $tmp_dir > $tmp_log +python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log -cat $tmp_log >> $log +cat $tmp_log >> $remux_log -rsync -uLKPr $media_dir $backup_dir +#rsync -uLKPr $media_dir $backup_dir -python ~/apps/Telemeta/scripts/transcode/transcode_nv.py $backup_dir ~/log/transcode-crfpa.log +#echo `date` >> ~/log/transcode-crfpa.log -find $backup_dir -type d -exec chmod 755 {} \; -find $backup_dir -type f -exec chmod 644 {} \; +python ~/bin/py/transcode_nv.py $media_dir $transcode_log + +#find $backup_dir -type d -exec chmod 755 {} \; +#find $backup_dir -type f -exec chmod 644 {} \; #rsync -auLKPr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*" $backup_dir $media_server:$media_dir #rsync -uLKPr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude=".webm" --exclude=".ogg" --exclude="*" $backup_dir $media_server:$media_dir diff --git a/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh b/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh index f24e267..413ffc4 100755 --- a/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh +++ b/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh @@ -4,6 +4,7 @@ organization=Pre-Barreau department=CRFPA year=`date '+%Y'` media_dir=/home/telecaster/archives/$organization/$department/$year/ +server_media_dir=/mnt/crfpa-videos/$organization/$department/$year/ backup_dir=/mnt/nile/$organization/$department/$year/ tmp_log=/tmp/telecaster-$department.log remux_log=/home/telecaster/log/remux-$department.log @@ -21,22 +22,15 @@ python ~/bin/py/remux_fix_media.py $media_dir $tmp_dir > $tmp_log cat $tmp_log >> $remux_log -#rsync -uLKPr $media_dir $backup_dir - -#echo `date` >> ~/log/transcode-crfpa.log - -python ~/bin/py/transcode.py $media_dir $transcode_log +python ~/bin/py/transcode_nv.py $media_dir $transcode_log #find $backup_dir -type d -exec chmod 755 {} \; #find $backup_dir -type f -exec chmod 644 {} \; -#rsync -auLKPr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*" $backup_dir $media_server:$media_dir -#rsync -uLKPr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude=".webm" --exclude=".ogg" --exclude="*" $backup_dir $media_server:$media_dir - -rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$media_dir +rsync -auLKr --bwlimit=$bwlimit --include="*/" --include="$year/**" --exclude="*.webm" --exclude="@eaDir" $media_dir $media_server:$server_media_dir -ssh $app_server "docker-compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $import_log" +ssh $app_server "docker compose -f $app_path/docker-compose.yml -f $app_path/env/prod.yml exec -T app /srv/app/manage.py teleforma-import-conferences-2 $organization $department $import_log" -#python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails +python ~/apps/tools/message/mail_msg.py $subject $tmp_log $emails diff --git a/src/home/telecaster/bin/telecaster_master-pro.sh b/src/home/telecaster/bin/telecaster_master-pro.sh index a872eb2..8f3b26d 100755 --- a/src/home/telecaster/bin/telecaster_master-pro.sh +++ b/src/home/telecaster/bin/telecaster_master-pro.sh @@ -22,7 +22,7 @@ for y in `seq $(($year)) $(($year+1))`; do #python ~/apps/Telemeta/scripts/transcode/transcode.py $media_dir $log_dir/transcode-pro.log python ~/bin/py/remux_fix_media.py $archives_dir $tmp_dir >> $log_dir/remux-pro.log - python ~/bin/py/transcode-pro.py $media_dir $log_dir/transcode-pro.log + python ~/bin/py/transcode_nv-pro.py $media_dir $log_dir/transcode-pro.log chmod -fR 664 $media_dir; chmod -fR +rX $media_dir rsync -aquLKP --bwlimit=15000 --delete --exclude="@eaDir" $media_dir $server:$server_media_dir -- 2.39.5