luna/devedeng-extended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now checks that the desired parameters are available

Browse source
This commit is contained in:
Sergio Costas 2014-12-28 00:53:49 +01:00
parent dbf60833f6
commit ddb97c1970
2 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/devede/avprobe.py
View file

@ -113,14 +113,24 @@ class avprobe(devede.executor.executor):
self.original_width = int(float(element["width"])) self.original_width = int(float(element["width"]))
self.original_height = int(float(element["height"])) self.original_height = int(float(element["height"]))
self.original_length = int(float(element["duration"])) self.original_length = int(float(element["duration"]))
if ("bit_rate" in element):
self.original_videorate = int(float(element["bit_rate"]))/1000 self.original_videorate = int(float(element["bit_rate"]))/1000
else:
self.original_videorate = 0
self.original_fps = self.get_division(element["avg_frame_rate"]) self.original_fps = self.get_division(element["avg_frame_rate"])
if ("display_aspect_ratio" in element):
self.original_aspect_ratio = self.get_division(element["display_aspect_ratio"]) self.original_aspect_ratio = self.get_division(element["display_aspect_ratio"])
else:
self.original_aspect_ratio = 0
elif (element["codec_type"]=="audio"): elif (element["codec_type"]=="audio"):
self.audio_streams += 1 self.audio_streams += 1
self.audio_list.append(element["index"]) self.audio_list.append(element["index"])
if (self.audio_streams == 1): if (self.audio_streams == 1):
if ("bit_rate" in element):
self.original_audiorate = int(float(element["bit_rate"]))/1000 self.original_audiorate = int(float(element["bit_rate"]))/1000
else:
self.original_audiorate = 0
self.original_audiorate_uncompressed = int(float(element["sample_rate"])) self.original_audiorate_uncompressed = int(float(element["sample_rate"]))
self.original_size = str(self.original_width)+"x"+str(self.original_height) self.original_size = str(self.original_width)+"x"+str(self.original_height)

10
src/devede/ffprobe.py
View file

@ -113,14 +113,24 @@ class ffprobe(devede.executor.executor):
self.original_width = int(float(element["width"])) self.original_width = int(float(element["width"]))
self.original_height = int(float(element["height"])) self.original_height = int(float(element["height"]))
self.original_length = int(float(element["duration"])) self.original_length = int(float(element["duration"]))
if ("bit_rate" in element):
self.original_videorate = int(float(element["bit_rate"]))/1000 self.original_videorate = int(float(element["bit_rate"]))/1000
else:
self.original_videorate = 0
self.original_fps = self.get_division(element["avg_frame_rate"]) self.original_fps = self.get_division(element["avg_frame_rate"])
if ("display_aspect_ratio" in element):
self.original_aspect_ratio = self.get_division(element["display_aspect_ratio"]) self.original_aspect_ratio = self.get_division(element["display_aspect_ratio"])
else:
self.original_aspect_ratio = 0
elif (element["codec_type"]=="audio"): elif (element["codec_type"]=="audio"):
self.audio_streams += 1 self.audio_streams += 1
self.audio_list.append(element["index"]) self.audio_list.append(element["index"])
if (self.audio_streams == 1): if (self.audio_streams == 1):
if ("bit_rate" in element):
self.original_audiorate = int(float(element["bit_rate"]))/1000 self.original_audiorate = int(float(element["bit_rate"]))/1000
else:
self.original_audiorate = 0
self.original_audiorate_uncompressed = int(float(element["sample_rate"])) self.original_audiorate_uncompressed = int(float(element["sample_rate"]))
self.original_size = str(self.original_width)+"x"+str(self.original_height) self.original_size = str(self.original_width)+"x"+str(self.original_height)