9f088a1ed4
* qatar/master: mpegvideo: reduce excessive inlining of mpeg_motion() mpegvideo: convert mpegvideo_common.h to a .c file build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO Move MASK_ABS macro to libavcodec/mathops.h x86: move MANGLE() and related macros to libavutil/x86/asm.h x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h aacdec: Don't fall back to the old output configuration when no old configuration is present. rtmp: Add message tracking rtsp: Support mpegts in raw udp packets rtsp: Support receiving plain data over UDP without any RTP encapsulation rtpdec: Remove an unused include rtpenc: Remove an av_abort() that depends on user-supplied data vsrc_movie: discourage its use with avconv. avconv: allow no input files. avconv: prevent invalid reads in transcode_init() avconv: rename OutputStream.is_past_recording_time to finished. Conflicts: configure doc/filters.texi ffmpeg.c ffmpeg.h libavcodec/Makefile libavcodec/aacdec.c libavcodec/mpegvideo.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
51 lines
1.8 KiB
C
51 lines
1.8 KiB
C
/*
|
|
* VP6 MMX/SSE2 optimizations
|
|
* Copyright (C) 2009 Sebastien Lucas <sebastien.lucas@gmail.com>
|
|
* Copyright (C) 2009 Zuxy Meng <zuxy.meng@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 "libavutil/cpu.h"
|
|
#include "libavutil/x86/asm.h"
|
|
#include "libavcodec/dsputil.h"
|
|
#include "libavcodec/vp56dsp.h"
|
|
|
|
void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride,
|
|
const int16_t *h_weights,const int16_t *v_weights);
|
|
void ff_vp6_filter_diag4_sse2(uint8_t *dst, uint8_t *src, int stride,
|
|
const int16_t *h_weights,const int16_t *v_weights);
|
|
|
|
av_cold void ff_vp56dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec)
|
|
{
|
|
#if HAVE_YASM
|
|
int mm_flags = av_get_cpu_flags();
|
|
|
|
if (CONFIG_VP6_DECODER && codec == AV_CODEC_ID_VP6) {
|
|
#if ARCH_X86_32
|
|
if (mm_flags & AV_CPU_FLAG_MMX) {
|
|
c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx;
|
|
}
|
|
#endif
|
|
|
|
if (mm_flags & AV_CPU_FLAG_SSE2) {
|
|
c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2;
|
|
}
|
|
}
|
|
#endif
|
|
}
|