generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove bin_map[] allocation altogether

Browse Source 
... and just re-use histogram_symbols[] instead!
It's guaranteed to work.

Change-Id: Ie3b0cd5781171ded20058e8bc143fce2f69b4c68
This commit is contained in:
Pascal Massimino 2016-06-20 11:19:25 +02:00
parent a977b4b513
commit 472a049b4e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/enc/histogram.c
View File

@ -881,11 +881,10 @@ int VP8LGetHistoImageSymbols(int xsize, int ysize,
cur_combo = tmp_histos->histograms[1]; // pick up working slot
if (entropy_combine) {
const int bin_map_size = orig_histo->size;
// reuse histogram_symbols storage. By definition, it's guaranteed to be ok.
uint16_t* const bin_map = histogram_symbols;
const double combine_cost_factor =
GetCombineCostFactor(image_histo_raw_size, quality);
uint16_t* const bin_map =
(uint16_t*)WebPSafeCalloc(bin_map_size, sizeof(*bin_map));
if (bin_map == NULL) goto Error;
HistogramAnalyzeEntropyBin(orig_histo, bin_map, low_effort);
// Collapse histograms with similar entropy.
@ -893,7 +892,6 @@ int VP8LGetHistoImageSymbols(int xsize, int ysize,
bin_map, bin_map_size,
entropy_combine_num_bins,
combine_cost_factor, low_effort);
WebPSafeFree(bin_map);
}
// Don't combine the histograms using stochastic and greedy heuristics for