Commit 33ecd6ad authored by Paul Wilkins's avatar Paul Wilkins

Merge Scatter Scan experiment.

Removal from under configure flag.
A bit  renaming

Change-Id: I2213229dfe852001dfec16b149f47c52ce88f3aa
parent 7ac5ac52
......@@ -241,7 +241,6 @@ EXPERIMENT_LIST="
csm
implicit_segmentation
loop_dering
scatterscan
oneshotq
multiple_arf
non420
......
This diff is collapsed.
......@@ -100,22 +100,22 @@ typedef vp9_prob vp9_coeff_probs[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
struct VP9Common;
void vp9_default_coef_probs(struct VP9Common *);
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_4x4[16]);
extern DECLARE_ALIGNED(16, const int, vp9_default_scan_4x4[16]);
extern DECLARE_ALIGNED(16, const int, vp9_col_scan_4x4[16]);
extern DECLARE_ALIGNED(16, const int, vp9_row_scan_4x4[16]);
extern DECLARE_ALIGNED(64, const int, vp9_default_zig_zag1d_8x8[64]);
extern DECLARE_ALIGNED(64, const int, vp9_default_scan_8x8[64]);
extern DECLARE_ALIGNED(16, const int, vp9_col_scan_8x8[64]);
extern DECLARE_ALIGNED(16, const int, vp9_row_scan_8x8[64]);
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_16x16[256]);
extern DECLARE_ALIGNED(16, const int, vp9_default_scan_16x16[256]);
extern DECLARE_ALIGNED(16, const int, vp9_col_scan_16x16[256]);
extern DECLARE_ALIGNED(16, const int, vp9_row_scan_16x16[256]);
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_32x32[1024]);
extern DECLARE_ALIGNED(16, const int, vp9_default_scan_32x32[1024]);
void vp9_coef_tree_initialize(void);
void vp9_adapt_coef_probs(struct VP9Common *);
......@@ -193,7 +193,7 @@ static INLINE const int* get_scan_4x4(TX_TYPE tx_type) {
case DCT_ADST:
return vp9_col_scan_4x4;
default:
return vp9_default_zig_zag1d_4x4;
return vp9_default_scan_4x4;
}
}
......@@ -204,7 +204,7 @@ static INLINE const int* get_scan_8x8(TX_TYPE tx_type) {
case DCT_ADST:
return vp9_col_scan_8x8;
default:
return vp9_default_zig_zag1d_8x8;
return vp9_default_scan_8x8;
}
}
......@@ -215,7 +215,7 @@ static INLINE const int* get_scan_16x16(TX_TYPE tx_type) {
case DCT_ADST:
return vp9_col_scan_16x16;
default:
return vp9_default_zig_zag1d_16x16;
return vp9_default_scan_16x16;
}
}
......
......@@ -159,7 +159,7 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd,
break;
}
case TX_32X32:
scan = vp9_default_zig_zag1d_32x32;
scan = vp9_default_scan_32x32;
coef_probs = fc->coef_probs_32x32[type][ref];
coef_counts = fc->coef_counts_32x32;
above_ec = (A[0] + A[1] + A[2] + A[3] + A[4] + A[5] + A[6] + A[7]) != 0;
......
......@@ -174,14 +174,6 @@ void vp9_idct_add_8x8_c(int16_t *input, uint8_t *dest, int stride, int eob) {
input[0] = 0;
vp9_add_constant_residual_8x8(out, dest, stride);
#if !CONFIG_SCATTERSCAN
} else if (eob <= 10) {
vp9_short_idct10_8x8_add(input, dest, stride);
input[0] = input[1] = input[2] = input[3] = 0;
input[8] = input[9] = input[10] = 0;
input[16] = input[17] = 0;
input[24] = 0;
#endif
} else {
vp9_short_idct8x8_add(input, dest, stride);
vpx_memset(input, 0, 128);
......@@ -215,14 +207,6 @@ void vp9_idct_add_16x16_c(int16_t *input, uint8_t *dest, int stride, int eob) {
input[0] = 0;
vp9_add_constant_residual_16x16(out, dest, stride);
#if !CONFIG_SCATTERSCAN
} else if (eob <= 10) {
vp9_short_idct10_16x16_add(input, dest, stride);
input[0] = input[1] = input[2] = input[3] = 0;
input[16] = input[17] = input[18] = 0;
input[32] = input[33] = 0;
input[48] = 0;
#endif
} else {
vp9_short_idct16x16_add(input, dest, stride);
vpx_memset(input, 0, 512);
......@@ -238,15 +222,6 @@ void vp9_idct_add_32x32_c(int16_t *input, uint8_t *dest, int stride, int eob) {
vp9_short_idct1_32x32(input, output);
vp9_add_constant_residual_32x32(output[0], dest, stride);
input[0] = 0;
#if !CONFIG_SCATTERSCAN
} else if (eob <= 10) {
vp9_short_idct10_32x32_add_c(input, dest, stride);
input[0] = input[1] = input[2] = input[3] = 0;
input[32] = input[33] = input[34] = 0;
input[64] = input[65] = 0;
input[96] = 0;
#endif
} else {
vp9_short_idct32x32_add(input, dest, stride);
vpx_memset(input, 0, 2048);
......
......@@ -167,7 +167,7 @@ static void optimize_b(VP9_COMMON *const cm, MACROBLOCK *mb,
break;
}
case TX_32X32:
scan = vp9_default_zig_zag1d_32x32;
scan = vp9_default_scan_32x32;
default_eob = 1024;
band_translate = vp9_coefband_trans_8x8plus;
break;
......
......@@ -93,7 +93,7 @@ void vp9_quantize(MACROBLOCK *mb, int plane, int block, int n_coeffs,
scan = get_scan_16x16(tx_type);
break;
default:
scan = vp9_default_zig_zag1d_32x32;
scan = vp9_default_scan_32x32;
break;
}
......@@ -197,7 +197,7 @@ void vp9_init_quantizer(VP9_COMP *cpi) {
#endif
// all the 4x4 ac values =;
for (i = 1; i < 16; i++) {
int rc = vp9_default_zig_zag1d_4x4[i];
int rc = vp9_default_scan_4x4[i];
invert_quant(cpi->y_quant[q] + rc, cpi->y_quant_shift[q] + rc, quant_val);
cpi->y_zbin[q][rc] = ROUND_POWER_OF_TWO(qzbin_factor * quant_val, 7);
......
......@@ -329,7 +329,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
break;
}
case TX_32X32:
scan = vp9_default_zig_zag1d_32x32;
scan = vp9_default_scan_32x32;
vp9_model_to_full_probs_sb(cm->fc.coef_probs_32x32[type][ref],
coef_probs);
seg_eob = 1024;
......
......@@ -186,7 +186,7 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize,
above_ec = (A[0] + A[1] + A[2] + A[3] + A[4] + A[5] + A[6] + A[7]) != 0;
left_ec = (L[0] + L[1] + L[2] + L[3] + L[4] + L[5] + L[6] + L[7]) != 0;
seg_eob = 1024;
scan = vp9_default_zig_zag1d_32x32;
scan = vp9_default_scan_32x32;
counts = cpi->coef_counts_32x32;
coef_probs = cpi->common.fc.coef_probs_32x32;
band_translate = vp9_coefband_trans_8x8plus;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment