Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 73 files). Show all
Unified · Split
| @@ -42,7 +42,7 @@ · 41 unmodified lines | ||
| 42 | 42 | #include "ref_list_mgr_svc.h" |
| 43 | 43 | |
| 44 | 44 | #include <time.h> |
| 45 | −#if defined(WIN32) /*&& defined(_DEBUG)*/ | |
| 45 | +#if defined(_WIN32) /*&& defined(_DEBUG)*/ | |
| 46 | 46 | |
| 47 | 47 | #include <windows.h> |
| 48 | 48 | #include <stdio.h> |
| @@ -60,7 +60,7 @@ namespace WelsSVCEnc { · 11 unmodified lines | ||
| 60 | 60 | */ |
| 61 | 61 | CWelsH264SVCEncoder::CWelsH264SVCEncoder() |
| 62 | 62 | : m_pEncContext (NULL), |
| 63 | −#if defined(WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) | |
| 63 | +#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) | |
| 64 | 64 | m_pWelsTrace (NULL), |
| 65 | 65 | #endif |
| 66 | 66 | m_pSrcPicList (NULL), |
| @@ -86,7 +86,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 19 unmodified lines | ||
| 86 | 86 | #ifdef OUTPUT_BIT_STREAM |
| 87 | 87 | time_t tTime; |
| 88 | 88 | |
| 89 | −#if defined( WIN32 ) | |
| 89 | +#if defined( _WIN32 ) | |
| 90 | 90 | #if defined(_MSC_VER) |
| 91 | 91 | #if _MSC_VER>=1500 |
| 92 | 92 | struct tm tTimeNow; |
| @@ -115,7 +115,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 22 unmodified lines | ||
| 115 | 115 | gettimeofday (&tTimev, NULL); |
| 116 | 116 | #endif//WIN32 |
| 117 | 117 | |
| 118 | −#ifdef WIN32 | |
| 118 | +#ifdef _WIN32 | |
| 119 | 119 | #if defined(_MSC_VER) |
| 120 | 120 | #if _MSC_VER>=1500 |
| 121 | 121 | iBufferUsed += SNPRINTF (strStreamFileName, iBufferLeft, iBufferLeft, "enc_bs_0x%p_", (void*)this); |
| @@ -168,7 +168,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 46 unmodified lines | ||
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | if (iBufferLeft > iBufferUsed) { |
| 171 | −#ifdef WIN32 | |
| 171 | +#ifdef _WIN32 | |
| 172 | 172 | #if defined(_MSC_VER) |
| 173 | 173 | #if _MSC_VER>=1500 |
| 174 | 174 | iBufferUsed += SNPRINTF (&strStreamFileName[iBufferUsed], iBufferLeft, iBufferLeft, ".%03.3u.264", tTimeb.millitm); |
| @@ -183,7 +183,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 8 unmodified lines | ||
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | if (iBufferLeftSize > iBufferUsedSize) { |
| 186 | −#ifdef WIN32 | |
| 186 | +#ifdef _WIN32 | |
| 187 | 187 | #if defined(_MSC_VER) |
| 188 | 188 | #if _MSC_VER>=1500 |
| 189 | 189 | iBufferUsedSize += SNPRINTF (&strLenFileName[iBufferUsedSize], iBufferLeftSize, iBufferLeftSize, ".%03.3u.len", |
| @@ -222,7 +222,7 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 32 unmodified lines | ||
| 222 | 222 | |
| 223 | 223 | CWelsH264SVCEncoder::~CWelsH264SVCEncoder() { |
| 224 | 224 | WelsLog (NULL, WELS_LOG_INFO, "CWelsH264SVCEncoder::~CWelsH264SVCEncoder()\n"); |
| 225 | −#if defined(WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) | |
| 225 | +#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) | |
| 226 | 226 | |
| 227 | 227 | if (m_pWelsTrace != NULL) { |
| 228 | 228 | delete m_pWelsTrace; |
| @@ -256,7 +256,7 @@ CWelsH264SVCEncoder::~CWelsH264SVCEncoder() { · 27 unmodified lines | ||
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | void CWelsH264SVCEncoder::InitEncoder (void) { |
| 259 | −#if defined(WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) | |
| 259 | +#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__) | |
| 260 | 260 | |
| 261 | 261 | #ifdef REC_FRAME_COUNT |
| 262 | 262 | WelsLog (m_pEncContext, WELS_LOG_INFO, |