generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #914 from licaiguo/remove-unused-args

Browse Source 
remove unused argument pBlock
This commit is contained in:
ruil2 2014-06-04 09:01:04 +08:00
commit f408fdf5f0
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
codec/decoder/core/arm/block_add_neon.S
View File

@ -99,20 +99,16 @@
// }
.endm
#endif
// r0 int16_t* block,
// r1 int8_t* non_zero_count,
// r0 int8_t* non_zero_count,
WELS_ASM_FUNC_BEGIN SetNonZeroCount_neon
vld1.64 {d0-d2}, [r1]
vld1.64 {d0-d2}, [r0]
vceq.s8 q0, q0, #0
vceq.s8 d2, d2, #0
vmvn q0, q0
vmvn d2, d2
vabs.s8 q0, q0
vabs.s8 d2, d2
vst1.64 {d0-d2}, [r1]
vst1.64 {d0-d2}, [r0]
WELS_ASM_FUNC_END

4
codec/decoder/core/inc/decode_slice.h
View File

@ -64,14 +64,14 @@ extern "C" {
#endif//__cplusplus
#if defined(HAVE_NEON)
void SetNonZeroCount_neon (int16_t* pBlock, int8_t* pNonZeroCount);
void SetNonZeroCount_neon (int8_t* pNonZeroCount);
#endif
#ifdef __cplusplus
}
#endif//__cplusplus
void SetNonZeroCount_c (int16_t* pBlock, int8_t* pNonZeroCount);
void SetNonZeroCount_c (int8_t* pNonZeroCount);
void WelsBlockFuncInit (SBlockFunc* pFunc, int32_t iCpu);

2
codec/decoder/core/inc/decoder_context.h
View File

@ -140,7 +140,7 @@ typedef struct TagDeblockingFunc {
PChromaDeblockingEQ4Func pfChromaDeblockingEQ4Hor;
} SDeblockingFunc, *PDeblockingFunc;
typedef void (*PWelsNonZeroCountFunc) (int16_t* pBlock, int8_t* pNonZeroCount);
typedef void (*PWelsNonZeroCountFunc) (int8_t* pNonZeroCount);
typedef struct TagBlockFunc {
PWelsNonZeroCountFunc pWelsSetNonZeroCountFunc;

5
codec/decoder/core/src/decode_slice.cpp
View File

@ -183,8 +183,7 @@ int32_t WelsMbInterConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer) {
GetInterPred (pDstY, pDstCb, pDstCr, pCtx);
WelsMbInterSampleConstruction (pCtx, pCurLayer, pDstY, pDstCb, pDstCr, iLumaStride, iChromaStride);
pCtx->sBlockFunc.pWelsSetNonZeroCountFunc (NULL,
pCurLayer->pNzc[pCurLayer->iMbXyIndex]); // set all none-zero nzc to 1; dbk can be opti!
pCtx->sBlockFunc.pWelsSetNonZeroCountFunc (pCurLayer->pNzc[pCurLayer->iMbXyIndex]); // set all none-zero nzc to 1; dbk can be opti!
return 0;
}
@ -1054,7 +1053,7 @@ void WelsBlockFuncInit (SBlockFunc* pFunc, int32_t iCpu) {
#endif
}
void SetNonZeroCount_c (int16_t* pBlock, int8_t* pNonZeroCount) {
void SetNonZeroCount_c (int8_t* pNonZeroCount) {
int32_t i;
for (i = 0; i < 24; i++) {