Also similarly simplify the use of the return value from WelsStrftime and GetCodeName/GetLibName/GetVerNum.
Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 3 files). Show all
Unified · Split
| @@ -90,20 +90,16 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 89 unmodified lines | |||
| 90 | iCurUsedSize = WelsSnprintf (strLenFileName, iBufferLeftSize, "enc_size_0x%p_", (void*)this); | 90 | iCurUsedSize = WelsSnprintf (strLenFileName, iBufferLeftSize, "enc_size_0x%p_", (void*)this); |
| 91 | 91 | ||
| 92 | 92 | ||
| 93 | if (iCurUsed > 0) { | 93 | iBufferUsed += iCurUsed; |
| 94 | iBufferUsed += iCurUsed; | 94 | iBufferLeft -= iCurUsed; |
| 95 | iBufferLeft -= iCurUsed; | ||
| 96 | } | ||
| 97 | if (iBufferLeft > 0) { | 95 | if (iBufferLeft > 0) { |
| 98 | iCurUsed = WelsStrftime (&strStreamFileName[iBufferUsed], iBufferLeft, "%y%m%d%H%M%S", &tTime); | 96 | iCurUsed = WelsStrftime (&strStreamFileName[iBufferUsed], iBufferLeft, "%y%m%d%H%M%S", &tTime); |
| 99 | iBufferUsed += iCurUsed; | 97 | iBufferUsed += iCurUsed; |
| 100 | iBufferLeft -= iCurUsed; | 98 | iBufferLeft -= iCurUsed; |
| 101 | } | 99 | } |
| 102 | 100 | ||
| 103 | if (iCurUsedSize > 0) { | 101 | iBufferUsedSize += iCurUsedSize; |
| 104 | iBufferUsedSize += iCurUsedSize; | 102 | iBufferLeftSize -= iCurUsedSize; |
| 105 | iBufferLeftSize -= iCurUsedSize; | ||
| 106 | } | ||
| 107 | if (iBufferLeftSize > 0) { | 103 | if (iBufferLeftSize > 0) { |
| 108 | iCurUsedSize = WelsStrftime (&strLenFileName[iBufferUsedSize], iBufferLeftSize, "%y%m%d%H%M%S", &tTime); | 104 | iCurUsedSize = WelsStrftime (&strLenFileName[iBufferUsedSize], iBufferLeftSize, "%y%m%d%H%M%S", &tTime); |
| 109 | iBufferUsedSize += iCurUsedSize; | 105 | iBufferUsedSize += iCurUsedSize; |
| @@ -113,19 +109,15 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 3 unmodified lines | |||
| 113 | if (iBufferLeft > 0) { | 109 | if (iBufferLeft > 0) { |
| 114 | iCurUsed = WelsSnprintf (&strStreamFileName[iBufferUsed], iBufferLeft, ".%03.3u.264", | 110 | iCurUsed = WelsSnprintf (&strStreamFileName[iBufferUsed], iBufferLeft, ".%03.3u.264", |
| 115 | WelsGetMillisecond(&tTime)); | 111 | WelsGetMillisecond(&tTime)); |
| 116 | if (iCurUsed > 0) { | 112 | iBufferUsed += iCurUsed; |
| 117 | iBufferUsed += iCurUsed; | 113 | iBufferLeft -= iCurUsed; |
| 118 | iBufferLeft -= iCurUsed; | ||
| 119 | } | ||
| 120 | } | 114 | } |
| 121 | 115 | ||
| 122 | if (iBufferLeftSize > 0) { | 116 | if (iBufferLeftSize > 0) { |
| 123 | iCurUsedSize = WelsSnprintf (&strLenFileName[iBufferUsedSize], iBufferLeftSize, ".%03.3u.len", | 117 | iCurUsedSize = WelsSnprintf (&strLenFileName[iBufferUsedSize], iBufferLeftSize, ".%03.3u.len", |
| 124 | WelsGetMillisecond(&tTime)); | 118 | WelsGetMillisecond(&tTime)); |
| 125 | if (iCurUsedSize > 0) { | 119 | iBufferUsedSize += iCurUsedSize; |
| 126 | iBufferUsedSize += iCurUsedSize; | 120 | iBufferLeftSize -= iCurUsedSize; |
| 127 | iBufferLeftSize -= iCurUsedSize; | ||
| 128 | } | ||
| 129 | } | 121 | } |
| 130 | 122 | ||
| 131 | m_pFileBs = WelsFopen (strStreamFileName, "wb"); | 123 | m_pFileBs = WelsFopen (strStreamFileName, "wb"); |