mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-29 17:50:46 +00:00
151ecc2aec
* qatar/master: (26 commits) avconv: deprecate the -deinterlace option doc: Fix the name of the new function aacenc: make sure to encode enough frames to cover all input samples. aacenc: only use the number of input samples provided by the user. wmadec: Verify bitstream size makes sense before calling init_get_bits. kmvc: Log into a context at a log level constant. mpeg12: Pad framerate tab to 16 entries. kgv1dec: Increase offsets array size so it is large enough. kmvc: Check palsize. nsvdec: Propagate errors nsvdec: Be more careful with av_malloc(). nsvdec: Fix use of uninitialized streams. movenc: cosmetics: Get rid of camelCase identifiers swscale: more generic check for planar destination formats with alpha doc: Document mov/mp4 fragmentation options build: Use order-only prerequisites for creating FATE reference file dirs. x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf rtsp: Remove some unused variables from ff_rtsp_connect(). avutil: make intfloat api public avformat_write_header(): detail error message ... Conflicts: doc/APIchanges doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/kmvc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_yasm.asm libavcodec/x86/pngdsp-init.c libavformat/movenc.c libavformat/movenc.h libavformat/mpegtsenc.c libavformat/nsvdec.c libavformat/utils.c libavutil/avutil.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
52 lines
1.9 KiB
C
52 lines
1.9 KiB
C
/*
|
|
* x86 PNG optimizations.
|
|
* Copyright (c) 2008 Loren Merrit <lorenm@u.washington.edu>
|
|
*
|
|
* 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/common.h"
|
|
#include "libavutil/cpu.h"
|
|
#include "libavcodec/pngdsp.h"
|
|
|
|
void ff_add_png_paeth_prediction_mmx2 (uint8_t *dst, uint8_t *src,
|
|
uint8_t *top, int w, int bpp);
|
|
void ff_add_png_paeth_prediction_ssse3(uint8_t *dst, uint8_t *src,
|
|
uint8_t *top, int w, int bpp);
|
|
void ff_add_bytes_l2_mmx (uint8_t *dst, uint8_t *src1,
|
|
uint8_t *src2, int w);
|
|
void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1,
|
|
uint8_t *src2, int w);
|
|
|
|
void ff_pngdsp_init_x86(PNGDSPContext *dsp)
|
|
{
|
|
#if HAVE_YASM
|
|
int flags = av_get_cpu_flags();
|
|
|
|
#if ARCH_X86_32
|
|
if (flags & AV_CPU_FLAG_MMX)
|
|
dsp->add_bytes_l2 = ff_add_bytes_l2_mmx;
|
|
#endif
|
|
if (flags & AV_CPU_FLAG_MMX2)
|
|
dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmx2;
|
|
if (flags & AV_CPU_FLAG_SSE2)
|
|
dsp->add_bytes_l2 = ff_add_bytes_l2_sse2;
|
|
if (flags & AV_CPU_FLAG_SSSE3)
|
|
dsp->add_paeth_prediction = ff_add_png_paeth_prediction_ssse3;
|
|
#endif
|
|
}
|