From f4b5a723b06b25babe201b0a97bdeebc716f5bba Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 14 Apr 2007 16:35:44 +0000 Subject: mpeg2dec in mpegplayer: Do a little code slashing and organizing. Much more to come I think. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13159 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/mpegplayer/motion_comp_arm.c | 183 ------------------------------ 1 file changed, 183 deletions(-) delete mode 100644 apps/plugins/mpegplayer/motion_comp_arm.c (limited to 'apps/plugins/mpegplayer/motion_comp_arm.c') diff --git a/apps/plugins/mpegplayer/motion_comp_arm.c b/apps/plugins/mpegplayer/motion_comp_arm.c deleted file mode 100644 index ec9eddab72..0000000000 --- a/apps/plugins/mpegplayer/motion_comp_arm.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - * motion_comp_arm.c - * Copyright (C) 2004 AGAWA Koji - * - * 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 "mpeg2dec_config.h" - -#include - -#include "mpeg2.h" -#include "attributes.h" -#include "mpeg2_internal.h" - -#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) \ -inline static void MC_##op##_##xy##_16_c (uint8_t * dest, const uint8_t * ref, \ - const 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, const uint8_t * ref, \ - const 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) - - -extern void MC_put_o_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height); - -extern void MC_put_x_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height); - - -static void MC_put_y_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_put_y_16_c(dest, ref, stride, height); -} - -static void MC_put_xy_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_put_xy_16_c(dest, ref, stride, height); -} - -extern void MC_put_o_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height); - -extern void MC_put_x_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height); - -static void MC_put_y_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_put_y_8_c(dest, ref, stride, height); -} - -static void MC_put_xy_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_put_xy_8_c(dest, ref, stride, height); -} - -static void MC_avg_o_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_o_16_c(dest, ref, stride, height); -} - -static void MC_avg_x_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_x_16_c(dest, ref, stride, height); -} - -static void MC_avg_y_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_y_16_c(dest, ref, stride, height); -} - -static void MC_avg_xy_16_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_xy_16_c(dest, ref, stride, height); -} - -static void MC_avg_o_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_o_8_c(dest, ref, stride, height); -} - -static void MC_avg_x_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_x_8_c(dest, ref, stride, height); -} - -static void MC_avg_y_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_y_8_c(dest, ref, stride, height); -} - -static void MC_avg_xy_8_arm (uint8_t * dest, const uint8_t * ref, - int stride, int height) -{ - MC_avg_xy_8_c(dest, ref, stride, height); -} - -MPEG2_MC_EXTERN (arm) -- cgit v1.2.3