Bug 1073003 - Fix warnings about macro redefinitions by renaming macros. r=ehsan
authorBotond Ballo <botond@mozilla.com>
Wed, 17 Dec 2014 16:48:41 -0500
changeset 248378 5aefc41261b0fd4808f1d67eee51cec820f19a25
parent 248377 6fde8c97e7a82fc91d9950295f0da2a301b93350
child 248379 41c2ffa3c09d1f73669e281ace58e3b37fc042f3
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1073003
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1073003 - Fix warnings about macro redefinitions by renaming macros. r=ehsan
media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
--- a/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
@@ -32,22 +32,22 @@ using namespace android;
 #include "nsThreadUtils.h"
 #include "OMXCodecWrapper.h"
 #include "TextureClient.h"
 
 #define DEQUEUE_BUFFER_TIMEOUT_US (100 * 1000ll) // 100ms.
 #define START_DEQUEUE_BUFFER_TIMEOUT_US (10 * DEQUEUE_BUFFER_TIMEOUT_US) // 1s.
 #define DRAIN_THREAD_TIMEOUT_US  (1000 * 1000ll) // 1s.
 
-#define LOG_TAG "WebrtcOMXH264VideoCodec"
-#define CODEC_LOGV(...) CSFLogInfo(LOG_TAG, __VA_ARGS__)
-#define CODEC_LOGD(...) CSFLogDebug(LOG_TAG, __VA_ARGS__)
-#define CODEC_LOGI(...) CSFLogInfo(LOG_TAG, __VA_ARGS__)
-#define CODEC_LOGW(...) CSFLogWarn(LOG_TAG, __VA_ARGS__)
-#define CODEC_LOGE(...) CSFLogError(LOG_TAG, __VA_ARGS__)
+#define WOHVC_LOG_TAG "WebrtcOMXH264VideoCodec"
+#define CODEC_LOGV(...) CSFLogInfo(WOHVC_LOG_TAG, __VA_ARGS__)
+#define CODEC_LOGD(...) CSFLogDebug(WOHVC_LOG_TAG, __VA_ARGS__)
+#define CODEC_LOGI(...) CSFLogInfo(WOHVC_LOG_TAG, __VA_ARGS__)
+#define CODEC_LOGW(...) CSFLogWarn(WOHVC_LOG_TAG, __VA_ARGS__)
+#define CODEC_LOGE(...) CSFLogError(WOHVC_LOG_TAG, __VA_ARGS__)
 
 namespace mozilla {
 
 static const uint8_t kNALStartCode[] = { 0x00, 0x00, 0x00, 0x01 };
 enum {
   kNALTypeIDR = 5,
   kNALTypeSPS = 7,
   kNALTypePPS = 8,