From e8b0093646bf740f7549fdb9fae938e37f1715be Mon Sep 17 00:00:00 2001 From: Mao Han Date: Tue, 23 Feb 2021 17:06:51 +0800 Subject: [PATCH] Add riscv64 support Use generic function pointers on riscv. Test: built for aosp_riscv64 Signed-off-by: Mao Han Change-Id: I424d15396d7e9711d23a6118f92aee0fc7924c28 --- Android.bp | 26 +++++ common/riscv/ih264_platform_macros.h | 109 ++++++++++++++++++ decoder/riscv/ih264d_function_selector.c | 66 +++++++++++ encoder/riscv/ih264e_function_selector.c | 110 +++++++++++++++++++ encoder/riscv/ih264e_platform_macros.h | 134 +++++++++++++++++++++++ encoder/riscv/ime_platform_macros.h | 52 +++++++++ 6 files changed, 497 insertions(+) create mode 100644 common/riscv/ih264_platform_macros.h create mode 100644 decoder/riscv/ih264d_function_selector.c create mode 100644 encoder/riscv/ih264e_function_selector.c create mode 100644 encoder/riscv/ih264e_platform_macros.h create mode 100644 encoder/riscv/ime_platform_macros.h diff --git a/Android.bp b/Android.bp index 992e8ed..5cd62e2 100644 --- a/Android.bp +++ b/Android.bp @@ -97,6 +97,12 @@ cc_defaults { ], }, + riscv64: { + local_include_dirs: [ + "common/riscv", + ], + }, + x86: { cflags: [ "-DX86", @@ -256,6 +262,15 @@ cc_library_static { ], }, + riscv64: { + local_include_dirs: [ + "common/riscv", + ], + srcs: [ + "decoder/riscv/ih264d_function_selector.c", + ], + }, + x86: { srcs: [ "decoder/x86/ih264d_function_selector.c", @@ -509,6 +524,17 @@ cc_library_static { ], }, + riscv64: { + local_include_dirs: [ + "common/riscv", + "encoder/riscv", + ], + + srcs: [ + "encoder/riscv/ih264e_function_selector.c", + ], + }, + x86: { cflags: [ "-DX86", diff --git a/common/riscv/ih264_platform_macros.h b/common/riscv/ih264_platform_macros.h new file mode 100644 index 0000000..2b0b0d1 --- /dev/null +++ b/common/riscv/ih264_platform_macros.h @@ -0,0 +1,109 @@ +/****************************************************************************** + * + * 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 +* ih264_platform_macros.h +* +* @brief +* Platform specific Macro definitions used in the codec +* +* @author +* Ittiam +* +* @remarks +* None +* +******************************************************************************* +*/ + + +#ifndef _IH264_PLATFORM_MACROS_H_ +#define _IH264_PLATFORM_MACROS_H_ + +#include + +#define CLIP_U8(x) CLIP3(0, UINT8_MAX, (x)) +#define CLIP_S8(x) CLIP3(INT8_MIN, INT8_MAX, (x)) + +#define CLIP_U10(x) CLIP3(0, 1023, (x)) +#define CLIP_S10(x) CLIP3(-512, 511, (x)) + +#define CLIP_U11(x) CLIP3(0, 2047, (x)) +#define CLIP_S11(x) CLIP3(-1024, 1023, (x)) + +#define CLIP_U12(x) CLIP3(0, 4095, (x)) +#define CLIP_S12(x) CLIP3(-2048, 2047, (x)) + +#define CLIP_U16(x) CLIP3(0, UINT16_MAX, (x)) +#define CLIP_S16(x) CLIP3(INT16_MIN, INT16_MAX, (x)) + +#define CLIP_U32(x) CLIP3(0, UINT32_MAX, (x)) +#define CLIP_S32(x) CLIP3(INT32_MIN, INT32_MAX, (x)) + +#define MEM_ALIGN16 __attribute__ ((aligned (16))) + +#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< +#include +#include +#include + +/* User Include files */ +#include "ih264_typedefs.h" +#include "iv.h" +#include "ivd.h" +#include "ih264_defs.h" +#include "ih264_size_defs.h" +#include "ih264_error.h" +#include "ih264_trans_quant_itrans_iquant.h" +#include "ih264_inter_pred_filters.h" + +#include "ih264d_structs.h" +#include "ih264d_function_selector.h" + +void ih264d_init_function_ptr(dec_struct_t *ps_codec) +{ + ih264d_init_function_ptr_generic(ps_codec); +} +void ih264d_init_arch(dec_struct_t *ps_codec) +{ + ps_codec->e_processor_arch = ARCH_NA; +} diff --git a/encoder/riscv/ih264e_function_selector.c b/encoder/riscv/ih264e_function_selector.c new file mode 100644 index 0000000..14b2082 --- /dev/null +++ b/encoder/riscv/ih264e_function_selector.c @@ -0,0 +1,110 @@ +/****************************************************************************** + * + * 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 +* ih264e_function_selector.c +* +* @brief +* Contains functions to initialize function pointers used in h264 +* +* @author +* Ittiam +* +* @par List of Functions: +* +* @remarks +* None +* +******************************************************************************* +*/ + + +/*****************************************************************************/ +/* File Includes */ +/*****************************************************************************/ + +/* System Include Files */ +#include +#include +#include +#include + +/* User Include Files */ +#include "ih264_typedefs.h" +#include "iv2.h" +#include "ive2.h" +#include "ih264_defs.h" +#include "ih264_size_defs.h" +#include "ih264e_defs.h" +#include "ih264e_error.h" +#include "ih264e_bitstream.h" +#include "ime_distortion_metrics.h" +#include "ime_defs.h" +#include "ime_structs.h" +#include "ih264_error.h" +#include "ih264_structs.h" +#include "ih264_trans_quant_itrans_iquant.h" +#include "ih264_inter_pred_filters.h" +#include "ih264_mem_fns.h" +#include "ih264_padding.h" +#include "ih264_intra_pred_filters.h" +#include "ih264_deblk_edge_filters.h" +#include "ih264_cabac_tables.h" +#include "ih264_macros.h" +#include "ih264_platform_macros.h" +#include "irc_cntrl_param.h" +#include "irc_frame_info_collector.h" +#include "ih264e_rate_control.h" +#include "ih264e_cabac_structs.h" +#include "ih264e_structs.h" +#include "ih264e_cabac.h" +#include "ih264e_platform_macros.h" + +/** +******************************************************************************* +* +* @brief Initialize the intra/inter/transform/deblk function pointers of +* codec context +* +* @par Description: the current routine initializes the function pointers of +* codec context basing on the architecture in use +* +* @param[in] ps_codec +* Codec context pointer +* +* @returns none +* +* @remarks none +* +******************************************************************************* +*/ + +void ih264e_init_function_ptr(void *pv_codec) +{ + codec_t *ps_codec = (codec_t *)pv_codec; + ih264e_init_function_ptr_generic(ps_codec); +} + +IV_ARCH_T ih264e_default_arch(void) +{ + return ARCH_NA; +} diff --git a/encoder/riscv/ih264e_platform_macros.h b/encoder/riscv/ih264e_platform_macros.h new file mode 100644 index 0000000..002500b --- /dev/null +++ b/encoder/riscv/ih264e_platform_macros.h @@ -0,0 +1,134 @@ +/****************************************************************************** + * + * 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 + * ih264e_platform_macros.h + * + * @brief + * Contains platform specific routines used for codec context intialization + * + * @author + * ittiam + * + * @remarks + * none + * + ******************************************************************************* + */ + + +#ifndef IH264E_PLATFORM_MACROS_H_ +#define IH264E_PLATFORM_MACROS_H_ + +/*****************************************************************************/ +/* Extern Function Declarations */ +/*****************************************************************************/ + +/** +******************************************************************************* +* +* @brief Initialize the intra/inter/transform/deblk function pointers of +* codec context +* +* @par Description: the current routine initializes the function pointers of +* codec context basing on the architecture in use +* +* @param[in] ps_codec +* Codec context pointer +* +* @returns none +* +* @remarks none +* +******************************************************************************* +*/ +void ih264e_init_function_ptr_generic(codec_t *ps_codec); + +/** +******************************************************************************* +* +* @brief Initialize the intra/inter/transform/deblk function pointers of +* codec context +* +* @par Description: the current routine initializes the function pointers of +* codec context basing on the architecture in use +* +* @param[in] ps_codec +* Codec context pointer +* +* @returns none +* +* @remarks none +* +******************************************************************************* +*/ +void ih264e_init_function_ptr(void *pv_codec); + +/** +******************************************************************************* +* +* @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 +* +******************************************************************************* +*/ +IV_ARCH_T ih264e_default_arch(void); + +/** +******************************************************************************* +* +* @brief Data Memory Barrier, Data Synchronization Barrier +* +* +* @par Description: These functions do nothing on x86 side. But on arm platforms, +* +* Data Memory Barrier acts as a memory barrier. It ensures that all explicit +* memory accesses that appear in program order before the DMB instruction are +* observed before any explicit memory accesses that appear in program order +* after the DMB instruction. It does not affect the ordering of any other +* instructions executing on the processor +* +* Data Synchronization Barrier acts as a special kind of memory barrier. No +* instruction in program order after this instruction executes until this instruction +* completes. This instruction completes when: +* 1. All explicit memory accesses before this instruction complete. +* 2. All Cache, Branch predictor and TLB maintenance operations before +* this instruction complete. +* +* @param[in] void +* +* @returns void +* +* @remarks none +* +******************************************************************************* +*/ + +#endif /* IH264E_PLATFORM_MACROS_H_ */ diff --git a/encoder/riscv/ime_platform_macros.h b/encoder/riscv/ime_platform_macros.h new file mode 100644 index 0000000..18e2e8f --- /dev/null +++ b/encoder/riscv/ime_platform_macros.h @@ -0,0 +1,52 @@ +/****************************************************************************** + * + * 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 +* ime_platform_macros.h +* +* @brief +* Platform specific Macro definitions used in the codec +* +* @author +* Ittiam +* +* @remarks +* None +* +******************************************************************************* +*/ + + +#ifndef _IME_PLATFORM_MACROS_H_ +#define _IME_PLATFORM_MACROS_H_ + +/*****************************************************************************/ +/* Function macro definitions */ +/*****************************************************************************/ + +#define USADA8(src,est,sad) \ + sad += ABS(src[0]-est[0]) + \ + ABS(src[1]-est[1]) + \ + ABS(src[2]-est[2]) + \ + ABS(src[3]-est[3]) + + +#endif /* _IH264_PLATFORM_MACROS_H_ */