Skip to content

Commit

Permalink
remove scipy prereq
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Feb 22, 2018
1 parent d3ce528 commit 872516a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions PyLivestream/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from pathlib import Path
from getpass import getpass
import numpy as np
from scipy.interpolate import interp1d
import subprocess as sp
import logging,os,sys
from configparser import ConfigParser
Expand Down Expand Up @@ -192,15 +191,12 @@ def video_bitrate(self) -> list:
if self.video_kbps: # per-site override
return

y = int(self.res[1])
x = int(self.res[1])

if self.fps <= 30:
f = interp1d(BR30[:,0], BR30[:,1])
self.video_kbps = int(np.interp(x, BR30[:,0], BR30[:,1]))
else:
f = interp1d(BR60[:,0], BR60[:,1])

self.video_kbps = int(f(y))

self.video_kbps = int(np.interp(x, BR60[:,0], BR60[:,1]))


def screengrab(self) -> list:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env python
install_requires=['numpy','scipy']
install_requires=['numpy']
tests_require=['nose','coveralls']
from setuptools import setup,find_packages

setup(name='PyLivestream',
packages=find_packages(),
version = '1.4.0',
version = '1.4.1',
author='Michael Hirsch, Ph.D.',
url='https://github.com/scivision/PyLivestream',
description='Easy streaming using FFmpeg to YouTube Live, Periscope, Facebook Live, Twitch, ...',
Expand Down

0 comments on commit 872516a

Please sign in to comment.