1028520280
This change improves the compression speed for both DXT and ETC encodings.
Explanation:
During the node split iteration, identical computations are performed for all the vectors of the split node. The overall performance can be improved by performing independent computations in separate threads. In order to avoid possible performance overhead, on each iteration the number of threads is selected in such a way so that each thread processes at least 512 vectors.
DXT Testing:
The modified algorithm has been tested on the Kodak test set using 64-bit build with default settings (running on Windows 10, i7-4790, 3.6GHz). All the decompressed test images are identical to the images being compressed and decompressed using original version of Crunch (revision ea9b8d8).
[Compressing Kodak set without mipmaps using DXT1 encoding]
Original: 1582222 bytes / 28.892 sec
Modified: 1468204 bytes / 7.578 sec
Improvement: 7.21% (compression ratio) / 73.77% (compression time)
[Compressing Kodak set with mipmaps using DXT1 encoding]
Original: 2065243 bytes / 36.943 sec
Modified: 1914805 bytes / 9.993 sec
Improvement: 7.28% (compression ratio) / 72.95% (compression time)
ETC Testing:
The modified algorithm has been tested on the Kodak test set using 64-bit build with default settings (running on Windows 10, i7-4790, 3.6GHz). The ETC1 quantization parameters have been selected in such a way, so that ETC1 compression gives approximately the same average Luma PSNR as the corresponding DXT1 compression (which is equal to 34.044 dB for the Kodak test set compressed without mipmaps using DXT1 encoding and default quality settings).
[Compressing Kodak set without mipmaps using ETC1 encoding]
Total size: 1607858 bytes
Total time: 14.753 sec
Average bitrate: 1.363 bpp
Average Luma PSNR: 34.050 dB
441 lines
14 KiB
C++
441 lines
14 KiB
C++
// File: crn_tree_clusterizer.h
|
|
// See Copyright Notice and license at the end of inc/crnlib.h
|
|
#pragma once
|
|
#include "crn_matrix.h"
|
|
#include "crn_threading.h"
|
|
#include <queue>
|
|
|
|
namespace crnlib {
|
|
template <typename VectorType>
|
|
class tree_clusterizer {
|
|
public:
|
|
tree_clusterizer() {}
|
|
|
|
struct VectorInfo {
|
|
uint index;
|
|
uint weight;
|
|
};
|
|
|
|
struct NodeInfo {
|
|
uint m_index;
|
|
float m_variance;
|
|
NodeInfo (uint index, float variance) : m_index(index), m_variance(variance) {}
|
|
bool operator<(const NodeInfo& other) const {
|
|
return m_index < other.m_index ? m_variance < other.m_variance : !(other.m_variance < m_variance);
|
|
}
|
|
};
|
|
|
|
void clear() {
|
|
m_hist.clear();
|
|
m_vectors.clear();
|
|
m_vectorsInfo.clear();
|
|
m_codebook.clear();
|
|
m_nodes.clear();
|
|
m_node_index_map.clear();
|
|
}
|
|
|
|
void add_training_vec(const VectorType& v, uint weight) {
|
|
m_hist.push_back(std::make_pair(v, weight));
|
|
}
|
|
|
|
bool generate_codebook(uint max_size, bool generate_node_index_map = false, task_pool* pTask_pool = 0) {
|
|
if (m_hist.empty())
|
|
return false;
|
|
|
|
double ttsum = 0.0f;
|
|
|
|
m_vectors.reserve(m_hist.size());
|
|
m_vectorsInfo.reserve(m_hist.size());
|
|
|
|
std::sort(m_hist.begin(), m_hist.end());
|
|
for (uint i = 0; i < m_hist.size(); i++) {
|
|
if (!i || m_hist[i].first != m_hist[i - 1].first) {
|
|
VectorInfo vectorInfo;
|
|
vectorInfo.index = m_vectors.size();
|
|
vectorInfo.weight = m_hist[i].second;
|
|
m_vectorsInfo.push_back(vectorInfo);
|
|
m_vectors.push_back(m_hist[i].first);
|
|
} else if (m_vectorsInfo.back().weight > UINT_MAX - m_hist[i].second) {
|
|
m_vectorsInfo.back().weight = UINT_MAX;
|
|
} else {
|
|
m_vectorsInfo.back().weight += m_hist[i].second;
|
|
}
|
|
}
|
|
|
|
m_weightedVectors.resize(m_vectors.size());
|
|
m_weightedDotProducts.resize(m_vectors.size());
|
|
m_vectorsInfoLeft.resize(m_vectors.size());
|
|
m_vectorsInfoRight.resize(m_vectors.size());
|
|
m_vectorComparison.resize(m_vectors.size());
|
|
|
|
vq_node root;
|
|
root.m_begin = 0;
|
|
root.m_end = m_vectorsInfo.size();
|
|
|
|
for (uint i = 0; i < m_vectors.size(); i++) {
|
|
const VectorType& v = m_vectors[i];
|
|
const uint weight = m_vectorsInfo[i].weight;
|
|
m_weightedVectors[i] = v * (float)weight;
|
|
root.m_centroid += m_weightedVectors[i];
|
|
root.m_total_weight += weight;
|
|
m_weightedDotProducts[i] = v.dot(v) * weight;
|
|
ttsum += m_weightedDotProducts[i];
|
|
}
|
|
|
|
root.m_variance = (float)(ttsum - (root.m_centroid.dot(root.m_centroid) / root.m_total_weight));
|
|
|
|
root.m_centroid *= (1.0f / root.m_total_weight);
|
|
|
|
m_nodes.resize(max_size << 1);
|
|
|
|
std::priority_queue<NodeInfo> node_queue;
|
|
uint begin_node = 0, end_node = begin_node, splits = 0;
|
|
|
|
m_nodes[end_node] = root;
|
|
node_queue.push(NodeInfo(end_node, root.m_variance));
|
|
end_node++;
|
|
splits++;
|
|
|
|
while (splits < max_size && split_node(node_queue, end_node, pTask_pool))
|
|
splits++;
|
|
|
|
m_codebook.clear();
|
|
|
|
for (uint i = begin_node; i < end_node; i++) {
|
|
vq_node& node = m_nodes[i];
|
|
if (node.m_left != -1) {
|
|
CRNLIB_ASSERT(node.m_right != -1);
|
|
continue;
|
|
}
|
|
|
|
CRNLIB_ASSERT((node.m_left == -1) && (node.m_right == -1));
|
|
|
|
node.m_codebook_index = m_codebook.size();
|
|
m_codebook.push_back(node.m_centroid);
|
|
|
|
if (generate_node_index_map) {
|
|
for (uint j = node.m_begin; j < node.m_end; j++)
|
|
m_node_index_map.insert(std::make_pair(m_vectors[m_vectorsInfo[j].index], node.m_codebook_index));
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
inline uint get_node_index(const VectorType& v) {
|
|
return m_node_index_map.find(v)->second;
|
|
}
|
|
|
|
inline uint get_codebook_size() const {
|
|
return m_codebook.size();
|
|
}
|
|
|
|
inline const VectorType& get_codebook_entry(uint index) const {
|
|
return m_codebook[index];
|
|
}
|
|
|
|
typedef crnlib::vector<VectorType> vector_vec_type;
|
|
inline const vector_vec_type& get_codebook() const {
|
|
return m_codebook;
|
|
}
|
|
|
|
private:
|
|
|
|
crnlib::vector<std::pair<VectorType, uint> > m_hist;
|
|
crnlib::vector<VectorType> m_vectors;
|
|
crnlib::vector<VectorType> m_weightedVectors;
|
|
crnlib::vector<double> m_weightedDotProducts;
|
|
crnlib::vector<VectorInfo> m_vectorsInfo, m_vectorsInfoLeft, m_vectorsInfoRight;
|
|
crnlib::vector<bool> m_vectorComparison;
|
|
crnlib::hash_map<VectorType, uint> m_node_index_map;
|
|
|
|
struct vq_node {
|
|
vq_node()
|
|
: m_centroid(cClear), m_total_weight(0), m_left(-1), m_right(-1), m_codebook_index(-1), m_unsplittable(false) {}
|
|
|
|
VectorType m_centroid;
|
|
uint64 m_total_weight;
|
|
|
|
float m_variance;
|
|
|
|
uint m_begin;
|
|
uint m_end;
|
|
|
|
int m_left;
|
|
int m_right;
|
|
|
|
int m_codebook_index;
|
|
|
|
bool m_unsplittable;
|
|
};
|
|
|
|
typedef crnlib::vector<vq_node> node_vec_type;
|
|
|
|
node_vec_type m_nodes;
|
|
|
|
vector_vec_type m_codebook;
|
|
|
|
struct distance_comparison_task_params {
|
|
VectorType* left_child;
|
|
VectorType* right_child;
|
|
uint begin;
|
|
uint end;
|
|
uint num_tasks;
|
|
};
|
|
|
|
void distance_comparison_task(uint64 data, void* pData_ptr) {
|
|
distance_comparison_task_params* pParams = (distance_comparison_task_params*)pData_ptr;
|
|
const VectorType& left_child = *pParams->left_child;
|
|
const VectorType& right_child = *pParams->right_child;
|
|
uint begin = pParams->begin + (pParams->end - pParams->begin) * data / pParams->num_tasks;
|
|
uint end = pParams->begin + (pParams->end - pParams->begin) * (data + 1) / pParams->num_tasks;
|
|
for (uint i = begin; i < end; i++) {
|
|
const VectorType& v = m_vectors[m_vectorsInfo[i].index];
|
|
double left_dist2 = left_child.squared_distance(v);
|
|
double right_dist2 = right_child.squared_distance(v);
|
|
m_vectorComparison[i] = left_dist2 < right_dist2;
|
|
}
|
|
}
|
|
|
|
bool split_node(std::priority_queue<NodeInfo>& node_queue, uint& end_node, task_pool* pTask_pool = 0) {
|
|
if (node_queue.empty() || node_queue.top().m_variance <= 0.0f)
|
|
return false;
|
|
|
|
vq_node& parent_node = m_nodes[node_queue.top().m_index];
|
|
|
|
if (parent_node.m_begin + 1 == parent_node.m_end)
|
|
return false;
|
|
|
|
node_queue.pop();
|
|
|
|
uint num_blocks = (parent_node.m_end - parent_node.m_begin) >> 9;
|
|
uint num_tasks = num_blocks > 1 && pTask_pool ? math::minimum(num_blocks, pTask_pool->get_num_threads() + 1) : 1;
|
|
|
|
VectorType furthest(0);
|
|
double furthest_dist = -1.0f;
|
|
|
|
for (uint i = parent_node.m_begin; i < parent_node.m_end; i++) {
|
|
const VectorType& v = m_vectors[m_vectorsInfo[i].index];
|
|
double dist = v.squared_distance(parent_node.m_centroid);
|
|
if (dist > furthest_dist) {
|
|
furthest_dist = dist;
|
|
furthest = v;
|
|
}
|
|
}
|
|
|
|
VectorType opposite;
|
|
double opposite_dist = -1.0f;
|
|
|
|
for (uint i = parent_node.m_begin; i < parent_node.m_end; i++) {
|
|
const VectorType& v = m_vectors[m_vectorsInfo[i].index];
|
|
double dist = v.squared_distance(furthest);
|
|
if (dist > opposite_dist) {
|
|
opposite_dist = dist;
|
|
opposite = v;
|
|
}
|
|
}
|
|
|
|
VectorType left_child((furthest + parent_node.m_centroid) * .5f);
|
|
VectorType right_child((opposite + parent_node.m_centroid) * .5f);
|
|
|
|
if (parent_node.m_begin + 2 < parent_node.m_end) {
|
|
const uint N = VectorType::num_elements;
|
|
|
|
matrix<N, N, float> covar;
|
|
covar.clear();
|
|
|
|
for (uint i = parent_node.m_begin; i < parent_node.m_end; i++) {
|
|
const VectorType& v = m_vectors[m_vectorsInfo[i].index] - parent_node.m_centroid;
|
|
const VectorType w = v * (float)m_vectorsInfo[i].weight;
|
|
for (uint x = 0; x < N; x++) {
|
|
for (uint y = x; y < N; y++)
|
|
covar[x][y] = covar[x][y] + v[x] * w[y];
|
|
}
|
|
}
|
|
|
|
float divider = (float)parent_node.m_total_weight;
|
|
for (uint x = 0; x < N; x++) {
|
|
for (uint y = x; y < N; y++) {
|
|
covar[x][y] /= divider;
|
|
covar[y][x] = covar[x][y];
|
|
}
|
|
}
|
|
|
|
VectorType axis(1.0f);
|
|
// Starting with an estimate of the principle axis should work better, but doesn't in practice?
|
|
//left_child - right_child);
|
|
//axis.normalize();
|
|
|
|
for (uint iter = 0; iter < 10; iter++) {
|
|
VectorType x;
|
|
|
|
double max_sum = 0;
|
|
|
|
for (uint i = 0; i < N; i++) {
|
|
double sum = 0;
|
|
|
|
for (uint j = 0; j < N; j++)
|
|
sum += axis[j] * covar[i][j];
|
|
|
|
x[i] = (float)sum;
|
|
|
|
max_sum = i ? math::maximum(max_sum, sum) : sum;
|
|
}
|
|
|
|
if (max_sum != 0.0f)
|
|
x *= (float)(1.0f / max_sum);
|
|
|
|
axis = x;
|
|
}
|
|
|
|
axis.normalize();
|
|
|
|
VectorType new_left_child(0.0f);
|
|
VectorType new_right_child(0.0f);
|
|
|
|
double left_weight = 0.0f;
|
|
double right_weight = 0.0f;
|
|
|
|
for (uint i = parent_node.m_begin; i < parent_node.m_end; i++) {
|
|
const VectorInfo& vectorInfo = m_vectorsInfo[i];
|
|
const float weight = (float)vectorInfo.weight;
|
|
double t = (m_vectors[vectorInfo.index] - parent_node.m_centroid) * axis;
|
|
if (t < 0.0f) {
|
|
new_left_child += m_weightedVectors[vectorInfo.index];
|
|
left_weight += weight;
|
|
} else {
|
|
new_right_child += m_weightedVectors[vectorInfo.index];
|
|
right_weight += weight;
|
|
}
|
|
}
|
|
|
|
if ((left_weight > 0.0f) && (right_weight > 0.0f)) {
|
|
left_child = new_left_child * (float)(1.0f / left_weight);
|
|
right_child = new_right_child * (float)(1.0f / right_weight);
|
|
}
|
|
}
|
|
|
|
uint64 left_weight = 0;
|
|
uint64 right_weight = 0;
|
|
|
|
uint left_info_index = 0;
|
|
uint right_info_index = 0;
|
|
|
|
float prev_total_variance = 1e+10f;
|
|
|
|
float left_variance = 0.0f;
|
|
float right_variance = 0.0f;
|
|
|
|
// FIXME: Excessive upper limit
|
|
const uint cMaxLoops = 1024;
|
|
for (uint total_loops = 0; total_loops < cMaxLoops; total_loops++) {
|
|
left_info_index = right_info_index = parent_node.m_begin;
|
|
|
|
VectorType new_left_child(cClear);
|
|
VectorType new_right_child(cClear);
|
|
|
|
double left_ttsum = 0.0f;
|
|
double right_ttsum = 0.0f;
|
|
|
|
left_weight = 0;
|
|
right_weight = 0;
|
|
|
|
if (num_tasks > 1) {
|
|
distance_comparison_task_params params;
|
|
params.left_child = &left_child;
|
|
params.right_child = &right_child;
|
|
params.begin = parent_node.m_begin;
|
|
params.end = parent_node.m_end;
|
|
params.num_tasks = num_tasks;
|
|
|
|
for (uint task = 0; task < params.num_tasks; task++)
|
|
pTask_pool->queue_object_task(this, &tree_clusterizer::distance_comparison_task, task, ¶ms);
|
|
pTask_pool->join();
|
|
|
|
for (uint i = parent_node.m_begin; i < parent_node.m_end; i++) {
|
|
const VectorInfo& vectorInfo = m_vectorsInfo[i];
|
|
if (m_vectorComparison[i]) {
|
|
new_left_child += m_weightedVectors[vectorInfo.index];
|
|
left_ttsum += m_weightedDotProducts[vectorInfo.index];
|
|
left_weight += vectorInfo.weight;
|
|
m_vectorsInfoLeft[left_info_index++] = vectorInfo;
|
|
} else {
|
|
new_right_child += m_weightedVectors[vectorInfo.index];
|
|
right_ttsum += m_weightedDotProducts[vectorInfo.index];
|
|
right_weight += vectorInfo.weight;
|
|
m_vectorsInfoRight[right_info_index++] = vectorInfo;
|
|
}
|
|
}
|
|
} else {
|
|
for (uint i = parent_node.m_begin; i < parent_node.m_end; i++) {
|
|
const VectorInfo& vectorInfo = m_vectorsInfo[i];
|
|
double left_dist2 = left_child.squared_distance(m_vectors[vectorInfo.index]);
|
|
double right_dist2 = right_child.squared_distance(m_vectors[vectorInfo.index]);
|
|
if (left_dist2 < right_dist2) {
|
|
new_left_child += m_weightedVectors[vectorInfo.index];
|
|
left_ttsum += m_weightedDotProducts[vectorInfo.index];
|
|
left_weight += vectorInfo.weight;
|
|
m_vectorsInfoLeft[left_info_index++] = vectorInfo;
|
|
} else {
|
|
new_right_child += m_weightedVectors[vectorInfo.index];
|
|
right_ttsum += m_weightedDotProducts[vectorInfo.index];
|
|
right_weight += vectorInfo.weight;
|
|
m_vectorsInfoRight[right_info_index++] = vectorInfo;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ((!left_weight) || (!right_weight)) {
|
|
parent_node.m_unsplittable = true;
|
|
return true;
|
|
}
|
|
|
|
left_variance = (float)(left_ttsum - (new_left_child.dot(new_left_child) / left_weight));
|
|
right_variance = (float)(right_ttsum - (new_right_child.dot(new_right_child) / right_weight));
|
|
|
|
new_left_child *= (1.0f / left_weight);
|
|
new_right_child *= (1.0f / right_weight);
|
|
|
|
left_child = new_left_child;
|
|
right_child = new_right_child;
|
|
|
|
float total_variance = left_variance + right_variance;
|
|
if (total_variance < .00001f)
|
|
break;
|
|
|
|
if (((prev_total_variance - total_variance) / total_variance) < .00001f)
|
|
break;
|
|
|
|
prev_total_variance = total_variance;
|
|
}
|
|
|
|
parent_node.m_left = end_node++;
|
|
parent_node.m_right = end_node++;
|
|
|
|
node_queue.push(NodeInfo(parent_node.m_left, left_variance));
|
|
node_queue.push(NodeInfo(parent_node.m_right, right_variance));
|
|
|
|
vq_node& left_child_node = m_nodes[parent_node.m_left];
|
|
vq_node& right_child_node = m_nodes[parent_node.m_right];
|
|
|
|
left_child_node.m_begin = parent_node.m_begin;
|
|
left_child_node.m_end = right_child_node.m_begin = left_info_index;
|
|
right_child_node.m_end = parent_node.m_end;
|
|
|
|
memcpy(&m_vectorsInfo[left_child_node.m_begin], &m_vectorsInfoLeft[parent_node.m_begin], (left_child_node.m_end - left_child_node.m_begin) * sizeof(VectorInfo));
|
|
memcpy(&m_vectorsInfo[right_child_node.m_begin], &m_vectorsInfoRight[parent_node.m_begin], (right_child_node.m_end - right_child_node.m_begin) * sizeof(VectorInfo));
|
|
|
|
left_child_node.m_centroid = left_child;
|
|
left_child_node.m_total_weight = left_weight;
|
|
left_child_node.m_variance = left_variance;
|
|
|
|
right_child_node.m_centroid = right_child;
|
|
right_child_node.m_total_weight = right_weight;
|
|
right_child_node.m_variance = right_variance;
|
|
|
|
return true;
|
|
}
|
|
};
|
|
|
|
} // namespace crnlib
|