mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3': dsputil: Split off FDCT bits into their own context Conflicts: configure libavcodec/Makefile libavcodec/asvenc.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/76/merge
Michael Niedermayer
11 years ago
commit
14e2406de7
25 changed files with 253 additions and 102 deletions
@ -0,0 +1,50 @@ |
||||
/*
|
||||
* 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/attributes.h" |
||||
#include "avcodec.h" |
||||
#include "dct.h" |
||||
#include "faandct.h" |
||||
#include "fdctdsp.h" |
||||
#include "config.h" |
||||
|
||||
av_cold void ff_fdctdsp_init(FDCTDSPContext *c, AVCodecContext *avctx) |
||||
{ |
||||
const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8; |
||||
|
||||
if (avctx->bits_per_raw_sample == 10) { |
||||
c->fdct = ff_jpeg_fdct_islow_10; |
||||
c->fdct248 = ff_fdct248_islow_10; |
||||
} else { |
||||
if (avctx->dct_algo == FF_DCT_FASTINT) { |
||||
c->fdct = ff_fdct_ifast; |
||||
c->fdct248 = ff_fdct_ifast248; |
||||
} else if (avctx->dct_algo == FF_DCT_FAAN) { |
||||
c->fdct = ff_faandct; |
||||
c->fdct248 = ff_faandct248; |
||||
} else { |
||||
c->fdct = ff_jpeg_fdct_islow_8; // slow/accurate/default
|
||||
c->fdct248 = ff_fdct248_islow_8; |
||||
} |
||||
} |
||||
|
||||
if (ARCH_PPC) |
||||
ff_fdctdsp_init_ppc(c, avctx, high_bit_depth); |
||||
if (ARCH_X86) |
||||
ff_fdctdsp_init_x86(c, avctx, high_bit_depth); |
||||
} |
||||
@ -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 |
||||
*/ |
||||
|
||||
#ifndef AVCODEC_FDCTDSP_H |
||||
#define AVCODEC_FDCTDSP_H |
||||
|
||||
#include <stdint.h> |
||||
|
||||
#include "avcodec.h" |
||||
|
||||
typedef struct FDCTDSPContext { |
||||
void (*fdct)(int16_t *block /* align 16 */); |
||||
void (*fdct248)(int16_t *block /* align 16 */); |
||||
} FDCTDSPContext; |
||||
|
||||
void ff_fdctdsp_init(FDCTDSPContext *c, AVCodecContext *avctx); |
||||
void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx, |
||||
unsigned high_bit_depth); |
||||
void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx, |
||||
unsigned high_bit_depth); |
||||
|
||||
#endif /* AVCODEC_FDCTDSP_H */ |
||||
@ -0,0 +1,26 @@ |
||||
/*
|
||||
* 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_PPC_FDCTDSP_H |
||||
#define AVCODEC_PPC_FDCTDSP_H |
||||
|
||||
#include <stdint.h> |
||||
|
||||
void ff_fdct_altivec(int16_t *block); |
||||
|
||||
#endif /* AVCODEC_PPC_FDCTDSP_H */ |
||||
@ -0,0 +1,44 @@ |
||||
/*
|
||||
* 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/attributes.h" |
||||
#include "libavutil/cpu.h" |
||||
#include "libavutil/x86/cpu.h" |
||||
#include "libavcodec/avcodec.h" |
||||
#include "libavcodec/dct.h" |
||||
#include "libavcodec/fdctdsp.h" |
||||
|
||||
av_cold void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx, |
||||
unsigned high_bit_depth) |
||||
{ |
||||
int cpu_flags = av_get_cpu_flags(); |
||||
const int dct_algo = avctx->dct_algo; |
||||
|
||||
if (!high_bit_depth) { |
||||
if ((dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) { |
||||
if (INLINE_MMX(cpu_flags)) |
||||
c->fdct = ff_fdct_mmx; |
||||
|
||||
if (INLINE_MMXEXT(cpu_flags)) |
||||
c->fdct = ff_fdct_mmxext; |
||||
|
||||
if (INLINE_SSE2(cpu_flags)) |
||||
c->fdct = ff_fdct_sse2; |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue