From 9da4e2dde0da695c240cf48390217ac97cb10c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 19 Dec 2007 02:59:06 +0100 Subject: Update all the code to the new headers layout. --- src/libmpeg2/motion_comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libmpeg2/motion_comp.c') diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c index 8779c1296..9328dfb9f 100644 --- a/src/libmpeg2/motion_comp.c +++ b/src/libmpeg2/motion_comp.c @@ -27,7 +27,7 @@ #include #include "mpeg2_internal.h" -#include "xineutils.h" +#include mpeg2_mc_t mpeg2_mc; -- cgit v1.2.3 From b7a18f2d1b7afe26d1816621178a52c527d773f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 22 Dec 2007 23:24:00 +0100 Subject: Move libmpeg2 inside video_dec/libmpeg2. --HG-- rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am rename : src/libmpeg2/cpu_state.c => src/video_dec/libmpeg2/cpu_state.c rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c rename : src/libmpeg2/header.c => src/video_dec/libmpeg2/header.c rename : src/libmpeg2/idct.c => src/video_dec/libmpeg2/idct.c rename : src/libmpeg2/idct_altivec.c => src/video_dec/libmpeg2/idct_altivec.c rename : src/libmpeg2/idct_mlib.c => src/video_dec/libmpeg2/idct_mlib.c rename : src/libmpeg2/idct_mlib.h => src/video_dec/libmpeg2/idct_mlib.h rename : src/libmpeg2/idct_mmx.c => src/video_dec/libmpeg2/idct_mmx.c rename : src/libmpeg2/libmpeg2_accel.c => src/video_dec/libmpeg2/libmpeg2_accel.c rename : src/libmpeg2/libmpeg2_accel.h => src/video_dec/libmpeg2/libmpeg2_accel.h rename : src/libmpeg2/motion_comp.c => src/video_dec/libmpeg2/motion_comp.c rename : src/libmpeg2/motion_comp_altivec.c => src/video_dec/libmpeg2/motion_comp_altivec.c rename : src/libmpeg2/motion_comp_mlib.c => src/video_dec/libmpeg2/motion_comp_mlib.c rename : src/libmpeg2/motion_comp_mmx.c => src/video_dec/libmpeg2/motion_comp_mmx.c rename : src/libmpeg2/motion_comp_vis.c => src/video_dec/libmpeg2/motion_comp_vis.c rename : src/libmpeg2/mpeg2.h => src/video_dec/libmpeg2/mpeg2.h rename : src/libmpeg2/mpeg2_internal.h => src/video_dec/libmpeg2/mpeg2_internal.h rename : src/libmpeg2/slice.c => src/video_dec/libmpeg2/slice.c rename : src/libmpeg2/slice_xvmc.c => src/video_dec/libmpeg2/slice_xvmc.c rename : src/libmpeg2/slice_xvmc_vld.c => src/video_dec/libmpeg2/slice_xvmc_vld.c rename : src/libmpeg2/stats.c => src/video_dec/libmpeg2/stats.c rename : src/libmpeg2/vis.h => src/video_dec/libmpeg2/vis.h rename : src/libmpeg2/vlc.h => src/video_dec/libmpeg2/vlc.h rename : src/libmpeg2/xine_mpeg2_decoder.c => src/video_dec/libmpeg2/xine_mpeg2_decoder.c rename : src/libmpeg2/xvmc.h => src/video_dec/libmpeg2/xvmc.h rename : src/libmpeg2/xvmc_vld.h => src/video_dec/libmpeg2/xvmc_vld.h --- src/libmpeg2/motion_comp.c | 154 --------------------------------------------- 1 file changed, 154 deletions(-) delete mode 100644 src/libmpeg2/motion_comp.c (limited to 'src/libmpeg2/motion_comp.c') diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c deleted file mode 100644 index 9328dfb9f..000000000 --- a/src/libmpeg2/motion_comp.c +++ /dev/null @@ -1,154 +0,0 @@ -/* - * motion_comp.c - * Copyright (C) 2000-2002 Michel Lespinasse - * Copyright (C) 1999-2000 Aaron Holtzman - * - * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. - * See http://libmpeg2.sourceforge.net/ for updates. - * - * mpeg2dec is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpeg2dec 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" - -#include -#include - -#include "mpeg2_internal.h" -#include - -mpeg2_mc_t mpeg2_mc; - -void mpeg2_mc_init (uint32_t mm_accel) -{ -#ifdef LIBMPEG2_MLIB - if (mm_accel & MM_ACCEL_MLIB) { -#ifdef LOG - fprintf (stderr, "Using mediaLib for motion compensation\n"); -#endif - mpeg2_mc = mpeg2_mc_mlib; - } -#endif - -#if defined(ARCH_X86) || defined(ARCH_X86_64) - if (mm_accel & MM_ACCEL_X86_MMXEXT) { -#ifdef LOG - fprintf (stderr, "Using MMXEXT for motion compensation\n"); -#endif - mpeg2_mc = mpeg2_mc_mmxext; - } else if (mm_accel & MM_ACCEL_X86_3DNOW) { -#ifdef LOG - fprintf (stderr, "Using 3DNOW for motion compensation\n"); -#endif - mpeg2_mc = mpeg2_mc_3dnow; - } else if (mm_accel & MM_ACCEL_X86_MMX) { -#ifdef LOG - fprintf (stderr, "Using MMX for motion compensation\n"); -#endif - mpeg2_mc = mpeg2_mc_mmx; - } else -#endif -#if defined (ARCH_PPC) && defined (ENABLE_ALTIVEC) - if (mm_accel & MM_ACCEL_PPC_ALTIVEC) { -#ifdef LOG - fprintf (stderr, "Using altivec for motion compensation\n"); -#endif - mpeg2_mc = mpeg2_mc_altivec; - } else -#endif -#ifdef ARCH_SPARC - if (mm_accel & MM_ACCEL_SPARC_VIS) { -#ifdef LOG - fprintf (stderr, "Using VIS for motion compensation\n"); -#endif - mpeg2_mc = mpeg2_mc_vis; - } else -#endif - { -#ifdef LOG - fprintf (stderr, "No accelerated motion compensation found\n"); -#endif - mpeg2_mc = mpeg2_mc_c; - } -} - -#define avg2(a,b) ((a+b+1)>>1) -#define avg4(a,b,c,d) ((a+b+c+d+2)>>2) - -#define predict_o(i) (ref[i]) -#define predict_x(i) (avg2 (ref[i], ref[i+1])) -#define predict_y(i) (avg2 (ref[i], (ref+stride)[i])) -#define predict_xy(i) (avg4 (ref[i], ref[i+1], \ - (ref+stride)[i], (ref+stride)[i+1])) - -#define put(predictor,i) dest[i] = predictor (i) -#define avg(predictor,i) dest[i] = avg2 (predictor (i), dest[i]) - -/* mc function template */ - -#define MC_FUNC(op,xy) \ -static void MC_##op##_##xy##_16_c (uint8_t * dest, uint8_t * ref, \ - int stride, int height) \ -{ \ - do { \ - op (predict_##xy, 0); \ - op (predict_##xy, 1); \ - op (predict_##xy, 2); \ - op (predict_##xy, 3); \ - op (predict_##xy, 4); \ - op (predict_##xy, 5); \ - op (predict_##xy, 6); \ - op (predict_##xy, 7); \ - op (predict_##xy, 8); \ - op (predict_##xy, 9); \ - op (predict_##xy, 10); \ - op (predict_##xy, 11); \ - op (predict_##xy, 12); \ - op (predict_##xy, 13); \ - op (predict_##xy, 14); \ - op (predict_##xy, 15); \ - ref += stride; \ - dest += stride; \ - } while (--height); \ -} \ -static void MC_##op##_##xy##_8_c (uint8_t * dest, uint8_t * ref, \ - int stride, int height) \ -{ \ - do { \ - op (predict_##xy, 0); \ - op (predict_##xy, 1); \ - op (predict_##xy, 2); \ - op (predict_##xy, 3); \ - op (predict_##xy, 4); \ - op (predict_##xy, 5); \ - op (predict_##xy, 6); \ - op (predict_##xy, 7); \ - ref += stride; \ - dest += stride; \ - } while (--height); \ -} - -/* definitions of the actual mc functions */ - -MC_FUNC (put,o) -MC_FUNC (avg,o) -MC_FUNC (put,x) -MC_FUNC (avg,x) -MC_FUNC (put,y) -MC_FUNC (avg,y) -MC_FUNC (put,xy) -MC_FUNC (avg,xy) - -MPEG2_MC_EXTERN (c) -- cgit v1.2.3