diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index f680e100..04cac153 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -392,6 +392,8 @@ def initialize(section=None): GENERALOPTS = (CFG["Transcoder"]["generalOptions"]) if isinstance(GENERALOPTS, str): GENERALOPTS = GENERALOPTS.split(',') if GENERALOPTS == ['']: GENERALOPTS = [] + if not '-fflags' in GENERALOPTS: GENERALOPTS.append('-fflags') + if not '+genpts' in GENERALOPTS: GENERALOPTS.append('+genpts') try: OUTPUTQUALITYPERCENT = int(CFG["Transcoder"]["outputQualityPercent"]) except: pass diff --git a/nzbtomedia/transcoder/transcoder.py b/nzbtomedia/transcoder/transcoder.py index 0d1ebf5b..625cd919 100644 --- a/nzbtomedia/transcoder/transcoder.py +++ b/nzbtomedia/transcoder/transcoder.py @@ -8,7 +8,6 @@ import nzbtomedia import json import shutil import re -from subprocess import call from nzbtomedia import logger from nzbtomedia.nzbToMediaUtil import makeDir @@ -534,7 +533,9 @@ def extract_subs(file, newfilePath, bitbucket): print_cmd(command) result = 1 # set result to failed in case call fails. try: - result = call(command, stdout=bitbucket, stderr=bitbucket) + proc = subprocess.Popen(command, stdout=bitbucket, stderr=bitbucket) + proc.communicate() + result = proc.returncode except: logger.error("Extracting subtitle has failed") @@ -725,7 +726,7 @@ def Transcode_directory(dirName): result = 1 # set result to failed in case call fails. try: if isinstance(file, str): - result = call(command, stdout=bitbucket, stderr=bitbucket) + proc = subprocess.Popen(command, stdout=bitbucket, stderr=bitbucket) else: img, data = file.iteritems().next() proc = subprocess.Popen(command, stdout=bitbucket, stderr=bitbucket, stdin=subprocess.PIPE) @@ -734,8 +735,8 @@ def Transcode_directory(dirName): if procin: shutil.copyfileobj(procin.stdout, proc.stdin) procin.stdout.close() - proc.communicate() - result = proc.returncode + proc.communicate() + result = proc.returncode except: logger.error("Transcoding of video %s has failed" % (newfilePath))