Browse Source

Clean up PR

spaghetti 7 years ago
parent
commit
4cca617cc8
1 changed files with 8 additions and 20 deletions
  1. 8
    20
      static/functions/upload.js

+ 8
- 20
static/functions/upload.js View File

497
     } else if (sel == 'container') {
497
     } else if (sel == 'container') {
498
       var containerTable = {'Matroska': 'MKV','MPEG-4': 'MP4','AVI': 'AVI','OGG': 'OGM','Windows Media': 'WMV'}
498
       var containerTable = {'Matroska': 'MKV','MPEG-4': 'MP4','AVI': 'AVI','OGG': 'OGM','Windows Media': 'WMV'}
499
       var cont = getval(mi, 'Format')
499
       var cont = getval(mi, 'Format')
500
-      if (containerTable[cont]) { $('[name=container]').raw().value = containerTable[cont] };
500
+      if (containerTable[cont]) { $('[name=container]').raw().value = containerTable[cont] }
501
     } else if (sel == 'codec') {
501
     } else if (sel == 'codec') {
502
       var codecTable = {'WMV1':'WMV','VC-1':'WMV','HEVC':'HEVC'}
502
       var codecTable = {'WMV1':'WMV','VC-1':'WMV','HEVC':'HEVC'}
503
       var codec = getval(mi.slice(mi.search(/^Video$/m)), 'Format')
503
       var codec = getval(mi.slice(mi.search(/^Video$/m)), 'Format')
504
       var formatProfile = getval(mi.slice(mi.search(/^Video$/m)), 'Format profile')
504
       var formatProfile = getval(mi.slice(mi.search(/^Video$/m)), 'Format profile')
505
       var codecID = getval(mi, 'Codec ID')
505
       var codecID = getval(mi, 'Codec ID')
506
       var codel = $('[name=codec]').raw()
506
       var codel = $('[name=codec]').raw()
507
-      if (codec == 'AVC'){
508
-        if (formatProfile == 'High 10@L4' || formatProfile == 'High 10@L5.2') { 
509
-          codel.value = '10-bit h264' 
510
-        } 
511
-        else {
512
-          codel.value = 'h264'
513
-        } 
514
-      } 
507
+      if (codec == 'AVC') {
508
+        codel.value = (formatProfile.includes('High 10')) ? '10-bit h264' : 'h264'
509
+      }
515
       else if (codec == 'MPEG-4 Visual') {
510
       else if (codec == 'MPEG-4 Visual') {
516
-        if (codecID == 'XVID') { 
517
-          codel.value = 'XVID' 
518
-        }
519
-        else {
520
-          codel.value = 'DIVX'
521
-        } 
522
-      } 
523
-      else {
524
-        if (codecTable[codec]) {
525
-          codel.value = codecTable[codec] 
526
-        }
511
+        codel.value = (codecID == 'XVID') ? 'XVID' : 'DIVX'
512
+      }
513
+      else if (codecTable[codec]) {
514
+        codel.value = codecTable[codec]
527
       }
515
       }
528
     }
516
     }
529
   })
517
   })

Loading…
Cancel
Save