Remove dead code from av1_dering_search.
Change-Id: I893914d4678372970680b514843da87a75c14889
This commit is contained in:
Родитель
337b23a590
Коммит
03394bd8c4
|
@ -48,7 +48,6 @@ int av1_dering_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref,
|
|||
int dec[3];
|
||||
int pli;
|
||||
int (*mse)[MAX_DERING_LEVEL];
|
||||
int best_count[MAX_DERING_LEVEL] = {0};
|
||||
double tot_mse[MAX_DERING_LEVEL] = {0};
|
||||
int level;
|
||||
int best_level;
|
||||
|
@ -95,13 +94,12 @@ int av1_dering_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref,
|
|||
mse = aom_malloc(nvsb*nhsb*sizeof(*mse));
|
||||
for (sbr = 0; sbr < nvsb; sbr++) {
|
||||
for (sbc = 0; sbc < nhsb; sbc++) {
|
||||
int best_mse = 1000000000;
|
||||
int nvb, nhb;
|
||||
int16_t dst[MI_BLOCK_SIZE*MI_BLOCK_SIZE*8*8];
|
||||
best_level = 0;
|
||||
nhb = AOMMIN(MI_BLOCK_SIZE, cm->mi_cols - MI_BLOCK_SIZE*sbc);
|
||||
nvb = AOMMIN(MI_BLOCK_SIZE, cm->mi_rows - MI_BLOCK_SIZE*sbr);
|
||||
for (level = 0; level < 64; level++) {
|
||||
int cur_mse;
|
||||
int threshold;
|
||||
threshold = level << coeff_shift;
|
||||
od_dering(
|
||||
|
@ -113,19 +111,15 @@ int av1_dering_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref,
|
|||
cm->mi_cols*bsize[0], nhb, nvb, sbc, sbr, nhsb, nvsb, 0, dir, 0,
|
||||
&bskip[MI_BLOCK_SIZE*sbr*cm->mi_cols + MI_BLOCK_SIZE*sbc],
|
||||
cm->mi_cols, threshold, OD_DERING_NO_CHECK_OVERLAP, coeff_shift);
|
||||
mse[nhsb*sbr+sbc][level] = compute_dist(
|
||||
cur_mse = compute_dist(
|
||||
dst, MI_BLOCK_SIZE*bsize[0],
|
||||
&ref_coeff[sbr*stride*bsize[0]*MI_BLOCK_SIZE +
|
||||
sbc*bsize[0]*MI_BLOCK_SIZE],
|
||||
stride, nhb, nvb, coeff_shift);
|
||||
tot_mse[level] += mse[nhsb*sbr+sbc][level];
|
||||
if (mse[nhsb*sbr+sbc][level] < best_mse) {
|
||||
best_mse = mse[nhsb*sbr+sbc][level];
|
||||
best_level = level;
|
||||
mse[nhsb*sbr+sbc][level] = cur_mse;
|
||||
tot_mse[level] += cur_mse;
|
||||
}
|
||||
}
|
||||
best_count[best_level]++;
|
||||
}
|
||||
}
|
||||
#if DERING_REFINEMENT
|
||||
best_level = 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче