increase robustness for non-audio streams, cleanup Windows options

Author: scivision

PyLivestream/__init__.py

@@ -124,11 +124,11 @@ def osparam(self):
         self.timelimit = C.get(self.site,'timelimit',fallback=None)
 
         self.videochan = C.get(sys.platform,'videochan')
-        self.audiochan = C.get(sys.platform,'audiochan')
+        self.audiochan = C.get(sys.platform,'audiochan', fallback=None)
         self.vcap = C.get(sys.platform,'vcap')
-        self.acap = C.get(sys.platform,'acap')
+        self.acap = C.get(sys.platform,'acap', fallback=None)
         self.hcam = C.get(sys.platform,'hcam')
-        self.exe = C.get(sys.platform,'exe',fallback='ffmpeg')
+        self.exe = getexe(C.get(sys.platform,'exe',fallback='ffmpeg'))
 
 
         self.video_kbps = C.getint(self.site, 'video_kbps', fallback=None)
@@ -175,15 +175,18 @@ def videostream(self) -> tuple:
 
     def audiostream(self) -> list:
         """
+        -ac * may not be needed, took out.
         -ac 2 NOT -ac 1 to avoid "non monotonous DTS in output stream" errors
         """
-        if not self.audio_bps:
+        if not self.audio_bps or not self.acap or not self.audiochan:
             return []
 
         if not self.vidsource == 'file':
-            return ['-f', self.acap, '-ac','2', '-i', self.audiochan]
-        else: #  file input
-            return ['-ac','2']
+            return ['-f', self.acap, '-i', self.audiochan]
+        else: # file input
+            return []
+#        else: #  file input
+#            return ['-ac','2']
 
 
     def audiocomp(self) -> list:
@@ -193,7 +196,7 @@ def audiocomp(self) -> list:
         https://www.facebook.com/facebookmedia/get-started/live
         """
 
-        if not self.audio_bps:
+        if not self.audio_bps or not self.acap or not self.audiochan:
             return []
 
         return ['-c:a','aac',
@@ -231,7 +234,8 @@ def screengrab(self) -> list:
         if sys.platform =='linux':
             vid1 += ['-i', ':0.0+{},{}'.format(self.origin[0], self.origin[1])]
         elif sys.platform =='win32':
-            vid1 += ['-i', self.videochan]
+            vid1 += ['-offset_x',self.origin[0],'-offset_y',self.origin[1],
+                     '-i', self.videochan,]
         elif sys.platform == 'darwin':
             pass  # FIXME: verify
 
@@ -433,9 +437,9 @@ def __init__(self, ini:Path, outfn:Path=None, clobber:bool=False):
         aud1 = self.audiostream()
         aud2 = self.audiocomp()
 
-        cmd = [self.exe] + vid1 + vid2 + aud1 + aud2
+        cmd = [self.exe] + vid1 + aud1 + vid2 + aud2
 
-        if not outfn.suffix:  # ffmpeg relies on suffix for container type, this is a fallback.
+        if outfn and not outfn.suffix:  # ffmpeg relies on suffix for container type, this is a fallback.
             cmd += ['-f','flv']
 
         cmd += [str(outfn)]
@@ -446,13 +450,16 @@ def __init__(self, ini:Path, outfn:Path=None, clobber:bool=False):
         if clobber:
             cmd += ['-y']
 
-        if sys.platform == 'win32':
-            cmd += ['-copy_ts']
+#        if sys.platform == 'win32':
+#            cmd += ['-copy_ts']
 
         print('\n',' '.join(cmd),'\n')
 
         if outfn:
-            ret = sp.run(cmd).returncode
-            print('FFmpeg returncode',ret)
+            try:
+                ret = sp.run(cmd).returncode
+                print('FFmpeg returncode',ret)
+            except FileNotFoundError:
+                pass
         else:
             print('specify filename to save screen capture with audio to disk.')

README.rst

@@ -245,6 +245,10 @@ FFmpeg References
 
 Windows
 ~~~~~~~
+
+* `gdigrab <https://ffmpeg.org/ffmpeg-devices.html#gdigrab>`_
+
+DirectShow didn't work for me on Windows 10, so I used gdigrab instead.
 * `DirectShow <https://trac.ffmpeg.org/wiki/DirectShow>`_ device selection
 * DirectShow `examples <https://ffmpeg.org/ffmpeg-devices.html#Examples-4>`_
 

setup.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 install_requires=['numpy']
-tests_require=['pytest','coveralls']
+tests_require=['pytest','nose','coveralls']
 from setuptools import setup,find_packages
 
 setup(name='PyLivestream',
       packages=find_packages(),
-      version = '1.4.5',
+      version = '1.4.6',
       author='Michael Hirsch, Ph.D.',
       url='https://github.com/scivision/PyLivestream',
       description='Easy streaming using FFmpeg to YouTube Live, Periscope, Facebook Live, Twitch, ...',

stream.ini

@@ -13,10 +13,12 @@ timelimit:
 
 # indexed by sys.platform
 [win32]
-videochan: video="UScreenCapture"
-audiochan: audio="Internal Microphone"
-vcap: dshow
+vcap: gdigrab
+videochan: desktop
+#vcap: dshow
+#videochan: video="UScreenCapture"
 acap: dshow
+#audiochan: audio="Internal Microphone"
 hcam: dshow
 [darwin]
 videochan: default
@@ -76,4 +78,4 @@ key: vimeo.key
 [file]
 video_kbps: 2000
 screencap_res: 720x420
-audio_bps:
+#audio_bps: