mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-07 11:13:41 +02:00
fd17218558
VP4 applies a loop filter during motion compensation, causing the block offset will often by unaligned. This produces a bus error on some platforms, namely ARMv7 NEON. This patch adds a unaligned version of the loop filter function pointer to VP3DSPContext. Reported-by: Mike Melanson <mike@multimedia.cx> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
72 lines
2.5 KiB
C
72 lines
2.5 KiB
C
/*
|
|
* Copyright (c) 2009 David Conrad <lessen42@gmail.com>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "libavutil/attributes.h"
|
|
#include "libavutil/cpu.h"
|
|
#include "libavutil/x86/cpu.h"
|
|
#include "libavcodec/avcodec.h"
|
|
#include "libavcodec/vp3dsp.h"
|
|
|
|
void ff_vp3_idct_put_mmx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
|
|
void ff_vp3_idct_add_mmx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
|
|
|
|
void ff_vp3_idct_put_sse2(uint8_t *dest, ptrdiff_t stride, int16_t *block);
|
|
void ff_vp3_idct_add_sse2(uint8_t *dest, ptrdiff_t stride, int16_t *block);
|
|
|
|
void ff_vp3_idct_dc_add_mmxext(uint8_t *dest, ptrdiff_t stride, int16_t *block);
|
|
|
|
void ff_vp3_v_loop_filter_mmxext(uint8_t *src, ptrdiff_t stride,
|
|
int *bounding_values);
|
|
void ff_vp3_h_loop_filter_mmxext(uint8_t *src, ptrdiff_t stride,
|
|
int *bounding_values);
|
|
|
|
void ff_put_vp_no_rnd_pixels8_l2_mmx(uint8_t *dst, const uint8_t *a,
|
|
const uint8_t *b, ptrdiff_t stride,
|
|
int h);
|
|
|
|
av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
|
|
{
|
|
int cpu_flags = av_get_cpu_flags();
|
|
|
|
if (EXTERNAL_MMX(cpu_flags)) {
|
|
c->put_no_rnd_pixels_l2 = ff_put_vp_no_rnd_pixels8_l2_mmx;
|
|
#if ARCH_X86_32
|
|
c->idct_put = ff_vp3_idct_put_mmx;
|
|
c->idct_add = ff_vp3_idct_add_mmx;
|
|
#endif
|
|
}
|
|
|
|
if (EXTERNAL_MMXEXT(cpu_flags)) {
|
|
c->idct_dc_add = ff_vp3_idct_dc_add_mmxext;
|
|
|
|
if (!(flags & AV_CODEC_FLAG_BITEXACT)) {
|
|
c->v_loop_filter = c->v_loop_filter_unaligned = ff_vp3_v_loop_filter_mmxext;
|
|
c->h_loop_filter = c->v_loop_filter_unaligned = ff_vp3_h_loop_filter_mmxext;
|
|
}
|
|
}
|
|
|
|
if (EXTERNAL_SSE2(cpu_flags)) {
|
|
c->idct_put = ff_vp3_idct_put_sse2;
|
|
c->idct_add = ff_vp3_idct_add_sse2;
|
|
}
|
|
}
|