Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(video): Adds ability to enable & retrieve HEVC profiles #174

Merged
merged 5 commits into from
Oct 10, 2017
Merged

feat(video): Adds ability to enable & retrieve HEVC profiles #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cb4814
feat(video): Adds abikity to enable & retrieve HEVC profiles
asciidisco Oct 10, 2017
7082521
fix(msl): Remove left over char
asciidisco Oct 10, 2017
eac45b5
fix(msl): Fixes code formatting issues
asciidisco Oct 10, 2017
6575467
chore(readme): Adds note about 4k videos & HEVC profiles to the readme
asciidisco Oct 10, 2017
7b24ee8
Merge branch 'master' into feat/enable-hevc-for-android
asciidisco Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ FAQ
- [Does it work with Kodi 17](https:/asciidisco/plugin.video.netflix/issues/25)
- [Does it work on a RPI](https:/asciidisco/plugin.video.netflix/issues/28)
- [Which video resolutions are supported](https:/asciidisco/plugin.video.netflix/issues/27)
- [Can it play 4k Videos](https:/asciidisco/plugin.video.netflix/issues/86)

Functionality
-------------
Expand Down
4 changes: 4 additions & 0 deletions resources/language/English/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,8 @@ msgstr ""

msgctxt "#30059"
msgid "Switch accounts"
msgstr ""

msgctxt "#30060"
msgid "Enable HEVC profiles (f.e. 4k for Android)"
msgstr ""
6 changes: 5 additions & 1 deletion resources/language/German/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,8 @@ msgstr "Automatische Anmeldung aktiviert!"

msgctxt "#30059"
msgid "Switch accounts"
msgstr "Accounts wechseln"
msgstr "Accounts wechseln"

msgctxt "#30060"
msgid "Enable HEVC profiles (f.e. 4k for Android)"
msgstr "Aktiviere HEVC profile (z.b. für 4k in Android)"
19 changes: 17 additions & 2 deletions resources/lib/KodiHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,24 @@ def delete_manifest_data(self):
def get_dolby_setting(self):
"""
Returns if the dolby sound is enabled
:return: True|False
:return: bool - Dolby Sourrind profile setting is enabled
"""
return self.get_addon().getSetting('enable_dolby_sound') == 'true'
use_dolby = False
setting = self.get_addon().getSetting('enable_dolby_sound')
if setting == 'true' or setting == 'True':
use_dolby = True
return use_dolby

def use_hevc(self):
"""
Checks if HEVC profiles should be used
:return: bool - HEVC profile setting is enabled
"""
use_hevc = False
setting = self.get_addon().getSetting('enable_hevc_profiles')
if setting == 'true' or setting == 'True':
use_hevc = True
return use_hevc

