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

fix: suboptimal layout for RS03 w/o defect management (#79) #80

Merged
merged 2 commits into from
Jan 18, 2024
Merged

fix: suboptimal layout for RS03 w/o defect management (#79) #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc6f573
fix: suboptimal layout for RS03 w/o defect management (#79)
speed47 Nov 21, 2023
c454144
Update src/rs03-common.c
speed47 Jan 18, 2024
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
34 changes: 15 additions & 19 deletions src/rs03-common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,34 +533,30 @@ RS03Layout *CalcRS03Layout(Image *image, int target)
lay->mediumCapacity = DVD_SL_SIZE; /* Single layered DVD */
else if(get_roots(dataSectors, DVD_DL_SIZE) >= 8)
lay->mediumCapacity = DVD_DL_SIZE; /* Double layered DVD */
else if(get_roots(dataSectors, BD_SL_SIZE) >= 8) {
/* Single layered BD */
if (Closure->noBdrDefectManagement)
lay->mediumCapacity = BD_SL_SIZE_NODM;
else
lay->mediumCapacity = BD_SL_SIZE;
}
else if(get_roots(dataSectors, BD_DL_SIZE) >= 8) {
/* Single layered BD w/o defect management, test it before the
version w/ DM, even if it's larger in size, because if the
user chose to disable DM, that's what they want over the w/ DM
version anyway. This also applies to 2, 3 and 4 layered BDs:
*/
else if(Closure->noBdrDefectManagement && get_roots(dataSectors, BD_SL_SIZE_NODM) >= 8)
lay->mediumCapacity = BD_SL_SIZE_NODM;
else if(get_roots(dataSectors, BD_SL_SIZE) >= 8)
lay->mediumCapacity = BD_SL_SIZE;
/* Double layered BD */
if (Closure->noBdrDefectManagement)
else if(Closure->noBdrDefectManagement && get_roots(dataSectors, BD_DL_SIZE_NODM) >= 8)
lay->mediumCapacity = BD_DL_SIZE_NODM;
else
else if(get_roots(dataSectors, BD_DL_SIZE) >= 8)
lay->mediumCapacity = BD_DL_SIZE;
}
else if(get_roots(dataSectors, BDXL_TL_SIZE) >= 8) {
/* Triple layered BDXL */
if (Closure->noBdrDefectManagement)
else if(Closure->noBdrDefectManagement && get_roots(dataSectors, BDXL_TL_SIZE_NODM) >= 8)
lay->mediumCapacity = BDXL_TL_SIZE_NODM;
else
else if(get_roots(dataSectors, BDXL_TL_SIZE) >= 8)
lay->mediumCapacity = BDXL_TL_SIZE;
}
else {
/* Quadruple layered BDXL */
if (Closure->noBdrDefectManagement)
else if(Closure->noBdrDefectManagement)
lay->mediumCapacity = BDXL_QL_SIZE_NODM;
else
else
lay->mediumCapacity = BDXL_QL_SIZE;
}
}
}

Expand Down