avcodec/me_cmp: Fix crashes on ARM due to misalignment

Adds a diff_pixels_unaligned() Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872503

Michael Niedermayer committed 9 years ago

Commit bc488ec1 parent 898ea654 files · +13 −5Browse files

Unified · Split

4 files

libavcodec/me_cmp.c +5 −5
libavcodec/pixblockdsp.c +1 −0
libavcodec/pixblockdsp.h +5 −0
libavcodec/x86/pixblockdsp_init.c +2 −0

@@ -628,7 +628,7 @@ static int dct_sad8x8_c(MpegEncContext s, uint8_t src1, · 627 unmodified lines
628	628
629	629	av_assert2(h == 8);
630	630
631		− s->pdsp.diff_pixels(temp, src1, src2, stride);
	631	+ s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride);
632	632	s->fdsp.fdct(temp);
633	633	return s->mecc.sum_abs_dctelem(temp);
634	634	}
@@ -668,7 +668,7 @@ static int dct264_sad8x8_c(MpegEncContext s, uint8_t src1, · 33 unmodified lines
668	668	int16_t dct[8][8];
669	669	int i, sum = 0;
670	670
671		− s->pdsp.diff_pixels(dct[0], src1, src2, stride);
	671	+ s->pdsp.diff_pixels_unaligned(dct[0], src1, src2, stride);
672	672
673	673	#define SRC(x) dct[i][x]
674	674	#define DST(x, v) dct[i][x] = v
@@ -695,7 +695,7 @@ static int dct_max8x8_c(MpegEncContext s, uint8_t src1, · 20 unmodified lines
695	695
696	696	av_assert2(h == 8);
697	697
698		− s->pdsp.diff_pixels(temp, src1, src2, stride);
	698	+ s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride);
699	699	s->fdsp.fdct(temp);
700	700
701	701	for (i = 0; i < 64; i++)
@@ -714,7 +714,7 @@ static int quant_psnr8x8_c(MpegEncContext s, uint8_t src1, · 12 unmodified lines
714	714	av_assert2(h == 8);
715	715	s->mb_intra = 0;
716	716
717		− s->pdsp.diff_pixels(temp, src1, src2, stride);
	717	+ s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride);
718	718
719	719	memcpy(bak, temp, 64 * sizeof(int16_t));
720	720
@@ -817,7 +817,7 @@ static int bit8x8_c(MpegEncContext s, uint8_t src1, uint8_t *src2, · 96 unmodified lines
817	817
818	818	av_assert2(h == 8);
819	819
820		− s->pdsp.diff_pixels(temp, src1, src2, stride);
	820	+ s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride);
821	821
822	822	s->block_last_index[0 /* FIXME */] =
823	823	last =

libavcodec/pixblockdsp.c+1−0

@@ -82,6 +82,7 @@ av_cold void ff_pixblockdsp_init(PixblockDSPContext c, AVCodecContext avctx) · 81 unmodified lines
82	82	{
83	83	const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
84	84
	85	+ c->diff_pixels_unaligned =
85	86	c->diff_pixels = diff_pixels_c;
86	87
87	88	switch (avctx->bits_per_raw_sample) {

libavcodec/pixblockdsp.h+5−0

@@ -33,6 +33,11 @@ typedef struct PixblockDSPContext { · 32 unmodified lines
33	33	const uint8_t s1 / align 8 */,
34	34	const uint8_t s2 / align 8 */,
35	35	ptrdiff_t stride);
	36	+ void (diff_pixels_unaligned)(int16_t av_restrict block /* align 16 */,
	37	+ const uint8_t *s1,
	38	+ const uint8_t *s2,
	39	+ ptrdiff_t stride);
	40	+
36	41	} PixblockDSPContext;
37	42
38	43	void ff_pixblockdsp_init(PixblockDSPContext c, AVCodecContext avctx);

libavcodec/x86/pixblockdsp_init.c+2−0

@@ -39,12 +39,14 @@ av_cold void ff_pixblockdsp_init_x86(PixblockDSPContext *c, · 38 unmodified lines
39	39	if (EXTERNAL_MMX(cpu_flags)) {
40	40	if (!high_bit_depth)
41	41	c->get_pixels = ff_get_pixels_mmx;
	42	+ c->diff_pixels_unaligned =
42	43	c->diff_pixels = ff_diff_pixels_mmx;
43	44	}
44	45
45	46	if (EXTERNAL_SSE2(cpu_flags)) {
46	47	if (!high_bit_depth)
47	48	c->get_pixels = ff_get_pixels_sse2;
	49	+ c->diff_pixels_unaligned =
48	50	c->diff_pixels = ff_diff_pixels_sse2;
49	51	}
50	52	}

avcodec/me_cmp: Fix crashes on ARM due to misalignment

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code