mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765': dsputil: Split bswap*_buf() off into a separate context Conflicts: configure libavcodec/4xm.c libavcodec/ac3dec.c libavcodec/ac3dec.h libavcodec/apedec.c libavcodec/eamad.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/huffyuvdec.c libavcodec/motionpixels.c libavcodec/truemotion2.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/76/merge
Michael Niedermayer
11 years ago
commit
35bb74900b
42 changed files with 277 additions and 166 deletions
@ -0,0 +1,56 @@ |
|||||||
|
/*
|
||||||
|
* 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/bswap.h" |
||||||
|
#include "bswapdsp.h" |
||||||
|
|
||||||
|
static void bswap_buf(uint32_t *dst, const uint32_t *src, int w) |
||||||
|
{ |
||||||
|
int i; |
||||||
|
|
||||||
|
for (i = 0; i + 8 <= w; i += 8) { |
||||||
|
dst[i + 0] = av_bswap32(src[i + 0]); |
||||||
|
dst[i + 1] = av_bswap32(src[i + 1]); |
||||||
|
dst[i + 2] = av_bswap32(src[i + 2]); |
||||||
|
dst[i + 3] = av_bswap32(src[i + 3]); |
||||||
|
dst[i + 4] = av_bswap32(src[i + 4]); |
||||||
|
dst[i + 5] = av_bswap32(src[i + 5]); |
||||||
|
dst[i + 6] = av_bswap32(src[i + 6]); |
||||||
|
dst[i + 7] = av_bswap32(src[i + 7]); |
||||||
|
} |
||||||
|
for (; i < w; i++) |
||||||
|
dst[i + 0] = av_bswap32(src[i + 0]); |
||||||
|
} |
||||||
|
|
||||||
|
static void bswap16_buf(uint16_t *dst, const uint16_t *src, int len) |
||||||
|
{ |
||||||
|
while (len--) |
||||||
|
*dst++ = av_bswap16(*src++); |
||||||
|
} |
||||||
|
|
||||||
|
av_cold void ff_bswapdsp_init(BswapDSPContext *c) |
||||||
|
{ |
||||||
|
c->bswap_buf = bswap_buf; |
||||||
|
c->bswap16_buf = bswap16_buf; |
||||||
|
|
||||||
|
if (ARCH_X86) |
||||||
|
ff_bswapdsp_init_x86(c); |
||||||
|
} |
||||||
@ -0,0 +1,32 @@ |
|||||||
|
/*
|
||||||
|
* 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 |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef AVCODEC_BSWAP_BUF_H |
||||||
|
#define AVCODEC_BSWAP_BUF_H |
||||||
|
|
||||||
|
#include <stdint.h> |
||||||
|
|
||||||
|
typedef struct BswapDSPContext { |
||||||
|
void (*bswap_buf)(uint32_t *dst, const uint32_t *src, int w); |
||||||
|
void (*bswap16_buf)(uint16_t *dst, const uint16_t *src, int len); |
||||||
|
} BswapDSPContext; |
||||||
|
|
||||||
|
void ff_bswapdsp_init(BswapDSPContext *c); |
||||||
|
void ff_bswapdsp_init_x86(BswapDSPContext *c); |
||||||
|
|
||||||
|
#endif /* AVCODEC_BSWAP_BUF_H */ |
||||||
@ -1,5 +1,5 @@ |
|||||||
;****************************************************************************** |
;****************************************************************************** |
||||||
;* MMX optimized DSP utils |
;* optimized bswap buffer functions |
||||||
;* Copyright (c) 2008 Loren Merritt |
;* Copyright (c) 2008 Loren Merritt |
||||||
;* Copyright (c) 2003-2013 Michael Niedermayer |
;* Copyright (c) 2003-2013 Michael Niedermayer |
||||||
;* Copyright (c) 2013 Daniel Kang |
;* Copyright (c) 2013 Daniel Kang |
||||||
@ -0,0 +1,37 @@ |
|||||||
|
/*
|
||||||
|
* 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/bswapdsp.h" |
||||||
|
|
||||||
|
void ff_bswap32_buf_sse2(uint32_t *dst, const uint32_t *src, int w); |
||||||
|
void ff_bswap32_buf_ssse3(uint32_t *dst, const uint32_t *src, int w); |
||||||
|
|
||||||
|
av_cold void ff_bswapdsp_init_x86(BswapDSPContext *c) |
||||||
|
{ |
||||||
|
int cpu_flags = av_get_cpu_flags(); |
||||||
|
|
||||||
|
if (EXTERNAL_SSE2(cpu_flags)) |
||||||
|
c->bswap_buf = ff_bswap32_buf_sse2; |
||||||
|
if (EXTERNAL_SSSE3(cpu_flags)) |
||||||
|
c->bswap_buf = ff_bswap32_buf_ssse3; |
||||||
|
} |
||||||
Loading…
Reference in new issue