diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc index 13c63acff..d05b928a9 100644 --- a/webrtc/system_wrappers/source/trace_impl.cc +++ b/webrtc/system_wrappers/source/trace_impl.cc @@ -553,15 +553,6 @@ void TraceImpl::WriteToFile() { trace_file_.Write(message, length); row_count_text_++; } - length = AddBuildInfo(message); - if (length != -1) { - message[length + 1] = 0; - message[length] = '\n'; - message[length - 1] = '\n'; - trace_file_.Write(message, length + 1); - row_count_text_++; - row_count_text_++; - } } uint16_t length = length_[local_queue_active][idx]; message_queue_[local_queue_active][idx][length] = 0; diff --git a/webrtc/system_wrappers/source/trace_impl.h b/webrtc/system_wrappers/source/trace_impl.h index 5548e984f..5fa6ce387 100644 --- a/webrtc/system_wrappers/source/trace_impl.h +++ b/webrtc/system_wrappers/source/trace_impl.h @@ -72,7 +72,6 @@ class TraceImpl : public Trace { virtual int32_t AddTime(char* trace_message, const TraceLevel level) const = 0; - virtual int32_t AddBuildInfo(char* trace_message) const = 0; virtual int32_t AddDateTimeInfo(char* trace_message) const = 0; static bool Run(void* obj); diff --git a/webrtc/system_wrappers/source/trace_posix.cc b/webrtc/system_wrappers/source/trace_posix.cc index d14704b6a..1e0e1c81a 100644 --- a/webrtc/system_wrappers/source/trace_posix.cc +++ b/webrtc/system_wrappers/source/trace_posix.cc @@ -17,20 +17,6 @@ #include #include -#if defined(_DEBUG) -#define BUILDMODE "d" -#elif defined(DEBUG) -#define BUILDMODE "d" -#elif defined(NDEBUG) -#define BUILDMODE "r" -#else -#define BUILDMODE "?" -#endif -#define BUILDTIME __TIME__ -#define BUILDDATE __DATE__ -// example: "Oct 10 2002 12:05:30 r" -#define BUILDINFO BUILDDATE " " BUILDTIME " " BUILDMODE - namespace webrtc { TracePosix::TracePosix() @@ -86,12 +72,6 @@ int32_t TracePosix::AddTime(char* trace_message, const TraceLevel level) const { return 22; } -int32_t TracePosix::AddBuildInfo(char* trace_message) const { - sprintf(trace_message, "Build info: %s", BUILDINFO); - // Include NULL termination (hence + 1). - return strlen(trace_message) + 1; -} - int32_t TracePosix::AddDateTimeInfo(char* trace_message) const { time_t t; time(&t); diff --git a/webrtc/system_wrappers/source/trace_posix.h b/webrtc/system_wrappers/source/trace_posix.h index 2056c7043..2f0abc6ed 100644 --- a/webrtc/system_wrappers/source/trace_posix.h +++ b/webrtc/system_wrappers/source/trace_posix.h @@ -26,7 +26,6 @@ class TracePosix : public TraceImpl { virtual int32_t AddTime(char* trace_message, const TraceLevel level) const OVERRIDE; - virtual int32_t AddBuildInfo(char* trace_message) const OVERRIDE; virtual int32_t AddDateTimeInfo(char* trace_message) const OVERRIDE; private: diff --git a/webrtc/system_wrappers/source/trace_win.cc b/webrtc/system_wrappers/source/trace_win.cc index f1a03a548..3752659c1 100644 --- a/webrtc/system_wrappers/source/trace_win.cc +++ b/webrtc/system_wrappers/source/trace_win.cc @@ -15,20 +15,6 @@ #include "Mmsystem.h" -#if defined(_DEBUG) -#define BUILDMODE "d" -#elif defined(DEBUG) -#define BUILDMODE "d" -#elif defined(NDEBUG) -#define BUILDMODE "r" -#else -#define BUILDMODE "?" -#endif -#define BUILDTIME __TIME__ -#define BUILDDATE __DATE__ -// Example: "Oct 10 2002 12:05:30 r" -#define BUILDINFO BUILDDATE " " BUILDTIME " " BUILDMODE - namespace webrtc { TraceWindows::TraceWindows() : prev_api_tick_count_(0), @@ -84,13 +70,6 @@ int32_t TraceWindows::AddTime(char* trace_message, return 22; } -int32_t TraceWindows::AddBuildInfo(char* trace_message) const { - // write data and time to text file - sprintf(trace_message, "Build info: %s", BUILDINFO); - // Include NULL termination (hence + 1). - return static_cast(strlen(trace_message) + 1); -} - int32_t TraceWindows::AddDateTimeInfo(char* trace_message) const { prev_api_tick_count_ = timeGetTime(); prev_tick_count_ = prev_api_tick_count_; diff --git a/webrtc/system_wrappers/source/trace_win.h b/webrtc/system_wrappers/source/trace_win.h index 1a871074a..1311b23c5 100644 --- a/webrtc/system_wrappers/source/trace_win.h +++ b/webrtc/system_wrappers/source/trace_win.h @@ -25,7 +25,6 @@ class TraceWindows : public TraceImpl { virtual int32_t AddTime(char* trace_message, const TraceLevel level) const; - virtual int32_t AddBuildInfo(char* trace_message) const; virtual int32_t AddDateTimeInfo(char* trace_message) const; private: volatile mutable uint32_t prev_api_tick_count_; diff --git a/webrtc/video_engine/vie_base_impl.cc b/webrtc/video_engine/vie_base_impl.cc index cf64eada3..81c748afa 100644 --- a/webrtc/video_engine/vie_base_impl.cc +++ b/webrtc/video_engine/vie_base_impl.cc @@ -10,7 +10,6 @@ #include "webrtc/video_engine/vie_base_impl.h" -#include #include #include @@ -329,23 +328,8 @@ int ViEBaseImpl::StopReceive(const int video_channel) { } int ViEBaseImpl::GetVersion(char version[1024]) { - assert(kViEVersionMaxMessageSize == 1024); - if (!version) { - shared_data_.SetLastError(kViEBaseInvalidArgument); - return -1; - } - - // Add WebRTC Version. - std::stringstream version_stream; - version_stream << "VideoEngine 39" << std::endl; - - // Add build info. - version_stream << "Build: " << BUILDINFO << std::endl; - - int version_length = version_stream.tellp(); - assert(version_length < 1024); - memcpy(version, version_stream.str().c_str(), version_length); - version[version_length] = '\0'; + assert(version != NULL); + strcpy(version, "VideoEngine 39"); return 0; } diff --git a/webrtc/video_engine/vie_base_impl.h b/webrtc/video_engine/vie_base_impl.h index 20fd61596..0ae7818df 100644 --- a/webrtc/video_engine/vie_base_impl.h +++ b/webrtc/video_engine/vie_base_impl.h @@ -64,11 +64,6 @@ class ViEBaseImpl ViESharedData* shared_data() { return &shared_data_; } private: - // Version functions. - int32_t AddViEVersion(char* str) const; - int32_t AddBuildInfo(char* str) const; - int32_t AddExternalTransportBuild(char* str) const; - int CreateChannel(int& video_channel, int original_channel, // NOLINT bool sender); diff --git a/webrtc/video_engine/vie_defines.h b/webrtc/video_engine/vie_defines.h index 7bfed465c..74b5e1a74 100644 --- a/webrtc/video_engine/vie_defines.h +++ b/webrtc/video_engine/vie_defines.h @@ -35,8 +35,6 @@ enum { kViEMinKeyRequestIntervalMs = 300 }; // ViEBase enum { kViEMaxNumberOfChannels = 64 }; -enum { kViEVersionMaxMessageSize = 1024 }; -enum { kViEMaxModuleVersionSize = 960 }; // ViECapture enum { kViEMaxCaptureDevices = 256 }; @@ -101,21 +99,6 @@ inline int ChannelId(const int moduleId) { return static_cast(moduleId & 0xffff); } -// Build information macros -#if defined(_DEBUG) || defined(DEBUG) -#define BUILDMODE "d" -#elif defined(NDEBUG) -#define BUILDMODE "r" -#else -#define BUILDMODE "?" -#endif - -#define BUILDTIME __TIME__ -#define BUILDDATE __DATE__ - -// Example: "Oct 10 2002 12:05:30 r". -#define BUILDINFO BUILDDATE " " BUILDTIME " " BUILDMODE - // Windows specific. #if defined(_WIN32) #define RENDER_MODULE_TYPE kRenderWindows diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc index ad6314a7e..178309506 100644 --- a/webrtc/voice_engine/voe_base_impl.cc +++ b/webrtc/voice_engine/voe_base_impl.cc @@ -777,15 +777,6 @@ int VoEBaseImpl::GetVersion(char version[1024]) accLen += len; assert(accLen < kVoiceEngineVersionMaxMessageSize); - len = AddBuildInfo(versionPtr); - if (len == -1) - { - return -1; - } - versionPtr += len; - accLen += len; - assert(accLen < kVoiceEngineVersionMaxMessageSize); - #ifdef WEBRTC_EXTERNAL_TRANSPORT len = AddExternalTransportBuild(versionPtr); if (len == -1) @@ -828,11 +819,6 @@ int VoEBaseImpl::GetVersion(char version[1024]) return 0; } -int32_t VoEBaseImpl::AddBuildInfo(char* str) const -{ - return sprintf(str, "Build: %s\n", BUILDINFO); -} - int32_t VoEBaseImpl::AddVoEVersion(char* str) const { return sprintf(str, "VoiceEngine 4.1.0\n"); diff --git a/webrtc/voice_engine/voe_base_impl.h b/webrtc/voice_engine/voe_base_impl.h index 985ef5d83..2f377362a 100644 --- a/webrtc/voice_engine/voe_base_impl.h +++ b/webrtc/voice_engine/voe_base_impl.h @@ -146,7 +146,6 @@ private: int64_t* elapsed_time_ms, int64_t* ntp_time_ms); - int32_t AddBuildInfo(char* str) const; int32_t AddVoEVersion(char* str) const; // Initialize channel by setting Engine Information then initializing diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h index b3cba7c33..cde9470a7 100644 --- a/webrtc/voice_engine/voice_engine_defines.h +++ b/webrtc/voice_engine/voice_engine_defines.h @@ -127,26 +127,6 @@ enum { kVoiceEngineMaxRtpExtensionId = 14 }; } // namespace webrtc -// ---------------------------------------------------------------------------- -// Build information macros -// ---------------------------------------------------------------------------- - -#if defined(_DEBUG) -#define BUILDMODE "d" -#elif defined(DEBUG) -#define BUILDMODE "d" -#elif defined(NDEBUG) -#define BUILDMODE "r" -#else -#define BUILDMODE "?" -#endif - -#define BUILDTIME __TIME__ -#define BUILDDATE __DATE__ - -// Example: "Oct 10 2002 12:05:30 r" -#define BUILDINFO BUILDDATE " " BUILDTIME " " BUILDMODE - // ---------------------------------------------------------------------------- // Macros // ----------------------------------------------------------------------------