mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-04 23:38:20 +02:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
On2 VP7 decoder
Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c
See: 89f2f5dbd7
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
81 lines
3.5 KiB
C
81 lines
3.5 KiB
C
/*
|
|
* 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_ARM_VP8DSP_H
|
|
#define AVCODEC_ARM_VP8DSP_H
|
|
|
|
#include "libavcodec/vp8dsp.h"
|
|
|
|
void ff_vp78dsp_init_armv6(VP8DSPContext *dsp);
|
|
void ff_vp78dsp_init_neon(VP8DSPContext *dsp);
|
|
void ff_vp8dsp_init_armv6(VP8DSPContext *dsp);
|
|
void ff_vp8dsp_init_neon(VP8DSPContext *dsp);
|
|
|
|
#define VP8_LF_Y(hv, inner, opt) \
|
|
void ff_vp8_##hv##_loop_filter16##inner##_##opt(uint8_t *dst, \
|
|
ptrdiff_t stride, \
|
|
int flim_E, int flim_I, \
|
|
int hev_thresh)
|
|
|
|
#define VP8_LF_UV(hv, inner, opt) \
|
|
void ff_vp8_##hv##_loop_filter8uv##inner##_##opt(uint8_t *dstU, \
|
|
uint8_t *dstV, \
|
|
ptrdiff_t stride, \
|
|
int flim_E, int flim_I, \
|
|
int hev_thresh)
|
|
|
|
#define VP8_LF_SIMPLE(hv, opt) \
|
|
void ff_vp8_##hv##_loop_filter16_simple_##opt(uint8_t *dst, \
|
|
ptrdiff_t stride, \
|
|
int flim)
|
|
|
|
#define VP8_LF_HV(inner, opt) \
|
|
VP8_LF_Y(h, inner, opt); \
|
|
VP8_LF_Y(v, inner, opt); \
|
|
VP8_LF_UV(h, inner, opt); \
|
|
VP8_LF_UV(v, inner, opt)
|
|
|
|
#define VP8_LF(opt) \
|
|
VP8_LF_HV(, opt); \
|
|
VP8_LF_HV(_inner, opt); \
|
|
VP8_LF_SIMPLE(h, opt); \
|
|
VP8_LF_SIMPLE(v, opt)
|
|
|
|
#define VP8_MC(n, opt) \
|
|
void ff_put_vp8_##n##_##opt(uint8_t *dst, ptrdiff_t dststride, \
|
|
uint8_t *src, ptrdiff_t srcstride, \
|
|
int h, int x, int y)
|
|
|
|
#define VP8_EPEL(w, opt) \
|
|
VP8_MC(pixels ## w, opt); \
|
|
VP8_MC(epel ## w ## _h4, opt); \
|
|
VP8_MC(epel ## w ## _h6, opt); \
|
|
VP8_MC(epel ## w ## _v4, opt); \
|
|
VP8_MC(epel ## w ## _h4v4, opt); \
|
|
VP8_MC(epel ## w ## _h6v4, opt); \
|
|
VP8_MC(epel ## w ## _v6, opt); \
|
|
VP8_MC(epel ## w ## _h4v6, opt); \
|
|
VP8_MC(epel ## w ## _h6v6, opt)
|
|
|
|
#define VP8_BILIN(w, opt) \
|
|
VP8_MC(bilin ## w ## _h, opt); \
|
|
VP8_MC(bilin ## w ## _v, opt); \
|
|
VP8_MC(bilin ## w ## _hv, opt)
|
|
|
|
#endif /* AVCODEC_ARM_VP8DSP_H */
|