Use this in vf_spp.c, where the get_pixels operation is done on unaligned source addresses.
This fixes fate-filter-spp on armv7. --- People more familiar with the other assembly implementations of get_pixels (in particular, x86) can hook them up to get_pixels_unaligned if unaligned use explicitly is ok; as far as I can read at least ff_get_pixels_mmx, it looks like it expects the source to be aligned, but in practice it does seem to run fine even if ff_get_pixels_sse2 is disabled. --- libavcodec/avdct.c | 1 + libavcodec/avdct.h | 4 ++++ libavcodec/pixblockdsp.c | 2 ++ libavcodec/pixblockdsp.h | 3 +++ libavfilter/vf_spp.c | 2 +- 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c index 7c761cf39a..e8fa41f73b 100644 --- a/libavcodec/avdct.c +++ b/libavcodec/avdct.c @@ -120,6 +120,7 @@ int avcodec_dct_init(AVDCT *dsp) PixblockDSPContext pdsp; ff_pixblockdsp_init(&pdsp, avctx); COPY(pdsp, get_pixels); + COPY(pdsp, get_pixels_unaligned); } #endif diff --git a/libavcodec/avdct.h b/libavcodec/avdct.h index 272422e44c..6411fab6f6 100644 --- a/libavcodec/avdct.h +++ b/libavcodec/avdct.h @@ -67,6 +67,10 @@ typedef struct AVDCT { ptrdiff_t line_size); int bits_per_sample; + + void (*get_pixels_unaligned)(int16_t *block /* align 16 */, + const uint8_t *pixels, + ptrdiff_t line_size); } AVDCT; /** diff --git a/libavcodec/pixblockdsp.c b/libavcodec/pixblockdsp.c index 50e1d1d735..a79e547776 100644 --- a/libavcodec/pixblockdsp.c +++ b/libavcodec/pixblockdsp.c @@ -90,10 +90,12 @@ av_cold void ff_pixblockdsp_init(PixblockDSPContext *c, AVCodecContext *avctx) case 10: case 12: case 14: + c->get_pixels_unaligned = c->get_pixels = get_pixels_16_c; break; default: if (avctx->bits_per_raw_sample<=8 || avctx->codec_type != AVMEDIA_TYPE_VIDEO) { + c->get_pixels_unaligned = c->get_pixels = get_pixels_8_c; } break; diff --git a/libavcodec/pixblockdsp.h b/libavcodec/pixblockdsp.h index e036700ff0..fddb467212 100644 --- a/libavcodec/pixblockdsp.h +++ b/libavcodec/pixblockdsp.h @@ -29,6 +29,9 @@ typedef struct PixblockDSPContext { void (*get_pixels)(int16_t *av_restrict block /* align 16 */, const uint8_t *pixels /* align 8 */, ptrdiff_t stride); + void (*get_pixels_unaligned)(int16_t *av_restrict block /* align 16 */, + const uint8_t *pixels, + ptrdiff_t stride); void (*diff_pixels)(int16_t *av_restrict block /* align 16 */, const uint8_t *s1 /* align 8 */, const uint8_t *s2 /* align 8 */, diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 6bee91b309..a83b1195c0 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -283,7 +283,7 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src, const int x1 = x + offset[i + count - 1][0]; const int y1 = y + offset[i + count - 1][1]; const int index = x1 + y1*linesize; - p->dct->get_pixels(block, p->src + sample_bytes*index, sample_bytes*linesize); + p->dct->get_pixels_unaligned(block, p->src + sample_bytes*index, sample_bytes*linesize); p->dct->fdct(block); p->requantize(block2, block, qp, p->dct->idct_permutation); p->dct->idct(block2); -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".