fabrice/mediacurator
fabrice/mediacurator
1
0
Fork 0
Code Projects Releases Activity

Improved detection methods

Browse Source
This commit is contained in:
Fabrice Quenneville 2020-11-19 23:09:28 -05:00
parent 8df660019d
commit 0b30bf82d4
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mediacurator/library/video.py
View File

@ -177,20 +177,6 @@ class Video():
@staticmethod
def detect_codec(filepath):
try:
args = ["ffprobe", "-v", "error", "-select_streams", "v:0", "-show_entries", "stream=codec_name", "-of", "default=noprint_wrappers=1:nokey=1", str(filepath)]
output = subprocess.check_output(args, stderr=subprocess.STDOUT)
# decoding from binary, stripping whitespace, keep only last line
# in case ffmprobe added error messages over the requested information
output = output.decode().strip().splitlines()[-1]
except (subprocess.CalledProcessError, IndexError):
return False
return output
@staticmethod @staticmethod
def detect_fferror(filepath): def detect_fferror(filepath):
try: try:
@ -205,14 +191,28 @@ class Video():
@staticmethod @staticmethod
def detect_resolution(filepath): def detect_codec(filepath):
try: try:
args = ["ffprobe","-v","error","-select_streams","v:0", "-show_entries","stream=width,height","-of","csv=s=x:p=0",str(filepath)] args = ["ffprobe", "-v", "quiet", "-select_streams", "v:0", "-show_entries", "stream=codec_name", "-of", "default=noprint_wrappers=1:nokey=1", str(filepath)]
output = subprocess.check_output(args, stderr=subprocess.STDOUT) output = subprocess.check_output(args, stderr=subprocess.STDOUT)
# decoding from binary, stripping whitespace, keep only last line # decoding from binary, stripping whitespace, keep only last line
# in case ffmprobe added error messages over the requested information # in case ffmprobe added error messages over the requested information
output = output.decode().strip().splitlines()[-1] output = output.decode().strip()
except (subprocess.CalledProcessError, IndexError):
return False
return output
@staticmethod
def detect_resolution(filepath):
try:
args = ["ffprobe","-v","quiet","-select_streams","v:0", "-show_entries","stream=width,height","-of","csv=s=x:p=0",str(filepath)]
output = subprocess.check_output(args, stderr=subprocess.STDOUT)
# decoding from binary, stripping whitespace, keep only last line
# in case ffmprobe added error messages over the requested information
output = output.decode().strip()
# See if we got convertable data # See if we got convertable data
output = [int(output.split("x")[0]), int(output.split("x")[1])] output = [int(output.split("x")[0]), int(output.split("x")[1])]