From bf3897888140d834ccf73c51a4bc565724bfa19c Mon Sep 17 00:00:00 2001 From: Rato Date: Sun, 16 Jul 2017 09:06:42 +0200 Subject: [PATCH 1/5] #471: Detect DTS-HD HRA --- HISTORY.rst | 2 ++ docs/properties.rst | 2 +- guessit/rules/properties/audio_codec.py | 1 + guessit/test/movies.yml | 24 ++++++++++++++++++++++++ guessit/test/rules/audio_codec.yml | 9 +++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 769ba647..5621f7a3 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -88,6 +88,8 @@ History - Added `Upscaled` as new `other` possible value. - Added `Ultimate` as new `edition` possible value. - Added `Fan` as new `edition` possible value. +- Added `High Resolution Audio` as new `audio_profile` possible value. +- Added `Ultimate` as new `edition` possible value. 2.1.4 (2017-06-01) ------------------ diff --git a/docs/properties.rst b/docs/properties.rst index fb4d9f41..9c8160d2 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -196,7 +196,7 @@ Audio properties The codec profile used for audio. - - ``High Efficiency``, ``High Quality``, ``Low Complexity``, ``Master Audio`` + - ``High Efficiency``, ``High Quality``, ``High Resolution Audio``, ``Low Complexity``, ``Master Audio`` Localization properties diff --git a/guessit/rules/properties/audio_codec.py b/guessit/rules/properties/audio_codec.py index bbdfeb12..3ceeb896 100644 --- a/guessit/rules/properties/audio_codec.py +++ b/guessit/rules/properties/audio_codec.py @@ -50,6 +50,7 @@ def audio_codec_priority(match1, match2): rebulk.defaults(name='audio_profile') rebulk.string('MA', value='Master Audio', tags='DTS-HD') + rebulk.string('HR', 'HRA', value='High Resolution Audio', tags='DTS-HD') rebulk.string('HE', value='High Efficiency', tags='AAC') rebulk.string('LC', value='Low Complexity', tags='AAC') rebulk.string('HQ', value='High Quality', tags='Dolby Digital') diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 989025e1..20424ce0 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -1346,4 +1346,28 @@ ? Stargate SG1 Ultimate Fan Collection : title: Stargate SG1 edition: [Ultimate, Fan] + +? The.Jungle.Book.2016.MULTi.1080p.BluRay.x264.DTS-HD.MA.7.1.DTS-HD.HRA.5.1-LeRalou +: title: The Jungle Book + year: 2016 + language: mul + screen_size: 1080p + source: Blu-ray + video_codec: H.264 + audio_codec: DTS-HD + audio_profile: [Master Audio, High Resolution Audio] + audio_channels: ['7.1', '5.1'] + release_group: LeRalou + type: movie + +? Terminus.2015.BluRay.1080p.x264.DTS-HD.HRA.5.1-LTT +: title: Terminus + year: 2015 + source: Blu-ray + screen_size: 1080p + video_codec: H.264 + audio_codec: DTS-HD + audio_profile: High Resolution Audio + audio_channels: '5.1' + release_group: LTT type: movie diff --git a/guessit/test/rules/audio_codec.yml b/guessit/test/rules/audio_codec.yml index aa79704a..650e43a1 100644 --- a/guessit/test/rules/audio_codec.yml +++ b/guessit/test/rules/audio_codec.yml @@ -95,3 +95,12 @@ ? -51 : audio_channels: '5.1' + +? DTS-HD.HRA +? DTSHD.HRA +? DTS-HD.HR +? DTSHD.HR +? -HRA +? -HR +: audio_codec: DTS-HD + audio_profile: High Resolution Audio From b18588e9d4b36a01b164a56797201e15509dbd21 Mon Sep 17 00:00:00 2001 From: Rato Date: Sun, 16 Jul 2017 09:24:07 +0200 Subject: [PATCH 2/5] #471: Detect DTS-ES --- HISTORY.rst | 1 + docs/properties.rst | 3 ++- guessit/rules/properties/audio_codec.py | 1 + guessit/test/movies.yml | 19 +++++++++++++++++++ guessit/test/rules/audio_codec.yml | 6 ++++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 5621f7a3..13f13ae9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -90,6 +90,7 @@ History - Added `Fan` as new `edition` possible value. - Added `High Resolution Audio` as new `audio_profile` possible value. - Added `Ultimate` as new `edition` possible value. +- Added `Extended Surround` as new `audio_profile` possible value. 2.1.4 (2017-06-01) ------------------ diff --git a/docs/properties.rst b/docs/properties.rst index 9c8160d2..e37b05d1 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -196,7 +196,8 @@ Audio properties The codec profile used for audio. - - ``High Efficiency``, ``High Quality``, ``High Resolution Audio``, ``Low Complexity``, ``Master Audio`` + - ``Extended Surround``, ``High Efficiency``, ``High Quality``, ``High Resolution Audio``, ``Low Complexity``, + ``Master Audio`` Localization properties diff --git a/guessit/rules/properties/audio_codec.py b/guessit/rules/properties/audio_codec.py index 3ceeb896..aaf19ea0 100644 --- a/guessit/rules/properties/audio_codec.py +++ b/guessit/rules/properties/audio_codec.py @@ -51,6 +51,7 @@ def audio_codec_priority(match1, match2): rebulk.defaults(name='audio_profile') rebulk.string('MA', value='Master Audio', tags='DTS-HD') rebulk.string('HR', 'HRA', value='High Resolution Audio', tags='DTS-HD') + rebulk.string('ES', value='Extended Surround', tags='DTS') rebulk.string('HE', value='High Efficiency', tags='AAC') rebulk.string('LC', value='Low Complexity', tags='AAC') rebulk.string('HQ', value='High Quality', tags='Dolby Digital') diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 20424ce0..3b98b1ec 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -1371,3 +1371,22 @@ audio_channels: '5.1' release_group: LTT type: movie + +? Ghost.in.the.Shell.1995.1080p.Bluray.DTSES.x264-SHiTSoNy +: title: Ghost in the Shell + year: 1995 + screen_size: 1080p + source: Blu-ray + audio_codec: DTS + audio_profile: Extended Surround + +? The.Boss.Baby.2017.BluRay.1080p.DTS-ES.x264-PRoDJi +: title: The Boss Baby + year: 2017 + source: Blu-ray + screen_size: 1080p + audio_codec: DTS + audio_profile: Extended Surround + video_codec: H.264 + release_group: PRoDJi + type: movie diff --git a/guessit/test/rules/audio_codec.yml b/guessit/test/rules/audio_codec.yml index 650e43a1..593b3d0a 100644 --- a/guessit/test/rules/audio_codec.yml +++ b/guessit/test/rules/audio_codec.yml @@ -104,3 +104,9 @@ ? -HR : audio_codec: DTS-HD audio_profile: High Resolution Audio + +? DTSES +? DTS-ES +? -ES +: audio_codec: DTS + audio_profile: Extended Surround From c19e85427e2d975db00a8ea82c427301cca3673b Mon Sep 17 00:00:00 2001 From: Rato Date: Sun, 16 Jul 2017 09:36:22 +0200 Subject: [PATCH 3/5] #471: Detect Dolby Digital EX --- HISTORY.rst | 1 + docs/properties.rst | 2 +- guessit/rules/properties/audio_codec.py | 1 + guessit/test/movies.yml | 23 +++++++++++++++++++++++ guessit/test/rules/audio_codec.yml | 6 ++++++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 13f13ae9..499b380e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -91,6 +91,7 @@ History - Added `High Resolution Audio` as new `audio_profile` possible value. - Added `Ultimate` as new `edition` possible value. - Added `Extended Surround` as new `audio_profile` possible value. +- Added `EX` as new `audio_profile` possible value 2.1.4 (2017-06-01) ------------------ diff --git a/docs/properties.rst b/docs/properties.rst index e37b05d1..97646178 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -196,7 +196,7 @@ Audio properties The codec profile used for audio. - - ``Extended Surround``, ``High Efficiency``, ``High Quality``, ``High Resolution Audio``, ``Low Complexity``, + - ``Extended Surround``, ``EX``, ``High Efficiency``, ``High Quality``, ``High Resolution Audio``, ``Low Complexity``, ``Master Audio`` diff --git a/guessit/rules/properties/audio_codec.py b/guessit/rules/properties/audio_codec.py index aaf19ea0..561d5fbc 100644 --- a/guessit/rules/properties/audio_codec.py +++ b/guessit/rules/properties/audio_codec.py @@ -55,6 +55,7 @@ def audio_codec_priority(match1, match2): rebulk.string('HE', value='High Efficiency', tags='AAC') rebulk.string('LC', value='Low Complexity', tags='AAC') rebulk.string('HQ', value='High Quality', tags='Dolby Digital') + rebulk.string('EX', value='EX', tags='Dolby Digital') rebulk.defaults(name="audio_channels") rebulk.regex(r'(7[\W_][01](?:ch)?)(?:[^\d]|$)', value='7.1', children=True) diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 3b98b1ec..38d9fa37 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -1390,3 +1390,26 @@ video_codec: H.264 release_group: PRoDJi type: movie + +? Title.2000.720p.BluRay.DDEX.x264-HDClub.mkv +: title: Title + year: 2000 + screen_size: 720p + source: Blu-ray + audio_codec: Dolby Digital + audio_profile: EX + video_codec: H.264 + release_group: HDClub + container: mkv + type: movie + +? Jack Reacher Never Go Back 2016 720p Bluray DD-EX x264-BluPanther +: title: Jack Reacher Never Go Back + year: 2016 + screen_size: 720p + source: Blu-ray + audio_codec: Dolby Digital + audio_profile: EX + video_codec: H.264 + release_group: BluPanther + type: movie diff --git a/guessit/test/rules/audio_codec.yml b/guessit/test/rules/audio_codec.yml index 593b3d0a..7f3c784d 100644 --- a/guessit/test/rules/audio_codec.yml +++ b/guessit/test/rules/audio_codec.yml @@ -110,3 +110,9 @@ ? -ES : audio_codec: DTS audio_profile: Extended Surround + +? DD-EX +? DDEX +? -EX +: audio_codec: Dolby Digital + audio_profile: EX From 9447b9ac9f0f9ef30ee2d41943a51d5c8178cd39 Mon Sep 17 00:00:00 2001 From: Rato Date: Sun, 16 Jul 2017 09:41:37 +0200 Subject: [PATCH 4/5] #471: Detect Opus audio codec --- HISTORY.rst | 1 + docs/properties.rst | 3 ++- guessit/rules/properties/audio_codec.py | 1 + guessit/test/movies.yml | 15 ++++++++++++++- guessit/test/rules/audio_codec.yml | 3 +++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 499b380e..403e1d37 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -92,6 +92,7 @@ History - Added `Ultimate` as new `edition` possible value. - Added `Extended Surround` as new `audio_profile` possible value. - Added `EX` as new `audio_profile` possible value +- Added `Opus` as new `audio_codec` possible value 2.1.4 (2017-06-01) ------------------ diff --git a/docs/properties.rst b/docs/properties.rst index 97646178..a3e39f0d 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -189,7 +189,8 @@ Audio properties Codec used for audio. - - ``AAC``, ``Dolby Atmos``, ``Dolby Digital``, ``Dolby Digital Plus``, ``Dolby TrueHD``, ``DTS``, ``FLAC``, ``MP3`` + - ``AAC``, ``Dolby Atmos``, ``Dolby Digital``, ``Dolby Digital Plus``, ``Dolby TrueHD``, ``DTS``, ``FLAC``, ``MP3``, + ``Opus`` - **audio_profile** diff --git a/guessit/rules/properties/audio_codec.py b/guessit/rules/properties/audio_codec.py index 561d5fbc..990c5be7 100644 --- a/guessit/rules/properties/audio_codec.py +++ b/guessit/rules/properties/audio_codec.py @@ -47,6 +47,7 @@ def audio_codec_priority(match1, match2): rebulk.string("DTS", value="DTS") rebulk.regex('DTS-?HD', value='DTS-HD') rebulk.regex('True-?HD', value='Dolby TrueHD') + rebulk.string('Opus', value='Opus') rebulk.defaults(name='audio_profile') rebulk.string('MA', value='Master Audio', tags='DTS-HD') diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 38d9fa37..b38fa143 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -1274,7 +1274,7 @@ screen_size: 1080p color_depth: 12-bit video_codec: H.265 - # audio_codec: Opus + audio_codec: Opus audio_channels: '5.1' release_group: Hn1Dr2 container: mkv @@ -1413,3 +1413,16 @@ video_codec: H.264 release_group: BluPanther type: movie + +? How To Steal A Dog.2014.BluRay.1080p.12bit.HEVC.OPUS 5.1-Hn1Dr2.mkv +: title: How To Steal A Dog + year: 2014 + source: Blu-ray + screen_size: 1080p + color_depth: 12-bit + video_codec: H.265 + audio_codec: Opus + audio_channels: '5.1' + release_group: Hn1Dr2 + container: mkv + type: movie diff --git a/guessit/test/rules/audio_codec.yml b/guessit/test/rules/audio_codec.yml index 7f3c784d..90992e69 100644 --- a/guessit/test/rules/audio_codec.yml +++ b/guessit/test/rules/audio_codec.yml @@ -116,3 +116,6 @@ ? -EX : audio_codec: Dolby Digital audio_profile: EX + +? OPUS +: audio_codec: Opus From 102708e88bb1de1a5e4343947d5bd34f31d895d9 Mon Sep 17 00:00:00 2001 From: Rato Date: Sun, 16 Jul 2017 09:46:31 +0200 Subject: [PATCH 5/5] Fix duplicated values in HISTORY.rst --- HISTORY.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 403e1d37..32ee35db 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -89,7 +89,6 @@ History - Added `Ultimate` as new `edition` possible value. - Added `Fan` as new `edition` possible value. - Added `High Resolution Audio` as new `audio_profile` possible value. -- Added `Ultimate` as new `edition` possible value. - Added `Extended Surround` as new `audio_profile` possible value. - Added `EX` as new `audio_profile` possible value - Added `Opus` as new `audio_codec` possible value