github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 05:13:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add proper check of sub streams #1150 and filter out commentary. Fixes #1180

Browse source
This commit is contained in:
clinton-hall 2017-01-31 11:18:42 +10:30
commit 3af8bc7885
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/transcoder/transcoder.py
View file

@ -254,7 +254,15 @@ def buildCommands(file, newDir, movieName, bitbucket):
used_audio = 0 used_audio = 0
a_mapped = [] a_mapped = []
commentary = []
if audioStreams: if audioStreams:
for i, val in enumerate(audioStreams):
try:
if "Commentary" in val.get("tags").get("title"): # Split out commentry tracks.
commentary.append(audioStreams[i])
del audioStreams[i]
except:
continue
try: try:
audio1 = [item for item in audioStreams if item["tags"]["language"] == core.ALANGUAGE] audio1 = [item for item in audioStreams if item["tags"]["language"] == core.ALANGUAGE]
except: # no language tags. Assume only 1 language. except: # no language tags. Assume only 1 language.
@ -374,7 +382,7 @@ def buildCommands(file, newDir, movieName, bitbucket):
audio_cmd.extend(audio_cmd2) audio_cmd.extend(audio_cmd2)
if core.AINCLUDE and core.ACODEC3: if core.AINCLUDE and core.ACODEC3:
for audio in audioStreams: for audio in audioStreams.extend(commentary): #add commentry tracks back here.
if audio["index"] in a_mapped: if audio["index"] in a_mapped:
continue continue
used_audio += 1 used_audio += 1
@ -463,6 +471,10 @@ def buildCommands(file, newDir, movieName, bitbucket):
sub_details, result = getVideoDetails(subfile) sub_details, result = getVideoDetails(subfile)
if not sub_details or not sub_details.get("streams"): if not sub_details or not sub_details.get("streams"):
continue continue
if core.SCODEC == "mov_text":
subcode = [stream["codec_name"] for stream in sub_details["streams"]]
if set(subcode).intersection(["dvd_subtitle", "VobSub"]): # We can't convert these.
continue
command.extend(['-i', subfile]) command.extend(['-i', subfile])
lan = os.path.splitext(os.path.splitext(subfile)[0])[1][1:].split('-')[0] lan = os.path.splitext(os.path.splitext(subfile)[0])[1][1:].split('-')[0]
metlan = None metlan = None
@ -500,7 +512,7 @@ def buildCommands(file, newDir, movieName, bitbucket):
def get_subs(file): def get_subs(file):
filepaths = [] filepaths = []
subExt = ['.srt'] #, '.sub', '.idx'] #remove .sub + .idx for now. subExt = ['.srt', '.sub', '.idx']
name = os.path.splitext(os.path.split(file)[1])[0] name = os.path.splitext(os.path.split(file)[1])[0]
dir = os.path.split(file)[0] dir = os.path.split(file)[0]
for dirname, dirs, filenames in os.walk(dir): for dirname, dirs, filenames in os.walk(dir):