On Wed, Apr 10, 2013 at 11:52:31AM +0300, Martin Storsjö wrote:
> From: "Ronald S. Bultje" <[email protected]>
log message is in need of Diego
> ---
> configure | 1 +
> libavcodec/Makefile | 1 +
> libavcodec/dsputil.h | 7 +-
> libavcodec/hpeldsp.c | 56 +++++++++
> libavcodec/hpeldsp.h | 97 ++++++++++++++++
> libavcodec/hpeldsp_template.c | 254
> +++++++++++++++++++++++++++++++++++++++++
> libavcodec/rnd_avg.h | 7 ++
> 7 files changed, 417 insertions(+), 6 deletions(-)
> create mode 100644 libavcodec/hpeldsp.c
> create mode 100644 libavcodec/hpeldsp.h
> create mode 100644 libavcodec/hpeldsp_template.c
>
> diff --git a/configure b/configure
> index ae46ce4..e19521a 100755
> --- a/configure
> +++ b/configure
> @@ -1368,6 +1368,7 @@ CONFIG_EXTRA="
> h264dsp
> h264pred
> h264qpel
> + hpeldsp
> huffman
> lgplv3
> lpc
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index e6379a5..5d9b6f5 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -44,6 +44,7 @@ OBJS-$(CONFIG_H264CHROMA) += h264chroma.o
> OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o
> OBJS-$(CONFIG_H264PRED) += h264pred.o
> OBJS-$(CONFIG_H264QPEL) += h264qpel.o
> +OBJS-$(CONFIG_HPELDSP) += hpeldsp.o
> OBJS-$(CONFIG_HUFFMAN) += huffman.o
> OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o
> OBJS-$(CONFIG_LPC) += lpc.o
> diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
> index 2a7c014..9c4976b 100644
> --- a/libavcodec/dsputil.h
> +++ b/libavcodec/dsputil.h
> @@ -32,6 +32,7 @@
>
> #include "libavutil/intreadwrite.h"
> #include "avcodec.h"
> +#include "rnd_avg.h"
>
>
> //#define DEBUG
> @@ -103,12 +104,6 @@ DEF_OLD_QPEL(qpel8_mc32_old_c)
> DEF_OLD_QPEL(qpel8_mc13_old_c)
> DEF_OLD_QPEL(qpel8_mc33_old_c)
>
> -#define CALL_2X_PIXELS(a, b, n)\
> -static void a(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size,
> int h){\
> - b(block , pixels , line_size, h);\
> - b(block+n, pixels+n, line_size, h);\
> -}
> -
> /* motion estimation */
> // h is limited to {width/2, width, 2*width} but never larger than 16 and
> never smaller than 2
> // although currently h<4 is not used as functions with width <8 are neither
> used nor implemented
I'd bikeshed that CALL_2X_PIXELS hardly belong to rnd_avg.h and a better
common place for it could be found. But meh.
> diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h
> new file mode 100644
> index 0000000..afbc1eb
> --- /dev/null
> +++ b/libavcodec/hpeldsp.h
> @@ -0,0 +1,97 @@
> +/*
> + * Half-pel DSP functions.
> + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
> + * Copyright (c) 2002-2004 Michael Niedermayer <[email protected]>
> + *
> + * This file is part of FFmpeg.
Wrong project.
> diff --git a/libavcodec/hpeldsp_template.c b/libavcodec/hpeldsp_template.c
> new file mode 100644
> index 0000000..9c9fd2b
> --- /dev/null
> +++ b/libavcodec/hpeldsp_template.c
> @@ -0,0 +1,254 @@
> +/*
> + * Half-pel DSP functions.
> + * Copyright (c) 2000, 2001 Fabrice Bellard
> + * Copyright (c) 2002-2004 Michael Niedermayer <[email protected]>
> + *
> + * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <[email protected]>
> + *
> + * This file is part of FFmpeg.
ditto
> + * 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
> + */
the rest looks OK
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
