Merge "Using stride (# of elements) instead of pitch (bytes) in fdct8x8."

Dmitry Kovalev committed 13 years ago

Commit a767d102 parents 0c10a94 e5fa44c5 files · +7 −9Browse files

Unified · Split

5 files

test/fdct8x8_test.cc +2 −2
vp9/common/vp9_rtcd_defs.sh +1 −1
vp9/encoder/vp9_dct.c +1 −2
vp9/encoder/vp9_encodemb.c +2 −2
vp9/encoder/x86/vp9_dct_sse2.c +1 −2

test/fdct8x8_test.cc+2−2

@@ -223,7 +223,7 @@ class FwdTrans8x8DCT : public FwdTrans8x8TestBase, · 222 unmodified lines
223	223	fwd_txfm_ = GET_PARAM(0);
224	224	inv_txfm_ = GET_PARAM(1);
225	225	tx_type_ = GET_PARAM(2);
226		− pitch_ = 16;
	226	+ pitch_ = 8;
227	227	fwd_txfm_ref = fdct8x8_ref;
228	228	}
229	229
@@ -234,7 +234,7 @@ class FwdTrans8x8DCT : public FwdTrans8x8TestBase, · 4 unmodified lines
234	234	fwd_txfm_(in, out, stride);
235	235	}
236	236	void RunInvTxfm(int16_t out, uint8_t dst, int stride) {
237		− inv_txfm_(out, dst, stride >> 1);
	237	+ inv_txfm_(out, dst, stride);
238	238	}
239	239
240	240	fdct_t fwd_txfm_;

vp9/common/vp9_rtcd_defs.sh+1−1

@@ -695,7 +695,7 @@ specialize vp9_short_fht8x8 sse2 · 694 unmodified lines
695	695	prototype void vp9_short_fht16x16 "int16_t InputData, int16_t OutputData, int pitch, int tx_type"
696	696	specialize vp9_short_fht16x16 sse2
697	697
698		−prototype void vp9_short_fdct8x8 "int16_t InputData, int16_t OutputData, int pitch"
	698	+prototype void vp9_short_fdct8x8 "int16_t InputData, int16_t OutputData, int stride"
699	699	specialize vp9_short_fdct8x8 sse2
700	700
701	701	prototype void vp9_short_fdct4x4 "int16_t InputData, int16_t OutputData, int pitch"

vp9/encoder/vp9_dct.c+1−2

@@ -230,8 +230,7 @@ static void fdct8(const int16_t input, int16_t output) { · 229 unmodified lines
230	230	output[7] = dct_const_round_shift(t3);
231	231	}
232	232
233		−void vp9_short_fdct8x8_c(int16_t input, int16_t final_output, int pitch) {
234		− const int stride = pitch >> 1;
	233	+void vp9_short_fdct8x8_c(int16_t input, int16_t final_output, int stride) {
235	234	int i, j;
236	235	int16_t intermediate[64];
237	236

vp9/encoder/vp9_encodemb.c+2−2

@@ -391,7 +391,7 @@ void vp9_xform_quant(int plane, int block, BLOCK_SIZE plane_bsize, · 390 unmodified lines
391	391	xoff = 8 * (block & twmask);
392	392	yoff = 8 * (block >> twl);
393	393	src_diff = p->src_diff + 4 * bw * yoff + xoff;
394		− vp9_short_fdct8x8(src_diff, coeff, bw * 8);
	394	+ vp9_short_fdct8x8(src_diff, coeff, bw * 4);
395	395	vp9_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round,
396	396	p->quant, p->quant_shift, qcoeff, dqcoeff,
397	397	pd->dequant, p->zbin_extra, eob, scan, iscan);
@@ -584,7 +584,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize, · 186 unmodified lines
584	584	if (tx_type != DCT_DCT)
585	585	vp9_short_fht8x8(src_diff, coeff, bw * 4, tx_type);
586	586	else
587		− vp9_short_fdct8x8(src_diff, coeff, bw * 8);
	587	+ vp9_short_fdct8x8(src_diff, coeff, bw * 4);
588	588	vp9_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round, p->quant,
589	589	p->quant_shift, qcoeff, dqcoeff,
590	590	pd->dequant, p->zbin_extra, eob, scan, iscan);

vp9/encoder/x86/vp9_dct_sse2.c+1−2

@@ -271,8 +271,7 @@ void vp9_short_fht4x4_sse2(int16_t input, int16_t output, · 270 unmodified lines
271	271	write_buffer_4x4(output, in);
272	272	}
273	273
274		−void vp9_short_fdct8x8_sse2(int16_t input, int16_t output, int pitch) {
275		− const int stride = pitch >> 1;
	274	+void vp9_short_fdct8x8_sse2(int16_t input, int16_t output, int stride) {
276	275	int pass;
277	276	// Constants
278	277	// When we use them, in one case, they are all the same. In all others