Merge pull request #5959 from thebluepotato/fix_hevc_renaming

Add HEVC profiles to Enzyme to fix MPEGH/ISO/HEVC renaming bug

couchpotato/core/plugins/scanner.py

@@ -70,7 +70,7 @@ class Scanner(Plugin):
 
     codecs = {
         'audio': ['DTS', 'AC3', 'AC3D', 'MP3'],
-        'video': ['x264', 'H264', 'DivX', 'Xvid']
+        'video': ['x264', 'H264', 'x265', 'H265', 'DivX', 'Xvid']
     }
 
     resolutions = {
@@ -106,7 +106,7 @@ class Scanner(Plugin):
     }
 
     clean = '([ _\,\.\(\)\[\]\-]|^)(3d|hsbs|sbs|half.sbs|full.sbs|ou|half.ou|full.ou|extended|extended.cut|directors.cut|french|fr|swedisch|sw|danish|dutch|nl|swesub|subs|spanish|german|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdr|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip' \
-            '|hdtvrip|webdl|web.dl|webrip|web.rip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|video_ts|audio_ts|480p|480i|576p|576i|720p|720i|1080p|1080i|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|hc|\[.*\])(?=[ _\,\.\(\)\[\]\-]|$)'
+            '|hdtvrip|webdl|web.dl|webrip|web.rip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|video_ts|audio_ts|480p|480i|576p|576i|720p|720i|1080p|1080i|hrhd|hrhdtv|hddvd|bluray|x264|h264|x265|h265|xvid|xvidvd|xxx|www.www|hc|\[.*\])(?=[ _\,\.\(\)\[\]\-]|$)'
     multipart_regex = [
         '[ _\.-]+cd[ _\.-]*([0-9a-d]+)',  #*cd1
         '[ _\.-]+dvd[ _\.-]*([0-9a-d]+)',  #*dvd1
@@ -520,7 +520,7 @@ class Scanner(Plugin):
             p = enzyme.parse(filename)
 
             # Video codec
-            vc = ('H264' if p.video[0].codec == 'AVC1' else p.video[0].codec)
+            vc = ('H264' if p.video[0].codec == 'AVC1' else 'x265' if p.video[0].codec == 'HEVC' else p.video[0].codec)
 
             # Audio codec
             ac = p.audio[0].codec

libs/enzyme/fourcc.py

@@ -437,13 +437,14 @@ FOURCC = {
     'H262': 'H.262',
     'H263': 'H.263',
     'H264': 'H.264 AVC',
-    'H265': 'H.265',
+    'H265': 'H.265 HEVC',
     'H266': 'H.266',
     'H267': 'H.267',
     'H268': 'H.268',
     'H269': 'H.269',
     'HD10': 'BlueFish444 (lossless RGBA, YUV 10-bit)',
     'HDX4': 'Jomigo HDX4',
+    'HEVC': 'H.265 HEVC',
     'HFYU': 'Huffman Lossless Codec',
     'HMCR': 'Rendition Motion Compensation Format (HMCR)',
     'HMRR': 'Rendition Motion Compensation Format (HMRR)',
@@ -793,6 +794,7 @@ FOURCC = {
     'WVP2': 'WVP2 codec',
     'X263': 'Xirlink H.263',
     'X264': 'XiWave GNU GPL x264 MPEG-4 Codec',
+    'X265': 'H.265 HEVC',
     'XLV0': 'NetXL Video Decoder',
     'XMPG': 'Xing MPEG (I-Frame only)',
     'XVID': 'XviD MPEG-4',

libs/enzyme/mkv.py

@@ -123,6 +123,7 @@ FOURCCMap = {
     'V_SNOW': 'SNOW',
     'V_MPEG4/ISO/ASP': 'MP4V',
     'V_MPEG4/ISO/AVC': 'AVC1',
+    'V_MPEGH/ISO/HEVC': 'HEVC',
     'A_AC3': 0x2000,
     'A_MPEG/L3': 0x0055,
     'A_MPEG/L2': 0x0050,