--- mem_transfer.h 2003/02/12 11:44:57 1.8.2.3 +++ mem_transfer.h 2002/11/17 00:51:11 1.11 @@ -3,41 +3,57 @@ * XVID MPEG-4 VIDEO CODEC * - 8<->16 bit buffer transfer header - * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. - * - * This program 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 + * Copyright(C) 2002 Michael Militzer + * + * This file is part of XviD, a free MPEG-4 video encoder/decoder + * + * XviD 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. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY ; without even the implied warranty of + * 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ****************************************************************************/ -/***************************************************************************** - * - * History + * Under section 8 of the GNU General Public License, the copyright + * holders of XVID explicitly forbid distribution in the following + * countries: + * + * - Japan + * - United States of America + * + * Linking XviD statically or dynamically with other modules is making a + * combined work based on XviD. Thus, the terms and conditions of the + * GNU General Public License cover the whole combination. + * + * As a special exception, the copyright holders of XviD give you + * permission to link XviD with independent modules that communicate with + * XviD solely through the VFW1.1 and DShow interfaces, regardless of the + * license terms of these independent modules, and to copy and distribute + * the resulting combined work under terms of your choice, provided that + * every copy of the combined work is accompanied by a complete copy of + * the source code of XviD (the version of XviD used to produce the + * combined work), being distributed under the terms of the GNU General + * Public License plus this exception. An independent module is a module + * which is not derived from or based on XviD. + * + * Note that people who make modified versions of XviD are not obligated + * to grant this special exception for their modified versions; it is + * their choice whether to do so. The GNU General Public License gives + * permission to release a modified version without this exception; this + * exception also makes it possible to release a modified version which + * carries forward this exception. * - * - Sun Jun 16 00:12:49 2002 Added legal header - * Cosmetic - * $Id: mem_transfer.h,v 1.8.2.3 2003/02/12 11:44:57 syskin Exp $ + * $Id: mem_transfer.h,v 1.11 2002/11/17 00:51:11 edgomez Exp $ * ****************************************************************************/ - #ifndef _MEM_TRANSFER_H #define _MEM_TRANSFER_H @@ -57,7 +73,6 @@ /* Implemented functions */ TRANSFER_8TO16COPY transfer_8to16copy_c; TRANSFER_8TO16COPY transfer_8to16copy_mmx; -TRANSFER_8TO16COPY transfer_8to16copy_3dne; TRANSFER_8TO16COPY transfer_8to16copy_ia64; /***************************************************************************** @@ -75,11 +90,10 @@ /* Implemented functions */ TRANSFER_16TO8COPY transfer_16to8copy_c; TRANSFER_16TO8COPY transfer_16to8copy_mmx; -TRANSFER_16TO8COPY transfer_16to8copy_3dne; TRANSFER_16TO8COPY transfer_16to8copy_ia64; /***************************************************************************** - * transfer8to16 + substraction *writeback* op API + * transfer8to16 + substraction op API ****************************************************************************/ typedef void (TRANSFER_8TO16SUB) (int16_t * const dct, @@ -95,29 +109,9 @@ /* Implemented functions */ TRANSFER_8TO16SUB transfer_8to16sub_c; TRANSFER_8TO16SUB transfer_8to16sub_mmx; -TRANSFER_8TO16SUB transfer_8to16sub_3dne; TRANSFER_8TO16SUB transfer_8to16sub_ia64; /***************************************************************************** - * transfer8to16 + substraction *readonly* op API - ****************************************************************************/ - -typedef void (TRANSFER_8TO16SUBRO) (int16_t * const dct, - const uint8_t * const cur, - const uint8_t * ref, - const uint32_t stride); - -typedef TRANSFER_8TO16SUBRO *TRANSFER_8TO16SUBRO_PTR; - -/* Our global function pointer - Initialized in xvid.c */ -extern TRANSFER_8TO16SUBRO_PTR transfer_8to16subro; - -/* Implemented functions */ -TRANSFER_8TO16SUBRO transfer_8to16subro_c; -TRANSFER_8TO16SUBRO transfer_8to16subro_mmx; -TRANSFER_8TO16SUBRO transfer_8to16subro_3dne; - -/***************************************************************************** * transfer8to16 + substraction op API - Bidirectionnal Version ****************************************************************************/ @@ -136,7 +130,6 @@ TRANSFER_8TO16SUB2 transfer_8to16sub2_c; TRANSFER_8TO16SUB2 transfer_8to16sub2_mmx; TRANSFER_8TO16SUB2 transfer_8to16sub2_xmm; -TRANSFER_8TO16SUB2 transfer_8to16sub2_3dne; TRANSFER_8TO16SUB2 transfer_8to16sub2_ia64; @@ -156,7 +149,6 @@ /* Implemented functions */ TRANSFER_16TO8ADD transfer_16to8add_c; TRANSFER_16TO8ADD transfer_16to8add_mmx; -TRANSFER_16TO8ADD transfer_16to8add_3dne; TRANSFER_16TO8ADD transfer_16to8add_ia64; /***************************************************************************** @@ -175,31 +167,6 @@ /* Implemented functions */ TRANSFER8X8_COPY transfer8x8_copy_c; TRANSFER8X8_COPY transfer8x8_copy_mmx; -TRANSFER8X8_COPY transfer8x8_copy_3dne; TRANSFER8X8_COPY transfer8x8_copy_ia64; - -static __inline void -transfer16x16_copy(uint8_t * const dst, - const uint8_t * const src, - const uint32_t stride) -{ - transfer8x8_copy(dst, src, stride); - transfer8x8_copy(dst + 8, src + 8, stride); - transfer8x8_copy(dst + 8*stride, src + 8*stride, stride); - transfer8x8_copy(dst + 8*stride + 8, src + 8*stride + 8, stride); -} - -static __inline void -transfer32x32_copy(uint8_t * const dst, - const uint8_t * const src, - const uint32_t stride) -{ - transfer16x16_copy(dst, src, stride); - transfer16x16_copy(dst + 16, src + 16, stride); - transfer16x16_copy(dst + 16*stride, src + 16*stride, stride); - transfer16x16_copy(dst + 16*stride + 16, src + 16*stride + 16, stride); -} - - #endif