mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-18 13:35:13 +00:00
706bd8ea19
* qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
68 lines
2.2 KiB
C
68 lines
2.2 KiB
C
/*
|
|
* 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 "libavcodec/avcodec.h"
|
|
#include "libavcodec/vp3dsp.h"
|
|
#include "config.h"
|
|
|
|
void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block);
|
|
void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
|
|
|
|
void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
|
|
void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
|
|
|
|
void ff_vp3_idct_dc_add_mmx2(uint8_t *dest, int line_size,
|
|
const DCTELEM *block);
|
|
|
|
void ff_vp3_v_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values);
|
|
void ff_vp3_h_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values);
|
|
|
|
av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
|
|
{
|
|
#if HAVE_YASM
|
|
int cpuflags = av_get_cpu_flags();
|
|
|
|
#if ARCH_X86_32
|
|
if (HAVE_MMX && cpuflags & AV_CPU_FLAG_MMX) {
|
|
c->idct_put = ff_vp3_idct_put_mmx;
|
|
c->idct_add = ff_vp3_idct_add_mmx;
|
|
c->idct_perm = FF_PARTTRANS_IDCT_PERM;
|
|
}
|
|
#endif
|
|
|
|
if (HAVE_MMX2 && cpuflags & AV_CPU_FLAG_MMX2) {
|
|
c->idct_dc_add = ff_vp3_idct_dc_add_mmx2;
|
|
|
|
if (!(flags & CODEC_FLAG_BITEXACT)) {
|
|
c->v_loop_filter = ff_vp3_v_loop_filter_mmx2;
|
|
c->h_loop_filter = ff_vp3_h_loop_filter_mmx2;
|
|
}
|
|
}
|
|
|
|
if (cpuflags & AV_CPU_FLAG_SSE2) {
|
|
c->idct_put = ff_vp3_idct_put_sse2;
|
|
c->idct_add = ff_vp3_idct_add_sse2;
|
|
c->idct_perm = FF_TRANSPOSE_IDCT_PERM;
|
|
}
|
|
#endif
|
|
}
|