Skip to content

Commit

Permalink
Remove Dolby Digital Plus support
Browse files Browse the repository at this point in the history
Unfortunately Netflix keeps breaking Dolby Digital Plus and I don't have time to fix it. PRs welcome.
  • Loading branch information
shirt-dev committed Nov 5, 2023
1 parent 79ca463 commit aacc5fc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 43 deletions.
40 changes: 5 additions & 35 deletions cadmium-playercore-shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,27 +100,11 @@ function get_profile_list(original_profiles) {
profiles = profiles.filter(val => !val.includes("av1-"));
}

if (globalOptions.useDDPlus && MediaSource.isTypeSupported('audio/mp4; codecs="ec-3"')) {
// Dolby Digital
profiles = profiles.concat([
"ddplus-2.0-dash",
]);

if (globalOptions.use6Channels) {
profiles = profiles.concat([
"ddplus-5.1-dash",
"ddplus-5.1hq-dash",
"ddplus-atmos-dash",
]);
}
} else {
// No Dolby Digital
if (globalOptions.use6Channels) {
profiles = profiles.concat([
"heaac-5.1-dash",
]);
}
}
if (globalOptions.use6Channels) {
profiles = profiles.concat([
"heaac-5.1-dash",
]);
}

profiles = [...new Set(profiles)].sort();
return profiles;
Expand Down Expand Up @@ -169,19 +153,5 @@ do_patch(
"preferredTextLocale: globalOptions.preferredTextLocale"
);

if(globalOptions.useDDPlus && MediaSource.isTypeSupported('audio/mp4; codecs="ec-3"')) {
do_patch(
"Select highest audio bitrate 1",
/(indexOf\(.\))(\?[^?]+)(\?[0-9]:)/,
"$1)$3"
);

do_patch(
"Select highest audio bitrate 2",
/(var\sx;if\(this\.[^\)]+)/,
"$1 && !globalOptions.useDDPlus"
);
}

// run our patched copy of playercore in a non-privileged context on the page
window.Function(cadmium_src)();
2 changes: 0 additions & 2 deletions pages/options.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
<br>
<input type="checkbox" id="disableHPL"><label for="disableHPL">Disable H264 HPL profile</label>
<br>
<input type="checkbox" id="useDDPlus"><label for="useDDPlus">Use Dolby Digital Plus (Edge)</label>
<br>
<label for="preferredLocale">Preferred audio language</label>
<input list="locales" id="preferredLocale" maxlength="5">
<br>
Expand Down
6 changes: 0 additions & 6 deletions pages/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ function save_options() {
const disableVP9 = document.getElementById("disableVP9").checked;
const disableAV1 = document.getElementById("disableAV1").checked;
const disableHPL = document.getElementById("disableHPL").checked;
const useDDPlus = document.getElementById("useDDPlus").checked;
const preferredLocale = document.getElementById("preferredLocale").value;
const preferredTextLocale = document.getElementById("preferredTextLocale").value;

Expand All @@ -17,7 +16,6 @@ function save_options() {
disableVP9: disableVP9,
disableAV1: disableAV1,
disableHPL: disableHPL,
useDDPlus: useDDPlus,
preferredLocale: preferredLocale,
preferredTextLocale: preferredTextLocale,
}, function() {
Expand All @@ -36,7 +34,6 @@ function reset_options() {
document.getElementById("disableVP9").checked = false;
document.getElementById("disableAV1").checked = true;
document.getElementById("disableHPL").checked = false;
document.getElementById("useDDPlus").checked = false;
document.getElementById("preferredLocale").value = null;
document.getElementById("preferredTextLocale").value = null;

Expand All @@ -47,7 +44,6 @@ function reset_options() {
disableVP9: false,
disableAV1: true,
disableHPL: false,
useDDPlus: false,
preferredLocale: null,
preferredTextLocale: null,
}, function() {
Expand All @@ -67,7 +63,6 @@ function restore_options() {
disableVP9: false,
disableAV1: true,
disableHPL: false,
useDDPlus: false,
preferredLocale: null,
preferredTextLocale: null,
}, function(items) {
Expand All @@ -77,7 +72,6 @@ function restore_options() {
document.getElementById("disableVP9").checked = items.disableVP9;
document.getElementById("disableAV1").checked = items.disableAV1;
document.getElementById("disableHPL").checked = items.disableHPL;
document.getElementById("useDDPlus").checked = items.useDDPlus;
document.getElementById("preferredLocale").value = items.preferredLocale;
document.getElementById("preferredTextLocale").value = items.preferredTextLocale;
});
Expand Down

1 comment on commit aacc5fc

@Squall-Leonhart
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DD+ is fixed in the 4k-ddplus fork.

Please sign in to comment.