...

cheznewa · Aug 8, 2020 · de3c73f · de3c73f
1 parent feacaa6
commit de3c73f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/iptv2radio/iptv2radio_hd.bash b/iptv2radio/iptv2radio_hd.bash
@@ -5,15 +5,15 @@ tmp=$(mktemp -d)
 n=0
 for url in $(grep -v "^#" "$fileplaylist")
 do
-ffmpeg -t $timetorecord -i "$url" -f rawvideo -pix_fmt rgb24 -vf framerate=25,scale=768x576 $tmp/${n}_video.raw -ar 43200 -ac 1 -f mulaw $tmp/${n}_audio.raw
+ffmpeg -t $timetorecord -i "$url" -f rawvideo -pix_fmt rgb24 -vf framerate=25,scale=720x576 $tmp/${n}_video.raw -ar 43200 -ac 1 -f mulaw $tmp/${n}_audio.raw
 n=$(expr $n + 1)
 done
 n=$(expr $n - 1)
 for n in $(seq 0 $n)
 do
-php $MYGIST/secam/rgb2secam.php 768 < $tmp/${n}_video.raw > $tmp/${n}_video.secam
+python $MYGIST/secam/rgb2secam.py 720 < $tmp/${n}_video.raw > $tmp/${n}_video.secam
 rm $tmp/${n}_video.raw
-python $MYGIST/radio/avmerge.py 43200 768x576 25 4< $tmp/${n}_audio.raw 7< $tmp/${n}_video.secam | python $MYGIST/radio/radiosend.py $(expr $n \* 10000) $(expr $n \* 10000 + 10000) 16 > $tmp/${n}.radio
+python $MYGIST/radio/avmerge.py 43200 1440x576 25 4< $tmp/${n}_audio.raw 7< $tmp/${n}_video.secam | python $MYGIST/radio/radiosend.py $(expr $n \* 10000) $(expr $n \* 10000 + 10000) 16 > $tmp/${n}.radio
 rm $tmp/${n}_audio.raw $tmp/${n}_video.secam
 done
 paste -d "\n" $tmp/*.radio | sed "/^$/d" | zstd -v -22 --ultra > "${outputfile}.radio.zstd"

diff --git a/iptv2radio/iptv2radio_sd.bash b/iptv2radio/iptv2radio_sd.bash
@@ -11,9 +11,9 @@ done
 n=$(expr $n - 1)
 for n in $(seq 0 $n)
 do
-php $MYGIST/secam/rgb2secam.php 320 < $tmp/${n}_video.raw > $tmp/${n}_video.secam
+python $MYGIST/secam/rgb2secam.py 320 < $tmp/${n}_video.raw > $tmp/${n}_video.secam
 rm $tmp/${n}_video.raw
-python $MYGIST/radio/avmerge.py 18000 320x240 25 4< $tmp/${n}_audio.raw 7< $tmp/${n}_video.secam | python $MYGIST/radio/radiosend.py $(expr $n \* 10000) $(expr $n \* 10000 + 10000) 16 > $tmp/${n}.radio
+python $MYGIST/radio/avmerge.py 18000 640x240 25 4< $tmp/${n}_audio.raw 7< $tmp/${n}_video.secam | python $MYGIST/radio/radiosend.py $(expr $n \* 10000) $(expr $n \* 10000 + 10000) 16 > $tmp/${n}.radio
 rm $tmp/${n}_audio.raw $tmp/${n}_video.secam
 done
 paste -d "\n" $tmp/*.radio | sed "/^$/d" | zstd -v -22 --ultra > "${outputfile}.radio.zstd"

diff --git a/iptv2radio/reader_hd.bash b/iptv2radio/reader_hd.bash
@@ -1,5 +1,5 @@
 video=$(mktemp)
 audio=$(mktemp)
-zstd -dcq "$1" | python $MYGIST/radio/radiorecv.py $2 $3 16 | python $MYGIST/radio/avsplit.py 43200 768x576 25 4> $audio 7> $video
-php $MYGIST/secam/secam2rgb.php 768 < $video | ffmpeg -video_size 768x576 -f rawvideo -pix_fmt rgb24 -i - -ar 43200 -ac 1 -f mulaw -i $audio -vcodec libx264 -acodec copy -f avi -y "$4"
+zstd -dcq "$1" | python $MYGIST/radio/radiorecv.py $2 $3 16 | python $MYGIST/radio/avsplit.py 43200 1440x576 25 4> $audio 7> $video
+python $MYGIST/secam/secam2rgb.py 720 < $video | ffmpeg -video_size 720x576 -f rawvideo -pix_fmt rgb24 -i - -ar 43200 -ac 1 -f mulaw -i $audio -vcodec libx264 -acodec copy -f avi -y "$4"
 rm $audio $video
diff --git a/iptv2radio/reader_sd.bash b/iptv2radio/reader_sd.bash
@@ -1,5 +1,5 @@
 video=$(mktemp)
 audio=$(mktemp)
-zstd -dcq "$1" | python $MYGIST/radio/radiorecv.py $2 $3 16 | python $MYGIST/radio/avsplit.py 18000 320x240 25 4> $audio 7> $video
-php $MYGIST/secam/secam2rgb.php 320 < $video | ffmpeg -video_size 320x240 -f rawvideo -pix_fmt rgb24 -i - -ar 18000 -ac 1 -f mulaw -i $audio -vcodec libx264 -acodec copy -f avi -y "$4"
+zstd -dcq "$1" | python $MYGIST/radio/radiorecv.py $2 $3 16 | python $MYGIST/radio/avsplit.py 18000 640x240 25 4> $audio 7> $video
+python $MYGIST/secam/secam2rgb.py 320 < $video | ffmpeg -video_size 320x240 -f rawvideo -pix_fmt rgb24 -i - -ar 18000 -ac 1 -f mulaw -i $audio -vcodec libx264 -acodec copy -f avi -y "$4"
 rm $audio $video
diff --git a/iptvci/iptv_cryptimage.py b/iptvci/iptv_cryptimage.py
@@ -360,4 +360,4 @@ def cond(bool):
   print("Pour Le Dechiffrer Vous Devrait Payer :: "+str(int(coin*5)-((planiftcbegin-planiftcend)/5))+" Piece/Foitierre")
 if cryptage == "Transcode":
  print("Donc Toute Est En Claire !")
-print("TeleText Variant :: " + ttv)
+print("Variante Du Teletext :: " + ttv)
diff --git a/logicemu/weather.txt b/logicemu/weather.txt
@@ -6,7 +6,7 @@
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -20,7 +20,7 @@ l<##################################<f |
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -34,7 +34,7 @@ l<##################################<f |
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -48,7 +48,7 @@ l<##################################<f |
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -62,7 +62,7 @@ l<##################################<f |
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -75,7 +75,7 @@ l<##################################<f |
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -89,7 +89,7 @@ l<##################################<f |
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -103,7 +103,7 @@ l<##################################<f |
   |||||||||||||||||||||||||            |
 l<##################################<f |
   ##################################   |
-  U152##############################<?<.  
+  U144##############################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^   |
   ||||||||||||||||||||||||| f???????   |
   uuuuuuuuuuuuuuuuuuuuuuuuu  ^^^^^^^   |
@@ -117,7 +117,7 @@ l<##################################<f |
   ||||||||||||||||||||||||                  |
 l<#######################################<f |
   #######################################   |
-  U24####################################<?<.  
+  U16####################################<?<.  
   ^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^ ^^^^^^^^^   |
   |||||||||||||||||||||||| ???? FFffFffff   |
   uuuuuuuuuuuuuuuuuuuuuuuu ^^^^             |