mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
c581cb4e4f
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
95 lines
3.0 KiB
C
95 lines
3.0 KiB
C
/*
|
|
* Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org>
|
|
* Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
|
|
*
|
|
* 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 "avcodec.h"
|
|
#include "vp56dsp.h"
|
|
#include "libavutil/common.h"
|
|
|
|
/* Gives very similar result than the vp6 version except in a few cases */
|
|
static int vp5_adjust(int v, int t)
|
|
{
|
|
int s2, s1 = v >> 31;
|
|
v ^= s1;
|
|
v -= s1;
|
|
v *= v < 2*t;
|
|
v -= t;
|
|
s2 = v >> 31;
|
|
v ^= s2;
|
|
v -= s2;
|
|
v = t - v;
|
|
v += s1;
|
|
v ^= s1;
|
|
return v;
|
|
}
|
|
|
|
static int vp6_adjust(int v, int t)
|
|
{
|
|
int V = v, s = v >> 31;
|
|
V ^= s;
|
|
V -= s;
|
|
if (V-t-1 >= (unsigned)(t-1))
|
|
return v;
|
|
V = 2*t - V;
|
|
V += s;
|
|
V ^= s;
|
|
return V;
|
|
}
|
|
|
|
|
|
#define VP56_EDGE_FILTER(pfx, suf, pix_inc, line_inc) \
|
|
static void pfx##_edge_filter_##suf(uint8_t *yuv, int stride, int t) \
|
|
{ \
|
|
int pix2_inc = 2 * pix_inc; \
|
|
int i, v; \
|
|
\
|
|
for (i=0; i<12; i++) { \
|
|
v = (yuv[-pix2_inc] + 3*(yuv[0]-yuv[-pix_inc]) - yuv[pix_inc] + 4)>>3;\
|
|
v = pfx##_adjust(v, t); \
|
|
yuv[-pix_inc] = av_clip_uint8(yuv[-pix_inc] + v); \
|
|
yuv[0] = av_clip_uint8(yuv[0] - v); \
|
|
yuv += line_inc; \
|
|
} \
|
|
}
|
|
|
|
VP56_EDGE_FILTER(vp5, hor, 1, stride)
|
|
VP56_EDGE_FILTER(vp5, ver, stride, 1)
|
|
VP56_EDGE_FILTER(vp6, hor, 1, stride)
|
|
VP56_EDGE_FILTER(vp6, ver, stride, 1)
|
|
|
|
void ff_vp56dsp_init(VP56DSPContext *s, enum AVCodecID codec)
|
|
{
|
|
if (codec == AV_CODEC_ID_VP5) {
|
|
s->edge_filter_hor = vp5_edge_filter_hor;
|
|
s->edge_filter_ver = vp5_edge_filter_ver;
|
|
} else {
|
|
s->edge_filter_hor = vp6_edge_filter_hor;
|
|
s->edge_filter_ver = vp6_edge_filter_ver;
|
|
|
|
if (CONFIG_VP6_DECODER) {
|
|
s->vp6_filter_diag4 = ff_vp6_filter_diag4_c;
|
|
}
|
|
}
|
|
|
|
if (ARCH_ARM) ff_vp56dsp_init_arm(s, codec);
|
|
if (HAVE_MMX) ff_vp56dsp_init_x86(s, codec);
|
|
}
|