Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 3 files). Show all
Unified · Split
| @@ -86,36 +86,9 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 85 unmodified lines | |||
| 86 | #endif//OUTPUT_BIT_STREAM | 86 | #endif//OUTPUT_BIT_STREAM |
| 87 | 87 | ||
| 88 | #ifdef OUTPUT_BIT_STREAM | 88 | #ifdef OUTPUT_BIT_STREAM |
| 89 | time_t tTime; | 89 | SWelsTime tTime; |
| 90 | 90 | ||
| 91 | #if defined( _WIN32 ) | 91 | WelsGetTimeOfDay(&tTime); |
| 92 | #if defined(_MSC_VER) | ||
| 93 | #if _MSC_VER>=1500 | ||
| 94 | struct tm tTimeNow; | ||
| 95 | #else | ||
| 96 | struct tm* tTimeNow; | ||
| 97 | #endif//_MSC_VER>=1500 | ||
| 98 | #endif//_MSC_VER | ||
| 99 | struct _timeb tTimeb; | ||
| 100 | |||
| 101 | time (&tTime); | ||
| 102 | #if defined(_MSC_VER) | ||
| 103 | #if _MSC_VER>=1500 | ||
| 104 | LOCALTIME (&tTimeNow, &tTime); | ||
| 105 | #else | ||
| 106 | tTimeNow = LOCALTIME (&tTime); | ||
| 107 | if (NULL == tTimeNow) | ||
| 108 | return; | ||
| 109 | #endif//_MSC_VER>=1500 | ||
| 110 | #endif//_MSC_VER | ||
| 111 | FTIME (&tTimeb); | ||
| 112 | #elif defined( __GNUC__ ) | ||
| 113 | struct tm* tTimeNow; | ||
| 114 | struct timeval tTimev; | ||
| 115 | time (&tTime); | ||
| 116 | tTimeNow = (struct tm*)localtime (&tTime); | ||
| 117 | gettimeofday (&tTimev, NULL); | ||
| 118 | #endif//WIN32 | ||
| 119 | 92 | ||
| 120 | iCurUsed = WelsSnprintf (strStreamFileName, iBufferLeft, "enc_bs_0x%p_", (void*)this); | 93 | iCurUsed = WelsSnprintf (strStreamFileName, iBufferLeft, "enc_bs_0x%p_", (void*)this); |
| 121 | iCurUsedSize = WelsSnprintf (strLenFileName, iBufferLeftSize, "enc_size_0x%p_", (void*)this); | 94 | iCurUsedSize = WelsSnprintf (strLenFileName, iBufferLeftSize, "enc_size_0x%p_", (void*)this); |
| @@ -126,19 +99,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 4 unmodified lines | |||
| 126 | iBufferLeft -= iCurUsed; | 99 | iBufferLeft -= iCurUsed; |
| 127 | } | 100 | } |
| 128 | if (iBufferLeft > 0) { | 101 | if (iBufferLeft > 0) { |
| 129 | #if defined(_GNUC__) | 102 | iCurUsed = WelsStrftime (&strStreamFileName[iBufferUsed], iBufferLeft, "%y%m%d%H%M%S", &tTime); |
| 130 | iCurUsed = strftime (&strStreamFileName[iBufferUsed], iBufferLeft, "%y%m%d%H%M%S", tTimeNow); | ||
| 131 | #else | ||
| 132 | #if defined(_MSC_VER) | ||
| 133 | iCurUsed = strftime (&strStreamFileName[iBufferUsed], iBufferLeft, "%y%m%d%H%M%S", | ||
| 134 | #if _MSC_VER>=1500 | ||
| 135 | & tTimeNow | ||
| 136 | #else | ||
| 137 | tTimeNow | ||
| 138 | #endif//_MSC_VER>=1500 | ||
| 139 | ); | ||
| 140 | #endif//_MSC_VER | ||
| 141 | #endif//__GNUC__ | ||
| 142 | iBufferUsed += iCurUsed; | 103 | iBufferUsed += iCurUsed; |
| 143 | iBufferLeft -= iCurUsed; | 104 | iBufferLeft -= iCurUsed; |
| 144 | } | 105 | } |
| @@ -148,29 +109,14 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 3 unmodified lines | |||
| 148 | iBufferLeftSize -= iCurUsedSize; | 109 | iBufferLeftSize -= iCurUsedSize; |
| 149 | } | 110 | } |
| 150 | if (iBufferLeftSize > 0) { | 111 | if (iBufferLeftSize > 0) { |
| 151 | #if defined(_GNUC__) | 112 | iCurUsedSize = WelsStrftime (&strLenFileName[iBufferUsedSize], iBufferLeftSize, "%y%m%d%H%M%S", &tTime); |
| 152 | iCurUsedSize = strftime (&strLenFileName[iBufferUsedSize], iBufferLeftSize, "%y%m%d%H%M%S", tTimeNow); | ||
| 153 | #else | ||
| 154 | #if defined(_MSC_VER) | ||
| 155 | iCurUsedSize = strftime (&strLenFileName[iBufferUsedSize], iBufferLeftSize, "%y%m%d%H%M%S", | ||
| 156 | #if _MSC_VER>=1500 | ||
| 157 | & tTimeNow | ||
| 158 | #else | ||
| 159 | tTimeNow | ||
| 160 | #endif//_MSC_VER>=1500 | ||
| 161 | ); | ||
| 162 | #endif//_MSC_VER | ||
| 163 | #endif//__GNUC__ | ||
| 164 | iBufferUsedSize += iCurUsedSize; | 113 | iBufferUsedSize += iCurUsedSize; |
| 165 | iBufferLeftSize -= iCurUsedSize; | 114 | iBufferLeftSize -= iCurUsedSize; |
| 166 | } | 115 | } |
| 167 | 116 | ||
| 168 | if (iBufferLeft > 0) { | 117 | if (iBufferLeft > 0) { |
| 169 | #ifdef _WIN32 | 118 | iCurUsed = WelsSnprintf (&strStreamFileName[iBufferUsed], iBufferLeft, ".%03.3u.264", |
| 170 | iCurUsed = WelsSnprintf (&strStreamFileName[iBufferUsed], iBufferLeft, ".%03.3u.264", tTimeb.millitm); | 119 | WelsGetMillisecond(&tTime)); |
| 171 | #else | ||
| 172 | iCurUsed = WelsSnprintf (&strStreamFileName[iBufferUsed], iBufferLeft, ".%03.3u.264", tTimev.tv_usec / 1000); | ||
| 173 | #endif//WIN32 | ||
| 174 | if (iCurUsed > 0) { | 120 | if (iCurUsed > 0) { |
| 175 | iBufferUsed += iCurUsed; | 121 | iBufferUsed += iCurUsed; |
| 176 | iBufferLeft -= iCurUsed; | 122 | iBufferLeft -= iCurUsed; |
| @@ -178,11 +124,8 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 1 unmodified line | |||
| 178 | } | 124 | } |
| 179 | 125 | ||
| 180 | if (iBufferLeftSize > 0) { | 126 | if (iBufferLeftSize > 0) { |
| 181 | #ifdef _WIN32 | 127 | iCurUsedSize = WelsSnprintf (&strLenFileName[iBufferUsedSize], iBufferLeftSize, ".%03.3u.len", |
| 182 | iCurUsedSize = WelsSnprintf (&strLenFileName[iBufferUsedSize], iBufferLeftSize, ".%03.3u.len", tTimeb.millitm); | 128 | WelsGetMillisecond(&tTime)); |
| 183 | #else | ||
| 184 | iCurUsedSize = WelsSnprintf (&strLenFileName[iBufferUsedSize], iBufferLeftSize, ".%03.3u.len", tTimev.tv_usec / 1000); | ||
| 185 | #endif//WIN32 | ||
| 186 | if (iCurUsedSize > 0) { | 129 | if (iCurUsedSize > 0) { |
| 187 | iBufferUsedSize += iCurUsedSize; | 130 | iBufferUsedSize += iCurUsedSize; |
| 188 | iBufferLeftSize -= iCurUsedSize; | 131 | iBufferLeftSize -= iCurUsedSize; |