The astyle cleanup keeps trailing whitespace within comments, but the whitespace here is not significant nor intentional and thus should be removed.
Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 17 files). Show all
Unified · Split
| @@ -113,7 +113,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 112 unmodified lines | |||
| 113 | time (&tTime); | 113 | time (&tTime); |
| 114 | tTimeNow = (struct tm*)localtime (&tTime); | 114 | tTimeNow = (struct tm*)localtime (&tTime); |
| 115 | gettimeofday (&tTimev, NULL); | 115 | gettimeofday (&tTimev, NULL); |
| 116 | #endif//WIN32 | 116 | #endif//WIN32 |
| 117 | 117 | ||
| 118 | #ifdef _WIN32 | 118 | #ifdef _WIN32 |
| 119 | #if defined(_MSC_VER) | 119 | #if defined(_MSC_VER) |
| @@ -144,7 +144,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 24 unmodified lines | |||
| 144 | tTimeNow | 144 | tTimeNow |
| 145 | #endif//_MSC_VER>=1500 | 145 | #endif//_MSC_VER>=1500 |
| 146 | ); | 146 | ); |
| 147 | #endif//_MSC_VER | 147 | #endif//_MSC_VER |
| 148 | #endif//__GNUC__ | 148 | #endif//__GNUC__ |
| 149 | iBufferLeft -= iBufferUsed; | 149 | iBufferLeft -= iBufferUsed; |
| 150 | } | 150 | } |
| @@ -608,11 +608,11 @@ int CWelsH264SVCEncoder::EncodeFrame (const unsigned char* pSrc, SFrameBSInfo* p · 457 unmodified lines | |||
| 608 | ++ m_uiCountFrameNum; | 608 | ++ m_uiCountFrameNum; |
| 609 | WelsLog (m_pEncContext, WELS_LOG_INFO, | 609 | WelsLog (m_pEncContext, WELS_LOG_INFO, |
| 610 | "CWelsH264SVCEncoder::EncodeFrame(), m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum, m_iCspInternal); | 610 | "CWelsH264SVCEncoder::EncodeFrame(), m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum, m_iCspInternal); |
| 611 | #endif//REC_FRAME_COUNT | 611 | #endif//REC_FRAME_COUNT |
| 612 | 612 | ||
| 613 | #ifdef DUMP_SRC_PICTURE | 613 | #ifdef DUMP_SRC_PICTURE |
| 614 | DumpSrcPicture (pSrc); | 614 | DumpSrcPicture (pSrc); |
| 615 | #endif // DUMP_SRC_PICTURE | 615 | #endif // DUMP_SRC_PICTURE |
| 616 | 616 | ||
| 617 | return uiFrameType; | 617 | return uiFrameType; |
| 618 | } | 618 | } |
| @@ -724,7 +724,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture** pSrcPicList, int · 105 unmodified lines | |||
| 724 | #endif //OUTPUT_BIT_STREAM | 724 | #endif //OUTPUT_BIT_STREAM |
| 725 | #ifdef DUMP_SRC_PICTURE | 725 | #ifdef DUMP_SRC_PICTURE |
| 726 | DumpSrcPicture (pSrcPicList[0]->pData[0]); | 726 | DumpSrcPicture (pSrcPicList[0]->pData[0]); |
| 727 | #endif // DUMP_SRC_PICTURE | 727 | #endif // DUMP_SRC_PICTURE |
| 728 | 728 | ||
| 729 | return iFrameType; | 729 | return iFrameType; |
| 730 | 730 | ||
| @@ -1125,7 +1125,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 394 unmodified lines | |||
| 1125 | #else | 1125 | #else |
| 1126 | pFile = FOPEN (strFileName, "ab+"); | 1126 | pFile = FOPEN (strFileName, "ab+"); |
| 1127 | #endif//_MSC_VER>=1500 | 1127 | #endif//_MSC_VER>=1500 |
| 1128 | #endif//_MSC_VER | 1128 | #endif//_MSC_VER |
| 1129 | #endif//__GNUC__ | 1129 | #endif//__GNUC__ |
| 1130 | // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_I420, m_iCspInternal= 0x%x\n", m_iCspInternal); | 1130 | // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_I420, m_iCspInternal= 0x%x\n", m_iCspInternal); |
| 1131 | if (NULL != pFile) { | 1131 | if (NULL != pFile) { |
| @@ -1145,7 +1145,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 13 unmodified lines | |||
| 1145 | #else | 1145 | #else |
| 1146 | pFile = FOPEN (strFileName, "ab+"); | 1146 | pFile = FOPEN (strFileName, "ab+"); |
| 1147 | #endif//_MSC_VER>=1500 | 1147 | #endif//_MSC_VER>=1500 |
| 1148 | #endif//_MSC_VER | 1148 | #endif//_MSC_VER |
| 1149 | #endif//__GNUC__ | 1149 | #endif//__GNUC__ |
| 1150 | if (NULL != pFile) { | 1150 | if (NULL != pFile) { |
| 1151 | fwrite (pSrc, sizeof (uint8_t), iDataLength * 3, pFile); | 1151 | fwrite (pSrc, sizeof (uint8_t), iDataLength * 3, pFile); |
| @@ -1163,7 +1163,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 11 unmodified lines | |||
| 1163 | #else | 1163 | #else |
| 1164 | pFile = FOPEN (strFileName, "ab+"); | 1164 | pFile = FOPEN (strFileName, "ab+"); |
| 1165 | #endif//_MSC_VER>=1500 | 1165 | #endif//_MSC_VER>=1500 |
| 1166 | #endif//_MSC_VER | 1166 | #endif//_MSC_VER |
| 1167 | #endif//__GNUC__ | 1167 | #endif//__GNUC__ |
| 1168 | // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_BGR, m_iCspInternal= 0x%x\n", m_iCspInternal); | 1168 | // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_BGR, m_iCspInternal= 0x%x\n", m_iCspInternal); |
| 1169 | if (NULL != pFile) { | 1169 | if (NULL != pFile) { |
| @@ -1183,7 +1183,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 13 unmodified lines | |||
| 1183 | #else | 1183 | #else |
| 1184 | pFile = FOPEN (strFileName, "ab+"); | 1184 | pFile = FOPEN (strFileName, "ab+"); |
| 1185 | #endif//_MSC_VER>=1500 | 1185 | #endif//_MSC_VER>=1500 |
| 1186 | #endif//_MSC_VER | 1186 | #endif//_MSC_VER |
| 1187 | #endif//__GNUC__ | 1187 | #endif//__GNUC__ |
| 1188 | if (NULL != pFile) { | 1188 | if (NULL != pFile) { |
| 1189 | fwrite (pSrc, sizeof (uint8_t), (CALC_BI_STRIDE (m_iMaxPicWidth, 16)) * m_iMaxPicHeight, pFile); | 1189 | fwrite (pSrc, sizeof (uint8_t), (CALC_BI_STRIDE (m_iMaxPicWidth, 16)) * m_iMaxPicHeight, pFile); |