def get_custom_library_settings (self):
"""Returns the settings in regards to the custom library folder(s)
Expand Down
112 changes: 55 additions & 57 deletions resources/lib/MSL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,67 +96,11 @@ def load_manifest(self, viewable_id):
'lookupType': 'PREPARE',
'viewableIds': [viewable_id],
'profiles': [
# Video
"playready-h264bpl30-dash",
"playready-h264mpl30-dash",
"playready-h264mpl31-dash",
"playready-h264mpl40-dash",
# "hevc-main-L30-dash-cenc",
# "hevc-main-L31-dash-cenc",
# "hevc-main-L40-dash-cenc",
# "hevc-main-L41-dash-cenc",
# "hevc-main-L50-dash-cenc",
# "hevc-main-L51-dash-cenc",
# "hevc-main10-L30-dash-cenc",
# "hevc-main10-L31-dash-cenc",
# "hevc-main10-L40-dash-cenc",
# "hevc-main10-L41-dash-cenc",
# "hevc-main10-L50-dash-cenc",
# "hevc-main10-L51-dash-cenc",
# "hevc-main10-L30-dash-cenc-prk",
# "hevc-main10-L31-dash-cenc-prk",
# "hevc-main10-L40-dash-cenc-prk",
# "hevc-main10-L41-dash-cenc-prk",
# "hevc-main-L30-L31-dash-cenc-tl",
# "hevc-main-L31-L40-dash-cenc-tl",
# "hevc-main-L40-L41-dash-cenc-tl",
# "hevc-main-L50-L51-dash-cenc-tl",
# "hevc-main10-L30-L31-dash-cenc-tl",
# "hevc-main10-L31-L40-dash-cenc-tl",
# "hevc-main10-L40-L41-dash-cenc-tl",
# "hevc-main10-L50-L51-dash-cenc-tl",
# "hevc-dv-main10-L30-dash-cenc",
# "hevc-dv-main10-L31-dash-cenc",
# "hevc-dv-main10-L40-dash-cenc",
# "hevc-dv-main10-L41-dash-cenc",
# "hevc-dv-main10-L50-dash-cenc",
# "hevc-dv-main10-L51-dash-cenc",
# "hevc-dv5-main10-L30-dash-cenc-prk",
# "hevc-dv5-main10-L31-dash-cenc-prk",
# "hevc-dv5-main10-L40-dash-cenc-prk",
# "hevc-dv5-main10-L41-dash-cenc-prk",
# "hevc-dv5-main10-L50-dash-cenc-prk",
# "hevc-dv5-main10-L51-dash-cenc-prk",
# "hevc-hdr-main10-L30-dash-cenc",
# "hevc-hdr-main10-L31-dash-cenc",
# "hevc-hdr-main10-L40-dash-cenc",
# "hevc-hdr-main10-L41-dash-cenc",
# "hevc-hdr-main10-L50-dash-cenc",
# "hevc-hdr-main10-L51-dash-cenc",
# "hevc-hdr-main10-L30-dash-cenc-prk",
# "hevc-hdr-main10-L31-dash-cenc-prk",
# "hevc-hdr-main10-L40-dash-cenc-prk",
# "hevc-hdr-main10-L41-dash-cenc-prk",
# "hevc-hdr-main10-L50-dash-cenc-prk",
# "hevc-hdr-main10-L51-dash-cenc-prk"

# 'playready-h264mpl30-dash',
#'playready-h264mpl31-dash',
#'playready-h264mpl40-dash',
#'hevc-main10-L41-dash-cenc',
#'hevc-main10-L50-dash-cenc',
#'hevc-main10-L51-dash-cenc',



# Audio
'heaac-2-dash',
Expand Down Expand Up @@ -186,6 +130,60 @@ def load_manifest(self, viewable_id):
'clientVersion': '4.0004.899.011',
'uiVersion': 'akira'
}

# add hevc profiles if setting is set
if self.kodi_helper.use_hevc() is True:
manifest_request_data['profiles'].append('hevc-main10-L41-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L50-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L51-dash-cenc')
manifest_request_data['profiles'].append('hevc-main-L30-dash-cenc')
manifest_request_data['profiles'].append('hevc-main-L31-dash-cenc')
manifest_request_data['profiles'].append('hevc-main-L40-dash-cenc')
manifest_request_data['profiles'].append('hevc-main-L41-dash-cenc')
manifest_request_data['profiles'].append('hevc-main-L50-dash-cenc')
manifest_request_data['profiles'].append('hevc-main-L51-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L30-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L31-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L40-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L41-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L50-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L51-dash-cenc')
manifest_request_data['profiles'].append('hevc-main10-L30-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-main10-L31-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-main10-L40-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-main10-L41-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-main-L30-L31-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-main-L31-L40-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-main-L40-L41-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-main-L50-L51-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-main10-L30-L31-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-main10-L31-L40-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-main10-L40-L41-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-main10-L50-L51-dash-cenc-tl')
manifest_request_data['profiles'].append('hevc-dv-main10-L30-dash-cenc')
manifest_request_data['profiles'].append('hevc-dv-main10-L31-dash-cenc')
manifest_request_data['profiles'].append('hevc-dv-main10-L40-dash-cenc')
manifest_request_data['profiles'].append('hevc-dv-main10-L41-dash-cenc')
manifest_request_data['profiles'].append('hevc-dv-main10-L50-dash-cenc')
manifest_request_data['profiles'].append('hevc-dv-main10-L51-dash-cenc')
manifest_request_data['profiles'].append('hevc-dv5-main10-L30-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-dv5-main10-L31-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-dv5-main10-L40-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-dv5-main10-L41-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-dv5-main10-L50-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-dv5-main10-L51-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-hdr-main10-L30-dash-cenc')
manifest_request_data['profiles'].append('hevc-hdr-main10-L31-dash-cenc')
manifest_request_data['profiles'].append('hevc-hdr-main10-L40-dash-cenc')
manifest_request_data['profiles'].append('hevc-hdr-main10-L41-dash-cenc')
manifest_request_data['profiles'].append('hevc-hdr-main10-L50-dash-cenc')
manifest_request_data['profiles'].append('hevc-hdr-main10-L51-dash-cenc')
manifest_request_data['profiles'].append('hevc-hdr-main10-L30-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-hdr-main10-L31-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-hdr-main10-L40-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-hdr-main10-L41-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-hdr-main10-L50-dash-cenc-prk')
manifest_request_data['profiles'].append('hevc-hdr-main10-L51-dash-cenc-prk')

# Check if dolby sound is enabled and add to profles
if self.kodi_helper.get_dolby_setting():
Expand Down
1 change: 1 addition & 0 deletions resources/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</category>
<category label="30023">
<setting id="enable_dolby_sound" type="bool" label="30033" default="true"/>
<setting id="enable_hevc_profiles" type="bool" label="30060" default="false"/>
<setting id="ssl_verification" type="bool" label="30024" default="true"/>
<setting id="enable_tracking" type="bool" label="30032" default="true"/>
<setting id="esn" type="text" label="30034" value="" default=""/>
Expand Down