bona jugada
This commit is contained in:
parent
944b89702e
commit
e447c2a4e4
|
@ -122,13 +122,28 @@ def printAudio (audio2Print) {
|
||||||
/***********/
|
/***********/
|
||||||
/*********************************************************/
|
/*********************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def bloqueAudio2=''
|
def bloqueAudio2=''
|
||||||
def audiosMap = [:]
|
def audiosMap = [:]
|
||||||
for (aud in audio) {
|
for (aud in audio) {
|
||||||
def shortDesc = aud.Language_String3
|
def shortDesc = aud.Language_String3
|
||||||
if (audiosMap.containsKey(shortDesc)) audiosMap[shortDesc].add(aud)
|
audiosMap[shortDesc] = audiosMap[shortDesc] ?: [:]
|
||||||
else audiosMap[shortDesc] = [aud]
|
audiosMap[shortDesc][aud.Format] = audiosMap[shortDesc][aud.Format] ?: []
|
||||||
|
audiosMap[shortDesc][aud.Format] << aud
|
||||||
}
|
}
|
||||||
|
|
||||||
def groupedAudiosMap = [:]
|
def groupedAudiosMap = [:]
|
||||||
for (audioElms in audiosMap) {
|
for (audioElms in audiosMap) {
|
||||||
def k = audioElms.key
|
def k = audioElms.key
|
||||||
|
@ -139,6 +154,7 @@ for (audioElms in audiosMap) {
|
||||||
if (groupedAudiosMap.containsKey(mQstr)) groupedAudiosMap[mQstr].add(k)
|
if (groupedAudiosMap.containsKey(mQstr)) groupedAudiosMap[mQstr].add(k)
|
||||||
else groupedAudiosMap[mQstr] = [k]
|
else groupedAudiosMap[mQstr] = [k]
|
||||||
}
|
}
|
||||||
|
|
||||||
audiosMap=null
|
audiosMap=null
|
||||||
def temp=''
|
def temp=''
|
||||||
for (audioGroup in groupedAudiosMap) {
|
for (audioGroup in groupedAudiosMap) {
|
||||||
|
@ -163,13 +179,12 @@ bloqueAudio2 = removeLastComa(bloqueAudio2)
|
||||||
def removeLastComa(txt) {
|
def removeLastComa(txt) {
|
||||||
return txt.substring(0, txt.size()-2)
|
return txt.substring(0, txt.size()-2)
|
||||||
}
|
}
|
||||||
def getMaxQuality2 (listOfLanguageAudio) {
|
def getMaxQuality2 (mapAudioIndexedByFormat) {
|
||||||
def formatSet = ["PCM", "MLP FBA" ,"DTS", "FLAC", "AC-3", "E-AC-3", "EAC3", "AAC", "MPEG Audio", "MP3"]
|
def formatSet = ["PCM", "MLP FBA" ,"DTS", "FLAC", "AC-3", "E-AC-3", "EAC3", "AAC", "MPEG Audio", "MP3"]
|
||||||
for (cFormat in formatSet) {
|
for (cFormat in formatSet) {
|
||||||
def audiosFormatFound = getAudiosFromListByFormat2(cFormat, listOfLanguageAudio);
|
if (mapAudioIndexedByFormat.containsKey(cFormat)){
|
||||||
if (!audiosFormatFound.isEmpty()) {
|
return getBestChannelFromList2(mapAudioIndexedByFormat[cFormat])
|
||||||
return getBestChannelFromList2(audiosFormatFound)
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,4 +220,9 @@ def getBestChannelFromList2 (audiosFormatFound) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/************************/
|
||||||
return bloqueAudio + ' vs [' + bloqueAudio2 + ']'
|
return bloqueAudio + ' vs [' + bloqueAudio2 + ']'
|
Loading…
Reference in New Issue