From 13b6b7e0e233265e42f98455f372c9a2582b6eca Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 28 Aug 2012 23:15:39 +0200 Subject: [PATCH 1/3] Delete motion-test tool; it is of doubtful utility. --- libavcodec/Makefile | 1 - libavcodec/motion-test.c | 149 --------------------------------------- 2 files changed, 150 deletions(-) delete mode 100644 libavcodec/motion-test.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7b3dc22d7c..caf91f37f1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -692,7 +692,6 @@ TESTPROGS = cabac \ iirfilter \ rangecoder \ -TESTPROGS-$(HAVE_MMX) += motion TESTOBJS = dctref.o HOSTPROGS = aac_tablegen \ diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c deleted file mode 100644 index bc4f0dae7f..0000000000 --- a/libavcodec/motion-test.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - * (c) 2001 Fabrice Bellard - * - * This file is part of Libav. - * - * Libav 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. - * - * Libav 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 Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * motion test. - */ - -#include -#include -#include - -#include "config.h" -#include "dsputil.h" -#include "libavutil/internal.h" -#include "libavutil/lfg.h" -#include "libavutil/mem.h" -#include "libavutil/time.h" - -#undef printf - -#define WIDTH 64 -#define HEIGHT 64 - -static uint8_t img1[WIDTH * HEIGHT]; -static uint8_t img2[WIDTH * HEIGHT]; - -static void fill_random(uint8_t *tab, int size) -{ - int i; - AVLFG prng; - - av_lfg_init(&prng, 1); - for(i=0;i 1) { - help(); - return 1; - } - - printf("Libav motion test\n"); - - ctx = avcodec_alloc_context3(NULL); - ctx->dsp_mask = AV_CPU_FLAG_FORCE; - ff_dsputil_init(&cctx, ctx); - for (c = 0; c < flags_size; c++) { - int x; - ctx->dsp_mask = AV_CPU_FLAG_FORCE | flags[c]; - ff_dsputil_init(&mmxctx, ctx); - - for (x = 0; x < 2; x++) { - printf("%s for %dx%d pixels\n", c ? "mmx2" : "mmx", - x ? 8 : 16, x ? 8 : 16); - test_motion("mmx", mmxctx.pix_abs[x][0], cctx.pix_abs[x][0]); - test_motion("mmx_x2", mmxctx.pix_abs[x][1], cctx.pix_abs[x][1]); - test_motion("mmx_y2", mmxctx.pix_abs[x][2], cctx.pix_abs[x][2]); - test_motion("mmx_xy2", mmxctx.pix_abs[x][3], cctx.pix_abs[x][3]); - } - } - av_free(ctx); - - return 0; -} From 7681b8837a2679991c022c0f2e70dc08b81f942d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 3 Sep 2012 11:21:19 +0200 Subject: [PATCH 2/3] intrax8dsp: Add missing #include to make header standalone --- libavcodec/intrax8dsp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/intrax8dsp.h b/libavcodec/intrax8dsp.h index d67fa4eda5..5c3cc4aa74 100644 --- a/libavcodec/intrax8dsp.h +++ b/libavcodec/intrax8dsp.h @@ -19,6 +19,8 @@ #ifndef AVCODEC_INTRAX8DSP_H #define AVCODEC_INTRAX8DSP_H +#include + typedef struct IntraX8DSPContext { void (*v_loop_filter)(uint8_t *src, int stride, int qscale); void (*h_loop_filter)(uint8_t *src, int stride, int qscale); From eb239a577fcf1f19cdaa7aeb6e6586a172ee59c1 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 14 Aug 2012 01:57:22 +0200 Subject: [PATCH 3/3] build: avcodec: order cosmetics --- libavcodec/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index caf91f37f1..efd1698f0c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -33,10 +33,10 @@ OBJS = allcodecs.o \ # parts needed for many different codecs OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o OBJS-$(CONFIG_AC3DSP) += ac3dsp.o -OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DWT) += dwt.o OBJS-$(CONFIG_DXVA2) += dxva2.o +OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \ @@ -600,6 +600,7 @@ OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o # parsers OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ aacadtsdec.o mpeg4audio.o +OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o \ aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o @@ -619,7 +620,6 @@ OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o \ h264_refs.o h264_sei.o h264_direct.o \ h264_loopfilter.o h264_cabac.o \ h264_cavlc.o h264_ps.o -OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \