Merge "Remove mips specific files"
diff --git a/common/mips/icv_platform_macros.h b/common/mips/icv_platform_macros.h
deleted file mode 100644
index 61da7f5..0000000
--- a/common/mips/icv_platform_macros.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/******************************************************************************
- *
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *****************************************************************************
- * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
-*/
-/**
-*******************************************************************************
-* @file
-* icv_platform_macros.h
-*
-* @brief
-* This header files contains all the platform/toolchain specific macros
-*
-* @author
-* Ittiam
-*
-* @par List of Functions:
-*
-* @remarks
-* None
-*
-*******************************************************************************
-*/
-#ifndef _ICV_PLATFORM_MACROS_H_
-#define _ICV_PLATFORM_MACROS_H_
-
-static __inline UWORD32 CLZ(UWORD32 u4_word)
-{
- if(u4_word)
- return(__builtin_clz(u4_word));
- else
- return 32;
-}
-
-static __inline UWORD32 CLZNZ(UWORD32 u4_word)
-{
- ASSERT(u4_word);
- return(__builtin_clz(u4_word));
-}
-
-static __inline UWORD32 CTZ(UWORD32 u4_word)
-{
- if(0 == u4_word)
- return 31;
- else
- {
- unsigned int index;
- index = __builtin_ctz(u4_word);
- return (UWORD32)index;
- }
-}
-
-#define CLIP_U8(x) CLIP3(0, 255, (x))
-#define CLIP_S8(x) CLIP3(-128, 127, (x))
-
-#define CLIP_U10(x) CLIP3(0, 1023, (x))
-#define CLIP_S10(x) CLIP3(-512, 511, (x))
-
-#define CLIP_U12(x) CLIP3(0, 4095, (x))
-#define CLIP_S12(x) CLIP3(-2048, 2047, (x))
-
-#define CLIP_U16(x) CLIP3(0, 65535, (x))
-#define CLIP_S16(x) CLIP3(-32768, 32767, (x))
-
-#define ITT_BIG_ENDIAN(x) __builtin_bswap32(x);
-
-#define NOP(nop_cnt) {UWORD32 nop_i; for (nop_i = 0; nop_i < nop_cnt; nop_i++) asm("nop");}
-#define PREFETCH(x) __builtin_prefetch(x);
-
-#define DATA_SYNC() __sync_synchronize()
-
-#define SHL(x,y) (((y) < 32) ? ((x) << (y)) : 0)
-#define SHR(x,y) (((y) < 32) ? ((x) >> (y)) : 0)
-
-#define SHR_NEG(val,shift) (((shift) > 0) ? ( (val) >> (shift)) : ((val) << (-(shift))))
-#define SHL_NEG(val,shift) (((shift) > 0) ? ( (val) >> (-(shift))) : ((val) << (shift)))
-
-#define INLINE inline
-
-#define MEM_ALIGN8 __attribute__ ((aligned (8)))
-#define MEM_ALIGN16 __attribute__ ((aligned (16)))
-#define MEM_ALIGN32 __attribute__ ((aligned (32)))
-
-
-#endif /* _ICV_PLATFORM_MACROS_H_ */
diff --git a/common/mips/ideint_function_selector.c b/common/mips/ideint_function_selector.c
deleted file mode 100644
index 0e3ae70..0000000
--- a/common/mips/ideint_function_selector.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/******************************************************************************
- *
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *****************************************************************************
- * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
-*/
-/**
-*******************************************************************************
-* @file
-* ideint_function_selector.c
-*
-* @brief
-* This file contains the function selector related code
-*
-* @author
-* Ittiam
-*
-* @par List of Functions:
-* ih264e_init_function_ptr
-*
-* @remarks
-* None
-*
-*******************************************************************************
-*/
-/*****************************************************************************/
-/* File Includes */
-/*****************************************************************************/
-/* System include files */
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-
-/* User include files */
-#include "icv_datatypes.h"
-#include "icv_macros.h"
-#include "icv_platform_macros.h"
-#include "icv.h"
-#include "icv_variance.h"
-#include "icv_sad.h"
-#include "ideint.h"
-
-#include "ideint_defs.h"
-#include "ideint_structs.h"
-#include "ideint_utils.h"
-#include "ideint_cac.h"
-#include "ideint_debug.h"
-#include "ideint_function_selector.h"
-
-
-/**
-*******************************************************************************
-*
-* @brief
-* Call corresponding function pointer initialization function
-*
-* @par Description
-* Call corresponding function pointer initialization function
-*
-* @param[in] ps_ctxt
-* Context
-*
-* @returns none
-*
-* @remarks none
-*
-*******************************************************************************
-*/
-void ideint_init_function_ptr(ctxt_t *ps_ctxt)
-{
- ideint_init_function_ptr_generic(ps_ctxt);
-}
-
-/**
-*******************************************************************************
-*
-* @brief Determine the architecture of the encoder executing environment
-*
-* @par Description: This routine returns the architecture of the enviro-
-* ment in which the current encoder is being tested
-*
-* @param[in] void
-*
-* @returns IV_ARCH_T
-* architecture
-*
-* @remarks none
-*
-*******************************************************************************
-*/
-ICV_ARCH_T ideint_default_arch(void)
-{
- return ICV_MIPS_GENERIC;
-}
diff --git a/common/mips/impeg2_platform_macros.h b/common/mips/impeg2_platform_macros.h
deleted file mode 100644
index 183f1fa..0000000
--- a/common/mips/impeg2_platform_macros.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- *
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *****************************************************************************
- * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
-*/
-#ifndef __IMPEG2_PLATFORM_MACROS_H__
-#define __IMPEG2_PLATFORM_MACROS_H__
-
-
-#define CONV_LE_TO_BE(u4_temp2,u4_temp1) u4_temp2 = (u4_temp1 << 24) | \
- ((u4_temp1 & 0xff00) << 8) | \
- ((u4_temp1 & 0xff0000) >> 8) | \
- (u4_temp1 >> 24);
-static __inline UWORD32 CLZ(UWORD32 u4_word)
-{
- if(u4_word)
- return (__builtin_clz(u4_word));
- else
- return 32;
-}
-
-
-#define CLIP_U8(x) ((x) > 255) ? (255) : (((x) < 0) ? (0) : (x))
-#define CLIP_S8(x) ((x) > 127) ? (127) : (((x) < -128) ? (-128) : (x))
-
-#define CLIP_U12(x) ((x) > 4095) ? (4095) : (((x) < 0) ? (0) : (x))
-#define CLIP_S12(x) ((x) > 2047) ? (2047) : (((x) < -2048) ? (-2048) : (x))
-
-#define CLIP_U16(x) ((x) > 65535) ? (65535) : (((x) < 0) ? (0) : (x))
-#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x))
-#define PLD(x)
-
-#define INLINE
-
-#endif /* __IMPEG2_PLATFORM_MACROS_H__ */
diff --git a/decoder/mips/impeg2d_function_selector.c b/decoder/mips/impeg2d_function_selector.c
deleted file mode 100644
index 3b2677a..0000000
--- a/decoder/mips/impeg2d_function_selector.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- *
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *****************************************************************************
- * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
-*/
-/**
-*******************************************************************************
-* @file
-* impeg2d_function_selector.c
-*
-* @brief
-* Contains functions to initialize function pointers used in mpeg2
-*
-* @author
-* Naveen
-*
-* @par List of Functions:
-* @remarks
-* None
-*
-*******************************************************************************
-*/
-/*****************************************************************************/
-/* File Includes */
-/*****************************************************************************/
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "iv_datatypedef.h"
-#include "iv.h"
-
-#include "impeg2_buf_mgr.h"
-#include "impeg2_disp_mgr.h"
-#include "impeg2_defs.h"
-#include "impeg2_platform_macros.h"
-#include "impeg2_inter_pred.h"
-#include "impeg2_idct.h"
-#include "impeg2_globals.h"
-#include "impeg2_mem_func.h"
-#include "impeg2_format_conv.h"
-#include "impeg2_macros.h"
-
-#include "ivd.h"
-#include "impeg2d.h"
-#include "impeg2d_bitstream.h"
-#include "impeg2d_structs.h"
-#include "impeg2d_vld_tables.h"
-#include "impeg2d_vld.h"
-#include "impeg2d_pic_proc.h"
-#include "impeg2d_debug.h"
-#include "impeg2d_mc.h"
-#include "impeg2d_function_selector.h"
-
-void impeg2d_init_function_ptr(void *pv_codec)
-{
- dec_state_t *ps_codec = (dec_state_t *)pv_codec;
-
- impeg2d_init_function_ptr_generic(ps_codec);
-}
-
-void impeg2d_init_arch(void *pv_codec)
-{
- dec_state_t *ps_codec = (dec_state_t *)pv_codec;
-
- ps_codec->e_processor_arch = ARCH_NA;
-}
