Remove the useless iInitType parameter, make the method private within CWelsH264SVCEncoder class, give the pointer parameter the correct type, avoiding needless casting.
Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 2 files). Show all
Unified · Split
| @@ -282,13 +282,13 @@ int CWelsH264SVCEncoder::Initialize (SEncParamBase* argv, const INIT_TYPE iInitT · 281 unmodified lines | |||
| 282 | #endif//REC_FRAME_COUNT | 282 | #endif//REC_FRAME_COUNT |
| 283 | m_iSrcListSize = 1; | 283 | m_iSrcListSize = 1; |
| 284 | 284 | ||
| 285 | return Initialize2 ((void*)&sConfig, INIT_TYPE_PARAMETER_BASED); | 285 | return Initialize2 (&sConfig); |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) { | 288 | int CWelsH264SVCEncoder::Initialize2 (SWelsSvcCodingParam* pCfg) { |
| 289 | if (INIT_TYPE_PARAMETER_BASED != iInitType || NULL == argv) { | 289 | if (NULL == pCfg) { |
| 290 | WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInitType= %d, argv= 0x%p.\n", | 290 | WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid argv= 0x%p.\n", |
| 291 | iInitType, (void*)argv); | 291 | pCfg); |
| 292 | return cmInitParaError; | 292 | return cmInitParaError; |
| 293 | } | 293 | } |
| 294 | 294 | ||
| @@ -298,8 +298,6 @@ int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) { · 3 unmodified lines | |||
| 298 | Uninitialize(); | 298 | Uninitialize(); |
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | SWelsSvcCodingParam* pCfg = static_cast<SWelsSvcCodingParam*> (argv); | ||
| 302 | |||
| 303 | const int32_t iColorspace = pCfg->iInputCsp; | 301 | const int32_t iColorspace = pCfg->iInputCsp; |
| 304 | if (0 == iColorspace) { | 302 | if (0 == iColorspace) { |
| 305 | WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInputCsp= %d.\n", iColorspace); | 303 | WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInputCsp= %d.\n", iColorspace); |