Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 1 file). Show all
Unified · Split
| @@ -946,11 +946,11 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 945 unmodified lines | |||
| 946 | 946 | ||
| 947 | } | 947 | } |
| 948 | break; | 948 | break; |
| 949 | case ENCODER_OPTION_iBitRate: { // Target bit-rate | 949 | case ENCODER_OPTION_BITRATE: { // Target bit-rate |
| 950 | int32_t iValue = * ((int32_t*)pOption); | 950 | int32_t iValue = * ((int32_t*)pOption); |
| 951 | #ifdef REC_FRAME_COUNT | 951 | #ifdef REC_FRAME_COUNT |
| 952 | WelsLog (m_pEncContext, WELS_LOG_INFO, | 952 | WelsLog (m_pEncContext, WELS_LOG_INFO, |
| 953 | "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_iBitRate, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n", | 953 | "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n", |
| 954 | m_uiCountFrameNum, m_iCspInternal, iValue); | 954 | m_uiCountFrameNum, m_iCspInternal, iValue); |
| 955 | #endif//REC_FRAME_COUNT | 955 | #endif//REC_FRAME_COUNT |
| 956 | m_pEncContext->pSvcParam->iTargetBitrate = iValue; | 956 | m_pEncContext->pSvcParam->iTargetBitrate = iValue; |
| @@ -1075,10 +1075,10 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 118 unmodified lines | |||
| 1075 | * ((float*)pOption) = m_pEncContext->pSvcParam->fMaxFrameRate; | 1075 | * ((float*)pOption) = m_pEncContext->pSvcParam->fMaxFrameRate; |
| 1076 | } | 1076 | } |
| 1077 | break; | 1077 | break; |
| 1078 | case ENCODER_OPTION_iBitRate: { // Target bit-rate | 1078 | case ENCODER_OPTION_BITRATE: { // Target bit-rate |
| 1079 | #ifdef REC_FRAME_COUNT | 1079 | #ifdef REC_FRAME_COUNT |
| 1080 | WelsLog (m_pEncContext, WELS_LOG_INFO, | 1080 | WelsLog (m_pEncContext, WELS_LOG_INFO, |
| 1081 | "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_iBitRate, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", | 1081 | "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", |
| 1082 | m_uiCountFrameNum, m_iCspInternal); | 1082 | m_uiCountFrameNum, m_iCspInternal); |
| 1083 | #endif//REC_FRAME_COUNT | 1083 | #endif//REC_FRAME_COUNT |
| 1084 | * ((int32_t*)pOption) = m_pEncContext->pSvcParam->iTargetBitrate; | 1084 | * ((int32_t*)pOption) = m_pEncContext->pSvcParam->iTargetBitrate; |