mirror of https://github.com/FFmpeg/FFmpeg.git
* qatar/master: ppc: fix build with altivec disabled vp3: move idct and loop filter pointers to new vp3dsp context build: add CONFIG_VP3DSP, reduce repetition in OBJS lists tscc2: do not add/subtract 128 bias during DCT tscc2: fix typo in DCT configure: clarify external library section of help output configure: mark libfdk-aac as nonfree configure: cosmetics: drop some unnecessary backslashes os_support: K&R formatting cosmetics Conflicts: configure libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/59/head
Michael Niedermayer
13 years ago
commit
204c4e953d
23 changed files with 321 additions and 246 deletions
@ -0,0 +1,45 @@ |
||||
/*
|
||||
* 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/arm/cpu.h" |
||||
#include "libavcodec/vp3dsp.h" |
||||
|
||||
void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, DCTELEM *data); |
||||
void ff_vp3_idct_add_neon(uint8_t *dest, int line_size, DCTELEM *data); |
||||
void ff_vp3_idct_dc_add_neon(uint8_t *dest, int line_size, const DCTELEM *data); |
||||
|
||||
void ff_vp3_v_loop_filter_neon(uint8_t *, int, int *); |
||||
void ff_vp3_h_loop_filter_neon(uint8_t *, int, int *); |
||||
|
||||
av_cold void ff_vp3dsp_init_arm(VP3DSPContext *c, int flags) |
||||
{ |
||||
int cpu_flags = av_get_cpu_flags(); |
||||
|
||||
if (have_neon(cpu_flags)) { |
||||
c->idct_put = ff_vp3_idct_put_neon; |
||||
c->idct_add = ff_vp3_idct_add_neon; |
||||
c->idct_dc_add = ff_vp3_idct_dc_add_neon; |
||||
c->v_loop_filter = ff_vp3_v_loop_filter_neon; |
||||
c->h_loop_filter = ff_vp3_h_loop_filter_neon; |
||||
c->idct_perm = FF_TRANSPOSE_IDCT_PERM; |
||||
} |
||||
} |
||||
@ -0,0 +1,40 @@ |
||||
/*
|
||||
* 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_VP3DSP_H |
||||
#define AVCODEC_VP3DSP_H |
||||
|
||||
#include <stdint.h> |
||||
#include "dsputil.h" |
||||
|
||||
typedef struct VP3DSPContext { |
||||
void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block); |
||||
void (*idct_add)(uint8_t *dest, int line_size, DCTELEM *block); |
||||
void (*idct_dc_add)(uint8_t *dest, int line_size, const DCTELEM *block); |
||||
void (*v_loop_filter)(uint8_t *src, int stride, int *bounding_values); |
||||
void (*h_loop_filter)(uint8_t *src, int stride, int *bounding_values); |
||||
|
||||
int idct_perm; |
||||
} VP3DSPContext; |
||||
|
||||
void ff_vp3dsp_init(VP3DSPContext *c, int flags); |
||||
void ff_vp3dsp_init_arm(VP3DSPContext *c, int flags); |
||||
void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags); |
||||
void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags); |
||||
|
||||
#endif /* AVCODEC_VP3DSP_H */ |
||||
@ -0,0 +1,65 @@ |
||||
/*
|
||||
* 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 (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; |
||||
} |
||||
|
||||
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 |
||||
} |
||||
Loading…
Reference in new issue