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

[Fix 300] Make sure either quality level or endpoint and selector clusters are set #301

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Fix 300] Make sure either quality level or endpoint and selector clusters are set #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions encoder/basisu_comp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,11 +1039,24 @@ namespace basisu
debug_printf("Unique endpoints: %u, unique selectors: %u\n", total_unique_endpoints, total_unique_selectors);
}
#endif

const double total_texels = m_total_blocks * 16.0f;

int endpoint_clusters = m_params.m_max_endpoint_clusters;
int selector_clusters = m_params.m_max_selector_clusters;
int quality_level = m_params.m_quality_level;

if (quality_level != -1)
{
endpoint_clusters = 0;
selector_clusters = 0;
}
else if ((!endpoint_clusters) || (!selector_clusters))
{
endpoint_clusters = 0;
selector_clusters = 0;

quality_level = 128;
}

if (endpoint_clusters > basisu_frontend::cMaxEndpointClusters)
{
Expand All @@ -1056,9 +1069,9 @@ namespace basisu
return false;
}

if (m_params.m_quality_level != -1)
if (quality_level != -1)
{
const float quality = saturate(m_params.m_quality_level / 255.0f);
const float quality = saturate(quality_level / 255.0f);

const float bits_per_endpoint_cluster = 14.0f;
const float max_desired_endpoint_cluster_bits_per_texel = 1.0f; // .15f
Expand Down Expand Up @@ -1114,7 +1127,7 @@ namespace basisu

debug_printf("Max endpoints: %u, max selectors: %u\n", endpoint_clusters, selector_clusters);

if (m_params.m_quality_level >= 223)
if (quality_level >= 223)
{
if (!m_params.m_selector_rdo_thresh.was_changed())
{
Expand All @@ -1125,23 +1138,23 @@ namespace basisu
m_params.m_selector_rdo_thresh *= .25f;
}
}
else if (m_params.m_quality_level >= 192)
else if (quality_level >= 192)
{
if (!m_params.m_endpoint_rdo_thresh.was_changed())
m_params.m_endpoint_rdo_thresh *= .5f;

if (!m_params.m_selector_rdo_thresh.was_changed())
m_params.m_selector_rdo_thresh *= .5f;
}
else if (m_params.m_quality_level >= 160)
else if (quality_level >= 160)
{
if (!m_params.m_endpoint_rdo_thresh.was_changed())
m_params.m_endpoint_rdo_thresh *= .75f;

if (!m_params.m_selector_rdo_thresh.was_changed())
m_params.m_selector_rdo_thresh *= .75f;
}
else if (m_params.m_quality_level >= 129)
else if (quality_level >= 129)
{
float l = (quality - 129 / 255.0f) / ((160 - 129) / 255.0f);

Expand Down