diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 43d73a742ec42262dea26ff1d4cb284bbfdda844..10bd5e6d1500a0866b2f0803fba4f6ff74bf9598 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -70,7 +70,7 @@ OBJS-$(CONFIG_LLVIDDSP) += lossless_videodsp.o OBJS-$(CONFIG_LPC) += lpc.o OBJS-$(CONFIG_LSP) += lsp.o OBJS-$(CONFIG_MDCT) += mdct_fixed.o mdct_float.o mdct_fixed_32.o -OBJS-$(CONFIG_ME_CMP) += me_cmp.o dsputil_compat.o +OBJS-$(CONFIG_ME_CMP) += me_cmp.o OBJS-$(CONFIG_MPEG_ER) += mpeg_er.o OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodata.o \ mpegaudiodecheader.o diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h deleted file mode 100644 index 2f4be85ab766410a7435485d6e500aee61a08eee..0000000000000000000000000000000000000000 --- a/libavcodec/dsputil.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * DSP utils - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> - * - * 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 - */ - -/** - * @file - * DSP utils. - * This is deprecated - */ - -#ifndef AVCODEC_DSPUTIL_H -#define AVCODEC_DSPUTIL_H - -#include "avcodec.h" -#include "version.h" -#include "me_cmp.h" - -#if FF_API_DSPUTIL - -/* minimum alignment rules ;) - * If you notice errors in the align stuff, need more alignment for some ASM code - * for some CPU or need to use a function with less aligned data then send a mail - * to the ffmpeg-devel mailing list, ... - * - * !warning These alignments might not match reality, (missing attribute((align)) - * stuff somewhere possible). - * I (Michael) did not check them, these are just the alignments which I think - * could be reached easily ... - * - * !future video codecs might need functions with less strict alignment - */ - -struct MpegEncContext; - -/** - * DSPContext. - */ -typedef struct DSPContext { - int (*sum_abs_dctelem)(int16_t *block /* align 16 */); - - me_cmp_func sad[6]; /* identical to pix_absAxA except additional void * */ - me_cmp_func sse[6]; - me_cmp_func hadamard8_diff[6]; - me_cmp_func dct_sad[6]; - me_cmp_func quant_psnr[6]; - me_cmp_func bit[6]; - me_cmp_func rd[6]; - me_cmp_func vsad[6]; - me_cmp_func vsse[6]; - me_cmp_func nsse[6]; - me_cmp_func w53[6]; - me_cmp_func w97[6]; - me_cmp_func dct_max[6]; - me_cmp_func dct264_sad[6]; - - me_cmp_func me_pre_cmp[6]; - me_cmp_func me_cmp[6]; - me_cmp_func me_sub_cmp[6]; - me_cmp_func mb_cmp[6]; - me_cmp_func ildct_cmp[6]; // only width 16 used - me_cmp_func frame_skip_cmp[6]; // only width 8 used - - me_cmp_func pix_abs[2][4]; -} DSPContext; - -attribute_deprecated void avpriv_dsputil_init(DSPContext* p, AVCodecContext *avctx); - -#endif -#endif /* AVCODEC_DSPUTIL_H */ diff --git a/libavcodec/dsputil_compat.c b/libavcodec/dsputil_compat.c deleted file mode 100644 index 7ac1099f1602cdcef05953b2c598647c081aac57..0000000000000000000000000000000000000000 --- a/libavcodec/dsputil_compat.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * DSP utils - * - * 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 "me_cmp.h" -#include "dsputil.h" - -#if FF_API_DSPUTIL - -void avpriv_dsputil_init(DSPContext* p, AVCodecContext *avctx) -{ - MECmpContext mecc; - - ff_me_cmp_init(&mecc, avctx); -#define COPY(name) memcpy(&p->name, &mecc.name, sizeof(p->name)) - COPY(sum_abs_dctelem); - COPY(sad); - COPY(sse); - COPY(hadamard8_diff); - COPY(dct_sad); - COPY(quant_psnr); - COPY(bit); - COPY(rd); - COPY(vsad); - COPY(vsse); - COPY(nsse); - COPY(w53); - COPY(w97); - COPY(dct_max); - COPY(dct264_sad); - COPY(me_pre_cmp); - COPY(me_cmp); - COPY(me_sub_cmp); - COPY(mb_cmp); - COPY(ildct_cmp); - COPY(frame_skip_cmp); - COPY(pix_abs); -} - -#endif diff --git a/libavcodec/version.h b/libavcodec/version.h index 866488409904d87735edace043eeec8ec281c14c..7b303344e82671a21699ecea3d34b75b7858d5c1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -141,9 +141,6 @@ #ifndef FF_API_EMU_EDGE #define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 57) #endif -#ifndef FF_API_DSPUTIL -#define FF_API_DSPUTIL (LIBAVCODEC_VERSION_MAJOR < 56) -#endif #ifndef FF_API_ARCH_SH4 #define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 57) #endif