0x2620/pandora_client
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dont force keyframe interval

Browse source
This commit is contained in:
j 2012-01-04 15:01:18 +05:30
parent 3dc8dfcacd
commit ec1fd2c565
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pandora_client/__init__.py
View file

@ -223,6 +223,10 @@ class Client(object):
for name in self._config['volumes']: for name in self._config['volumes']:
path = self._config['volumes'][name] path = self._config['volumes'][name]
path = os.path.normpath(path) path = os.path.normpath(path)
conn, c = self._conn()
c.execute('SELECT path FROM file WHERE path LIKE ? AND deleted < 0', ["%s%%"%path])
known_files = [r[0] for r in c.fetchall()]
files = [] files = []
for dirpath, dirnames, filenames in os.walk(path, followlinks=True): for dirpath, dirnames, filenames in os.walk(path, followlinks=True):
if isinstance(dirpath, str): if isinstance(dirpath, str):
@ -237,11 +241,8 @@ class Client(object):
files.append(file_path) files.append(file_path)
self.scan_file(file_path) self.scan_file(file_path)
conn, c = self._conn()
c.execute('SELECT path FROM file WHERE path LIKE ? AND deleted < 0', ["%s%%"%path])
known_files = [r[0] for r in c.fetchall()]
deleted_files = filter(lambda f: f not in files, known_files) deleted_files = filter(lambda f: f not in files, known_files)
conn, c = self._conn()
if deleted_files: if deleted_files:
deleted = time.mktime(time.localtime()) deleted = time.mktime(time.localtime())
for f in deleted_files: for f in deleted_files:

3
pandora_client/extract.py
View file

@ -130,8 +130,9 @@ def video_cmd(video, target, profile, info):
if abs(width/height - dar) < 0.02: if abs(width/height - dar) < 0.02:
aspect = '%s:%s' % (width, height) aspect = '%s:%s' % (width, height)
# '-g', '%d' % int(fps*2),
video_settings = [ video_settings = [
'-vb', '%dk'%bitrate, '-g', '%d' % int(fps*2), '-vb', '%dk'%bitrate,
'-s', '%dx%d'%(width, height), '-s', '%dx%d'%(width, height),
'-aspect', aspect, '-aspect', aspect,
'-vf', 'yadif', '-vf', 'yadif',