PySSTV 0.5.6__tar.gz → 0.5.7__tar.gz

{PySSTV-0.5.6 → pysstv-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySSTV
-Version: 0.5.6
+Version: 0.5.7
 Summary: Python classes for generating Slow-scan Television transmissions
 Home-page: https://github.com/dnet/pySSTV
 Author: András Veres-Szentkirályi
@@ -32,9 +32,10 @@ Command line usage
 
     $ python -m pysstv -h
     usage: __main__.py [-h]
-                  [--mode {MartinM1,MartinM2,ScottieS1,ScottieS2,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,Robot8BW,Robot24BW}]
+                  [--mode {MartinM1,MartinM2,ScottieS1,ScottieS2,ScottieDX,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,WraaseSC2120,WraaseSC2180,Robot8BW,Robot24BW}]
                   [--rate RATE] [--bits BITS] [--vox] [--fskid FSKID]
-                  [--chan CHAN]
+                  [--chan CHAN] [--resize] [--keep-aspect-ratio]
+                  [--keep-aspect] [--resample {nearest,bicubic,lanczos}]
                   image.png output.wav
 
     Converts an image to an SSTV modulated WAV file.
@@ -43,9 +44,9 @@ Command line usage
       image.png             input image file name
       output.wav            output WAV file name
 
-    optional arguments:
+    options:
       -h, --help            show this help message and exit
-      --mode {MartinM1,MartinM2,ScottieS1,ScottieS2,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120D160,PD180,PD240,Robot8BW,Robot24BW}
+      --mode {MartinM1,MartinM2,ScottieS1,ScottieS2,ScottieDX,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,WraaseSC2120,WraaseSC2180,Robot8BW,Robot24BW}
                             image mode (default: Martin M1)
       --rate RATE           sampling rate (default: 48000)
       --bits BITS           bits per sample (default: 16)
@@ -53,11 +54,12 @@ Command line usage
       --fskid FSKID         add FSKID at the end
       --chan CHAN           number of channels (default: mono)
       --resize              resize the image to the correct size
-      --keep-aspect-ratio   keep the original aspect ratio when resizing 
+      --keep-aspect-ratio   keep the original aspect ratio when resizing
                                 (and cut off excess pixels)
-      --keep-aspect         keep the original aspect ratio when resizing 
+      --keep-aspect         keep the original aspect ratio when resizing
                                 (not cut off excess pixels)
-      --resample            which resampling filter to use for resizing
+      --resample {nearest,bicubic,lanczos}
+                            which resampling filter to use for resizing
                                 (see Pillow documentation)
 
 Python interface

{PySSTV-0.5.6 → pysstv-0.5.7}/PySSTV.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySSTV
-Version: 0.5.6
+Version: 0.5.7
 Summary: Python classes for generating Slow-scan Television transmissions
 Home-page: https://github.com/dnet/pySSTV
 Author: András Veres-Szentkirályi
@@ -32,9 +32,10 @@ Command line usage
 
     $ python -m pysstv -h
     usage: __main__.py [-h]
-                  [--mode {MartinM1,MartinM2,ScottieS1,ScottieS2,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,Robot8BW,Robot24BW}]
+                  [--mode {MartinM1,MartinM2,ScottieS1,ScottieS2,ScottieDX,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,WraaseSC2120,WraaseSC2180,Robot8BW,Robot24BW}]
                   [--rate RATE] [--bits BITS] [--vox] [--fskid FSKID]
-                  [--chan CHAN]
+                  [--chan CHAN] [--resize] [--keep-aspect-ratio]
+                  [--keep-aspect] [--resample {nearest,bicubic,lanczos}]
                   image.png output.wav
 
     Converts an image to an SSTV modulated WAV file.
@@ -43,9 +44,9 @@ Command line usage
       image.png             input image file name
       output.wav            output WAV file name
 
-    optional arguments:
+    options:
       -h, --help            show this help message and exit
-      --mode {MartinM1,MartinM2,ScottieS1,ScottieS2,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120D160,PD180,PD240,Robot8BW,Robot24BW}
+      --mode {MartinM1,MartinM2,ScottieS1,ScottieS2,ScottieDX,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,WraaseSC2120,WraaseSC2180,Robot8BW,Robot24BW}
                             image mode (default: Martin M1)
       --rate RATE           sampling rate (default: 48000)
       --bits BITS           bits per sample (default: 16)
@@ -53,11 +54,12 @@ Command line usage
       --fskid FSKID         add FSKID at the end
       --chan CHAN           number of channels (default: mono)
       --resize              resize the image to the correct size
-      --keep-aspect-ratio   keep the original aspect ratio when resizing 
+      --keep-aspect-ratio   keep the original aspect ratio when resizing
                                 (and cut off excess pixels)
-      --keep-aspect         keep the original aspect ratio when resizing 
+      --keep-aspect         keep the original aspect ratio when resizing
                                 (not cut off excess pixels)
-      --resample            which resampling filter to use for resizing
+      --resample {nearest,bicubic,lanczos}
+                            which resampling filter to use for resizing
                                 (see Pillow documentation)
 
 Python interface

{PySSTV-0.5.6 → pysstv-0.5.7}/README.md

@@ -14,9 +14,10 @@ Command line usage
 
     $ python -m pysstv -h
     usage: __main__.py [-h]
-                  [--mode {MartinM1,MartinM2,ScottieS1,ScottieS2,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,Robot8BW,Robot24BW}]
+                  [--mode {MartinM1,MartinM2,ScottieS1,ScottieS2,ScottieDX,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,WraaseSC2120,WraaseSC2180,Robot8BW,Robot24BW}]
                   [--rate RATE] [--bits BITS] [--vox] [--fskid FSKID]
-                  [--chan CHAN]
+                  [--chan CHAN] [--resize] [--keep-aspect-ratio]
+                  [--keep-aspect] [--resample {nearest,bicubic,lanczos}]
                   image.png output.wav
 
     Converts an image to an SSTV modulated WAV file.
@@ -25,9 +26,9 @@ Command line usage
       image.png             input image file name
       output.wav            output WAV file name
 
-    optional arguments:
+    options:
       -h, --help            show this help message and exit
-      --mode {MartinM1,MartinM2,ScottieS1,ScottieS2,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120D160,PD180,PD240,Robot8BW,Robot24BW}
+      --mode {MartinM1,MartinM2,ScottieS1,ScottieS2,ScottieDX,Robot36,PasokonP3,PasokonP5,PasokonP7,PD90,PD120,PD160,PD180,PD240,PD290,WraaseSC2120,WraaseSC2180,Robot8BW,Robot24BW}
                             image mode (default: Martin M1)
       --rate RATE           sampling rate (default: 48000)
       --bits BITS           bits per sample (default: 16)
@@ -35,11 +36,12 @@ Command line usage
       --fskid FSKID         add FSKID at the end
       --chan CHAN           number of channels (default: mono)
       --resize              resize the image to the correct size
-      --keep-aspect-ratio   keep the original aspect ratio when resizing 
+      --keep-aspect-ratio   keep the original aspect ratio when resizing
                                 (and cut off excess pixels)
-      --keep-aspect         keep the original aspect ratio when resizing 
+      --keep-aspect         keep the original aspect ratio when resizing
                                 (not cut off excess pixels)
-      --resample            which resampling filter to use for resizing
+      --resample {nearest,bicubic,lanczos}
+                            which resampling filter to use for resizing
                                 (see Pillow documentation)
 
 Python interface

{PySSTV-0.5.6 → pysstv-0.5.7}/pysstv/color.py

@@ -77,6 +77,12 @@ class ScottieS2(ScottieS1):
     WIDTH = 160
 
 
+class ScottieDX(ScottieS1):
+    VIS_CODE = 0x4c
+    # http://www.barberdsp.com/downloads/Dayton%20Paper.pdf
+    SCAN = 345.6000 - ScottieS1.INTER_CH_GAP
+
+
 class Robot36(ColorSSTV):
     VIS_CODE = 0x08
     WIDTH = 320
@@ -201,5 +207,49 @@ class PD290(PD240):
     PIXEL = 0.286
 
 
-MODES = (MartinM1, MartinM2, ScottieS1, ScottieS2, Robot36,
-        PasokonP3, PasokonP5, PasokonP7, PD90, PD120, PD160, PD180, PD240, PD290)
+class WraaseSC2180(ColorSSTV):
+    VIS_CODE = 0x37
+    WIDTH = 320
+    HEIGHT = 256
+    COLOR_SEQ = (Color.red, Color.green, Color.blue)
+
+    SYNC     = 5.5225
+    PORCH    = 0.5
+    SCAN     = 235.0
+
+    def before_channel(self, color):
+        if color is Color.red:
+            yield FREQ_BLACK, self.PORCH
+        else:
+            return []
+
+    def after_channel(self, color):
+        return []
+
+
+class WraaseSC2120(WraaseSC2180):
+    VIS_CODE = 0x3f
+
+    # NB: there are "authoritative" sounding documents that will tell you SC-2
+    # 120 uses red and blue channels that have half the line width of the
+    # green channel.  Having spent several hours trying to nut out why SC2-120
+    # images weren't decoding in anything else, I can say this is utter
+    # bunkum.  The line width is the same for all three channels, just
+    # shorter.
+
+    SCAN     = 156.0
+
+    def before_channel(self, color):
+        # Not sure why, but SC2-120 decoding seems to need an extra few sync
+        # pulses to decode in QSSTV and slowrx.  Take the extra pulse out, and
+        # it slants something chronic and QSSTV loses sync regularly even on
+        # DX mode.  Put it in, and both decode reliably.  Go figure.  SC2-180
+        # works just fine without this extra pulse at the start of each
+        # channel.
+        yield FREQ_BLACK, self.PORCH
+        yield from super().before_channel(color)
+
+
+MODES = (MartinM1, MartinM2, ScottieS1, ScottieS2, ScottieDX, Robot36,
+        PasokonP3, PasokonP5, PasokonP7, PD90, PD120, PD160, PD180, PD240,
+         PD290, WraaseSC2120, WraaseSC2180)

{PySSTV-0.5.6 → pysstv-0.5.7}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='PySSTV',
-    version='0.5.6',
+    version='0.5.7',
     description='Python classes for generating Slow-scan Television transmissions',
     author=u'András Veres-Szentkirályi',
     author_email='vsza@vsza.hu',