Backed out changeset 1e5f3d1151d6 (bug 1219480) for cpp unittest bustage CLOSED TREE

--HG--
extra : commitid : BMVKq6cPeho

dom/media/AudioStream.cpp

@@ -25,7 +25,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-LazyLogModule gAudioStreamLog("AudioStream");
+PRLogModuleInfo* gAudioStreamLog = nullptr;
 // For simple logs
 #define LOG(x) MOZ_LOG(gAudioStreamLog, mozilla::LogLevel::Debug, x)
 

dom/media/CubebUtils.cpp

@@ -40,7 +40,7 @@ uint32_t sPreferredSampleRate;
 
 } // namespace
 
-extern LazyLogModule gAudioStreamLog;
+extern PRLogModuleInfo* gAudioStreamLog;
 
 static const uint32_t CUBEB_NORMAL_LATENCY_MS = 100;
 
@@ -126,6 +126,7 @@ bool CubebLatencyPrefSet()
 
 void InitLibrary()
 {
+  gAudioStreamLog = PR_NewLogModule("AudioStream");
   PrefChanged(PREF_VOLUME_SCALE, nullptr);
   Preferences::RegisterCallback(PrefChanged, PREF_VOLUME_SCALE);
   PrefChanged(PREF_CUBEB_LATENCY, nullptr);

dom/media/DOMMediaStream.cpp

@@ -27,13 +27,13 @@
 #undef LOG
 #endif
 
+static PRLogModuleInfo* gMediaStreamLog;
+#define LOG(type, msg) MOZ_LOG(gMediaStreamLog, type, msg)
+
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::layers;
 
-static LazyLogModule gMediaStreamLog("MediaStream");
-#define LOG(type, msg) MOZ_LOG(gMediaStreamLog, type, msg)
-
 const TrackID TRACK_VIDEO_PRIMARY = 1;
 
 
@@ -318,6 +318,10 @@ DOMMediaStream::DOMMediaStream()
   nsCOMPtr<nsIUUIDGenerator> uuidgen =
     do_GetService("@mozilla.org/uuid-generator;1", &rv);
 
+  if (!gMediaStreamLog) {
+    gMediaStreamLog = PR_NewLogModule("MediaStream");
+  }
+
   if (NS_SUCCEEDED(rv) && uuidgen) {
     nsID uuid;
     memset(&uuid, 0, sizeof(uuid));

dom/media/GraphDriver.cpp

@@ -10,7 +10,7 @@
 #include <sys/sysctl.h>
 #endif
 
-extern mozilla::LazyLogModule gMediaStreamGraphLog;
+extern PRLogModuleInfo* gMediaStreamGraphLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 // We don't use NSPR log here because we want this interleaved with adb logcat

dom/media/Latency.cpp

@@ -37,13 +37,17 @@ const char* LatencyLogIndex2Strings[] = {
 
 static StaticRefPtr<AsyncLatencyLogger> gAsyncLogger;
 
-LogModule*
+PRLogModuleInfo*
 GetLatencyLog()
 {
-  static LazyLogModule sLog("MediaLatency");
+  static PRLogModuleInfo* sLog;
+  if (!sLog) {
+    sLog = PR_NewLogModule("MediaLatency");
+  }
   return sLog;
 }
 
+
 class LogEvent : public nsRunnable
 {
 public:
@@ -107,8 +111,6 @@ void LogLatency(uint32_t aIndex, uint64_t aID, int64_t aValue)
 void AsyncLatencyLogger::InitializeStatics()
 {
   NS_ASSERTION(NS_IsMainThread(), "Main thread only");
-
-  //Make sure that the underlying logger is allocated.
   GetLatencyLog();
   gAsyncLogger = new AsyncLatencyLogger();
 }

dom/media/Latency.h

@@ -17,7 +17,7 @@
 
 class AsyncLatencyLogger;
 
-mozilla::LogModule* GetLatencyLog();
+PRLogModuleInfo* GetLatencyLog();
 
 // This class is a singleton. It is refcounted.
 class AsyncLatencyLogger : public nsIObserver

dom/media/MP3Demuxer.cpp

@@ -16,7 +16,7 @@
 #include "prenv.h"
 
 #ifdef PR_LOGGING
-mozilla::LazyLogModule gMP3DemuxerLog("MP3Demuxer");
+PRLogModuleInfo* gMP3DemuxerLog;
 #define MP3LOG(msg, ...) \
   MOZ_LOG(gMP3DemuxerLog, LogLevel::Debug, ("MP3Demuxer " msg, ##__VA_ARGS__))
 #define MP3LOGV(msg, ...) \
@@ -112,6 +112,12 @@ MP3TrackDemuxer::MP3TrackDemuxer(MediaResource* aSource)
   , mChannels(0)
 {
   Reset();
+
+#ifdef PR_LOGGING
+  if (!gMP3DemuxerLog) {
+    gMP3DemuxerLog = PR_NewLogModule("MP3Demuxer");
+  }
+#endif
 }
 
 bool

dom/media/MediaCache.cpp

@@ -24,7 +24,7 @@
 
 namespace mozilla {
 
-LazyLogModule gMediaCacheLog("MediaCache");
+PRLogModuleInfo* gMediaCacheLog;
 #define CACHE_LOG(type, msg) MOZ_LOG(gMediaCacheLog, type, msg)
 
 // Readahead blocks for non-seekable streams will be limited to this
@@ -580,6 +580,10 @@ MediaCache::Init()
   rv = mFileCache->Open(fileDesc);
   NS_ENSURE_SUCCESS(rv,rv);
 
+  if (!gMediaCacheLog) {
+    gMediaCacheLog = PR_NewLogModule("MediaCache");
+  }
+
   MediaCacheFlusher::Init();
 
   return NS_OK;

dom/media/MediaDecoder.cpp

@@ -46,7 +46,7 @@ static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
 // avoid redefined macro in unified build
 #undef DECODER_LOG
 
-LazyLogModule gMediaDecoderLog("MediaDecoder");
+PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(x, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("Decoder=%p " x, this, ##__VA_ARGS__))
 
@@ -113,14 +113,21 @@ public:
 StaticRefPtr<MediaMemoryTracker> MediaMemoryTracker::sUniqueInstance;
 
 #if defined(PR_LOGGING)
-LazyLogModule gMediaTimerLog("MediaTimer");
-LazyLogModule gMediaSampleLog("MediaSample");
+PRLogModuleInfo* gMediaTimerLog;
+PRLogModuleInfo* gMediaSampleLog;
 #endif
 
 void
 MediaDecoder::InitStatics()
 {
   MOZ_ASSERT(NS_IsMainThread());
+
+#if defined(PR_LOGGING)
+  // Log modules.
+  gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
+  gMediaTimerLog = PR_NewLogModule("MediaTimer");
+  gMediaSampleLog = PR_NewLogModule("MediaSample");
+#endif
 }
 
 NS_IMPL_ISUPPORTS(MediaMemoryTracker, nsIMemoryReporter)

dom/media/MediaDecoderReader.cpp

@@ -22,7 +22,7 @@ namespace mozilla {
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(x, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("Decoder=%p " x, mDecoder, ##__VA_ARGS__))
 

dom/media/MediaDecoderStateMachine.h

@@ -107,8 +107,8 @@ class AudioSegment;
 class DecodedStream;
 class TaskQueue;
 
-extern LazyLogModule gMediaDecoderLog;
-extern LazyLogModule gMediaSampleLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaSampleLog;
 
 /*
   The state machine class. This manages the decoding and seeking in the

dom/media/MediaFormatReader.cpp

@@ -28,10 +28,15 @@ using mozilla::layers::Image;
 using mozilla::layers::LayerManager;
 using mozilla::layers::LayersBackend;
 
-static mozilla::LazyLogModule sFormatDecoderLog("MediaFormatReader");
-
-#define LOG(arg, ...) MOZ_LOG(sFormatDecoderLog, mozilla::LogLevel::Debug, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define LOGV(arg, ...) MOZ_LOG(sFormatDecoderLog, mozilla::LogLevel::Verbose, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+PRLogModuleInfo* GetFormatDecoderLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("MediaFormatReader");
+  }
+  return log;
+}
+#define LOG(arg, ...) MOZ_LOG(GetFormatDecoderLog(), mozilla::LogLevel::Debug, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define LOGV(arg, ...) MOZ_LOG(GetFormatDecoderLog(), mozilla::LogLevel::Verbose, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 

dom/media/MediaManager.cpp

@@ -104,10 +104,12 @@ namespace mozilla {
 #undef LOG
 #endif
 
-LogModule*
+PRLogModuleInfo*
 GetMediaManagerLog()
 {
-  static LazyLogModule sLog("MediaManager");
+  static PRLogModuleInfo *sLog;
+  if (!sLog)
+    sLog = PR_NewLogModule("MediaManager");
   return sLog;
 }
 #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)

dom/media/MediaManager.h

@@ -51,7 +51,7 @@ struct MediaTrackConstraints;
 struct MediaTrackConstraintSet;
 } // namespace dom
 
-extern LogModule* GetMediaManagerLog();
+extern PRLogModuleInfo* GetMediaManagerLog();
 #define MM_LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
 
 class MediaDevice : public nsIMediaDevice

dom/media/MediaRecorder.cpp

@@ -31,7 +31,7 @@
 #undef LOG
 #endif
 
-mozilla::LazyLogModule gMediaRecorderLog("MediaRecorder");
+PRLogModuleInfo* gMediaRecorderLog;
 #define LOG(type, msg) MOZ_LOG(gMediaRecorderLog, type, msg)
 
 namespace mozilla {
@@ -776,7 +776,9 @@ MediaRecorder::MediaRecorder(DOMMediaStream& aSourceMediaStream,
   MOZ_ASSERT(aOwnerWindow);
   MOZ_ASSERT(aOwnerWindow->IsInnerWindow());
   mDOMStream = &aSourceMediaStream;
-
+  if (!gMediaRecorderLog) {
+    gMediaRecorderLog = PR_NewLogModule("MediaRecorder");
+  }
   RegisterActivityObserver();
 }
 
@@ -807,7 +809,9 @@ MediaRecorder::MediaRecorder(AudioNode& aSrcAudioNode,
     }
   }
   mAudioNode = &aSrcAudioNode;
-
+  if (!gMediaRecorderLog) {
+    gMediaRecorderLog = PR_NewLogModule("MediaRecorder");
+  }
   RegisterActivityObserver();
 }
 

dom/media/MediaResource.cpp

@@ -36,7 +36,7 @@
 
 using mozilla::media::TimeUnit;
 
-mozilla::LazyLogModule gMediaResourceLog("MediaResource");
+PRLogModuleInfo* gMediaResourceLog;
 #define RESOURCE_LOG(msg, ...) MOZ_LOG(gMediaResourceLog, mozilla::LogLevel::Debug, \
                                       (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
@@ -79,6 +79,9 @@ ChannelMediaResource::ChannelMediaResource(MediaResourceCallback* aCallback,
     mIsTransportSeekable(true),
     mSuspendAgent(mChannel)
 {
+  if (!gMediaResourceLog) {
+    gMediaResourceLog = PR_NewLogModule("MediaResource");
+  }
 }
 
 ChannelMediaResource::~ChannelMediaResource()

dom/media/MediaShutdownManager.cpp

@@ -12,7 +12,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 NS_IMPL_ISUPPORTS(MediaShutdownManager, nsIObserver)

dom/media/MediaStreamGraph.cpp

@@ -39,7 +39,7 @@ using namespace mozilla::gfx;
 
 namespace mozilla {
 
-LazyLogModule gMediaStreamGraphLog("MediaStreamGraph");
+PRLogModuleInfo* gMediaStreamGraphLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 // #define ENABLE_LIFECYCLE_LOG
@@ -2639,6 +2639,10 @@ MediaStreamGraphImpl::MediaStreamGraphImpl(GraphDriverType aDriverRequested,
 #endif
   , mAudioChannel(aChannel)
 {
+  if (!gMediaStreamGraphLog) {
+    gMediaStreamGraphLog = PR_NewLogModule("MediaStreamGraph");
+  }
+
   if (mRealtime) {
     if (aDriverRequested == AUDIO_THREAD_DRIVER) {
       AudioCallbackDriver* driver = new AudioCallbackDriver(this);

dom/media/MediaStreamGraph.h

@@ -35,7 +35,7 @@ class nsAutoRefTraits<SpeexResamplerState> : public nsPointerRefTraits<SpeexResa
 
 namespace mozilla {
 
-extern LazyLogModule gMediaStreamGraphLog;
+extern PRLogModuleInfo* gMediaStreamGraphLog;
 
 namespace dom {
   enum class AudioContextOperation;

dom/media/MediaTimer.h

@@ -18,7 +18,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gMediaTimerLog;
+extern PRLogModuleInfo* gMediaTimerLog;
 
 #define TIMER_LOG(x, ...) \
   MOZ_ASSERT(gMediaTimerLog); \

dom/media/RtspMediaResource.cpp

@@ -21,7 +21,7 @@
 using namespace mozilla::net;
 using namespace mozilla::media;
 
-mozilla::LazyLogModule gRtspMediaResourceLog("RtspMediaResource");
+PRLogModuleInfo* gRtspMediaResourceLog;
 #define RTSP_LOG(msg, ...) MOZ_LOG(gRtspMediaResourceLog, mozilla::LogLevel::Debug, \
                                   (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
@@ -505,6 +505,9 @@ RtspMediaResource::RtspMediaResource(MediaResourceCallback* aCallback,
   MOZ_ASSERT(mMediaStreamController);
   mListener = new Listener(this);
   mMediaStreamController->AsyncOpen(mListener);
+  if (!gRtspMediaResourceLog) {
+    gRtspMediaResourceLog = PR_NewLogModule("RtspMediaResource");
+  }
 #endif
 }
 

dom/media/StreamBuffer.cpp

@@ -9,7 +9,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gMediaStreamGraphLog;
+extern PRLogModuleInfo* gMediaStreamGraphLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 #ifdef DEBUG

dom/media/TrackUnionStream.cpp

@@ -42,12 +42,15 @@ namespace mozilla {
 #undef STREAM_LOG
 #endif
 
-LazyLogModule gTrackUnionStreamLog("TrackUnionStream");
+PRLogModuleInfo* gTrackUnionStreamLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gTrackUnionStreamLog, type, msg)
 
 TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) :
   ProcessedMediaStream(aWrapper), mNextAvailableTrackID(1)
 {
+  if (!gTrackUnionStreamLog) {
+    gTrackUnionStreamLog = PR_NewLogModule("TrackUnionStream");
+  }
 }
 
   void TrackUnionStream::RemoveInput(MediaInputPort* aPort)

dom/media/WebVTTListener.cpp

@@ -28,13 +28,16 @@ NS_INTERFACE_MAP_END
 NS_IMPL_CYCLE_COLLECTING_ADDREF(WebVTTListener)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(WebVTTListener)
 
-LazyLogModule gTextTrackLog("TextTrack");
+PRLogModuleInfo* gTextTrackLog;
 # define VTT_LOG(...) MOZ_LOG(gTextTrackLog, LogLevel::Debug, (__VA_ARGS__))
 
 WebVTTListener::WebVTTListener(HTMLTrackElement* aElement)
   : mElement(aElement)
 {
   MOZ_ASSERT(mElement, "Must pass an element to the callback");
+  if (!gTextTrackLog) {
+    gTextTrackLog = PR_NewLogModule("TextTrack");
+  }
   VTT_LOG("WebVTTListener created.");
 }
 

dom/media/apple/AppleMP3Reader.cpp

@@ -23,7 +23,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define LOGE(...) MOZ_LOG(gMediaDecoderLog, mozilla::LogLevel::Error, (__VA_ARGS__))
 #define LOGW(...) MOZ_LOG(gMediaDecoderLog, mozilla::LogLevel::Warning, (__VA_ARGS__))
 #define LOGD(...) MOZ_LOG(gMediaDecoderLog, mozilla::LogLevel::Debug, (__VA_ARGS__))

dom/media/directshow/AudioSinkFilter.cpp

@@ -23,7 +23,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-extern LogModule* GetDirectShowLog();
+PRLogModuleInfo* GetDirectShowLog();
 #define LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 AudioSinkFilter::AudioSinkFilter(const wchar_t* aObjectName, HRESULT* aOutResult)

dom/media/directshow/AudioSinkInputPin.cpp

@@ -15,7 +15,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-extern LogModule* GetDirectShowLog();
+PRLogModuleInfo* GetDirectShowLog();
 #define LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 AudioSinkInputPin::AudioSinkInputPin(wchar_t* aObjectName,

dom/media/directshow/DirectShowReader.cpp

@@ -18,9 +18,13 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-LogModule*
+
+PRLogModuleInfo*
 GetDirectShowLog() {
-  static LazyLogModule log("DirectShowDecoder");
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("DirectShowDecoder");
+  }
   return log;
 }
 

dom/media/directshow/SampleSink.cpp

@@ -14,7 +14,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-extern LogModule* GetDirectShowLog();
+PRLogModuleInfo* GetDirectShowLog();
 #define LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 SampleSink::SampleSink()

dom/media/directshow/SourceFilter.cpp

@@ -20,7 +20,7 @@ namespace mozilla {
 //#define DEBUG_SOURCE_TRACE 1
 
 #if defined (DEBUG_SOURCE_TRACE)
-extern LogModule* GetDirectShowLog();
+PRLogModuleInfo* GetDirectShowLog();
 #define DIRECTSHOW_LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #else
 #define DIRECTSHOW_LOG(...)

dom/media/eme/EMEUtils.cpp

@@ -8,13 +8,19 @@
 
 namespace mozilla {
 
-LogModule* GetEMELog() {
-  static LazyLogModule log("EME");
+PRLogModuleInfo* GetEMELog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("EME");
+  }
   return log;
 }
 
-LogModule* GetEMEVerboseLog() {
-  static LazyLogModule log("EMEV");
+PRLogModuleInfo* GetEMEVerboseLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("EMEV");
+  }
   return log;
 }
 

dom/media/eme/EMEUtils.h

@@ -13,13 +13,13 @@
 namespace mozilla {
 
 #ifndef EME_LOG
-  LogModule* GetEMELog();
+  PRLogModuleInfo* GetEMELog();
   #define EME_LOG(...) MOZ_LOG(GetEMELog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
   #define EME_LOG_ENABLED() MOZ_LOG_TEST(GetEMELog(), mozilla::LogLevel::Debug)
 #endif
 
 #ifndef EME_VERBOSE_LOG
-  LogModule* GetEMEVerboseLog();
+  PRLogModuleInfo* GetEMEVerboseLog();
   #define EME_VERBOSE_LOG(...) MOZ_LOG(GetEMEVerboseLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #else
   #ifndef EME_LOG

dom/media/encoder/MediaEncoder.cpp

@@ -31,7 +31,7 @@
 #undef LOG
 #endif
 
-mozilla::LazyLogModule gMediaEncoderLog("MediaEncoder");
+PRLogModuleInfo* gMediaEncoderLog;
 #define LOG(type, msg) MOZ_LOG(gMediaEncoderLog, type, msg)
 
 namespace mozilla {
@@ -79,6 +79,9 @@ MediaEncoder::CreateEncoder(const nsAString& aMIMEType, uint32_t aAudioBitrate,
                             uint32_t aVideoBitrate, uint32_t aBitrate,
                             uint8_t aTrackTypes)
 {
+  if (!gMediaEncoderLog) {
+    gMediaEncoderLog = PR_NewLogModule("MediaEncoder");
+  }
   PROFILER_LABEL("MediaEncoder", "CreateEncoder",
     js::ProfileEntry::Category::OTHER);
 

dom/media/encoder/TrackEncoder.cpp

@@ -18,7 +18,7 @@
 
 namespace mozilla {
 
-LazyLogModule gTrackEncoderLog("TrackEncoder");
+PRLogModuleInfo* gTrackEncoderLog;
 #define TRACK_LOG(type, msg) MOZ_LOG(gTrackEncoderLog, type, msg)
 
 static const int DEFAULT_CHANNELS = 1;
@@ -37,6 +37,9 @@ TrackEncoder::TrackEncoder()
   , mAudioInitCounter(0)
   , mVideoInitCounter(0)
 {
+  if (!gTrackEncoderLog) {
+    gTrackEncoderLog = PR_NewLogModule("TrackEncoder");
+  }
 }
 
 void

dom/media/encoder/VP8TrackEncoder.cpp

@@ -17,7 +17,7 @@
 
 namespace mozilla {
 
-LazyLogModule gVP8TrackEncoderLog("VP8TrackEncoder");
+PRLogModuleInfo* gVP8TrackEncoderLog;
 #define VP8LOG(msg, ...) MOZ_LOG(gVP8TrackEncoderLog, mozilla::LogLevel::Debug, \
                                   (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
@@ -37,6 +37,9 @@ VP8TrackEncoder::VP8TrackEncoder()
   , mVPXImageWrapper(new vpx_image_t())
 {
   MOZ_COUNT_CTOR(VP8TrackEncoder);
+  if (!gVP8TrackEncoderLog) {
+    gVP8TrackEncoderLog = PR_NewLogModule("VP8TrackEncoder");
+  }
 }
 
 VP8TrackEncoder::~VP8TrackEncoder()

dom/media/encoder/VorbisTrackEncoder.cpp

@@ -17,7 +17,7 @@ static const float BASE_QUALITY = 0.4f;
 namespace mozilla {
 
 #undef LOG
-LazyLogModule gVorbisTrackEncoderLog("VorbisTrackEncoder");
+PRLogModuleInfo* gVorbisTrackEncoderLog;
 #define VORBISLOG(msg, ...) MOZ_LOG(gVorbisTrackEncoderLog, mozilla::LogLevel::Debug, \
                              (msg, ##__VA_ARGS__))
 
@@ -25,6 +25,9 @@ VorbisTrackEncoder::VorbisTrackEncoder()
   : AudioTrackEncoder()
 {
   MOZ_COUNT_CTOR(VorbisTrackEncoder);
+  if (!gVorbisTrackEncoderLog) {
+    gVorbisTrackEncoderLog = PR_NewLogModule("VorbisTrackEncoder");
+  }
 }
 
 VorbisTrackEncoder::~VorbisTrackEncoder()

dom/media/fmp4/MP4Demuxer.cpp

@@ -20,8 +20,11 @@
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/H264.h"
 
-mozilla::LogModule* GetDemuxerLog() {
-  static mozilla::LazyLogModule log("MP4Demuxer");
+PRLogModuleInfo* GetDemuxerLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("MP4Demuxer");
+  }
   return log;
 }
 

dom/media/gmp/GMPAudioDecoderParent.cpp

@@ -17,7 +17,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 #define LOGV(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Verbose, msg)
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)

dom/media/gmp/GMPChild.cpp

@@ -43,7 +43,7 @@ namespace mozilla {
 #undef LOG
 #undef LOGD
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 #define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
 #define LOGD(x, ...) LOG(mozilla::LogLevel::Debug, "GMPChild[pid=%d] " x, (int)base::GetCurrentProcId(), ##__VA_ARGS__)
 

dom/media/gmp/GMPContentParent.cpp

@@ -20,7 +20,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)

dom/media/gmp/GMPDecryptorParent.cpp

@@ -14,7 +14,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 #define LOGV(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Verbose, msg)
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)

dom/media/gmp/GMPParent.cpp

@@ -43,7 +43,7 @@ namespace mozilla {
 #undef LOG
 #undef LOGD
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 #define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
 #define LOGD(x, ...) LOG(mozilla::LogLevel::Debug, "GMPParent[%p|childPid=%d] " x, this, mChildPid, ##__VA_ARGS__)
 

dom/media/gmp/GMPService.cpp

@@ -46,10 +46,12 @@ namespace mozilla {
 #undef LOG
 #endif
 
-LogModule*
+PRLogModuleInfo*
 GetGMPLog()
 {
-  static LazyLogModule sLog("GMP");
+  static PRLogModuleInfo *sLog;
+  if (!sLog)
+    sLog = PR_NewLogModule("GMP");
   return sLog;
 }
 

dom/media/gmp/GMPService.h

@@ -24,7 +24,7 @@ template <class> struct already_AddRefed;
 
 namespace mozilla {
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 namespace gmp {
 

dom/media/gmp/GMPStorageParent.cpp

@@ -25,7 +25,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)

dom/media/gmp/GMPTimerParent.cpp

@@ -13,7 +13,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)

dom/media/gmp/GMPVideoDecoderParent.cpp

@@ -21,7 +21,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 #define LOGV(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Verbose, msg)
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)

dom/media/gmp/GMPVideoEncoderParent.cpp

@@ -23,7 +23,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern LogModule* GetGMPLog();
+extern PRLogModuleInfo* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)

dom/media/gstreamer/GStreamerFormatHelper.cpp

@@ -16,7 +16,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define LOG(msg, ...) \
     MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("GStreamerFormatHelper " msg, ##__VA_ARGS__))
 

dom/media/gstreamer/GStreamerReader.cpp

@@ -29,7 +29,7 @@ using namespace media;
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define LOG(type, msg, ...) \
   MOZ_LOG(gMediaDecoderLog, type, ("GStreamerReader(%p) " msg, this, ##__VA_ARGS__))
 

dom/media/imagecapture/ImageCapture.cpp

@@ -18,9 +18,12 @@
 
 namespace mozilla {
 
-LogModule* GetICLog()
+PRLogModuleInfo* GetICLog()
 {
-  static LazyLogModule log("ImageCapture");
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("ImageCapture");
+  }
   return log;
 }
 

dom/media/imagecapture/ImageCapture.h

@@ -14,7 +14,7 @@
 namespace mozilla {
 
 #ifndef IC_LOG
-LogModule* GetICLog();
+PRLogModuleInfo* GetICLog();
 #define IC_LOG(...) MOZ_LOG(GetICLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #endif
 

dom/media/mediasink/DecodedAudioDataSink.cpp

@@ -14,7 +14,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define SINK_LOG(msg, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, \
     ("DecodedAudioDataSink=%p " msg, this, ##__VA_ARGS__))

dom/media/mediasink/VideoSink.cpp

@@ -8,7 +8,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define VSINK_LOG(msg, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, \
     ("VideoSink=%p " msg, this, ##__VA_ARGS__))

dom/media/mediasource/ContainerParser.cpp

@@ -20,7 +20,7 @@
 #endif
 #include "SourceBufferResource.h"
 
-extern mozilla::LogModule* GetMediaSourceSamplesLog();
+extern PRLogModuleInfo* GetMediaSourceSamplesLog();
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)

dom/media/mediasource/MediaSource.cpp

@@ -36,15 +36,21 @@
 struct JSContext;
 class JSObject;
 
-mozilla::LogModule* GetMediaSourceLog()
+PRLogModuleInfo* GetMediaSourceLog()
 {
-  static mozilla::LazyLogModule sLogModule("MediaSource");
+  static PRLogModuleInfo* sLogModule = nullptr;
+  if (!sLogModule) {
+    sLogModule = PR_NewLogModule("MediaSource");
+  }
   return sLogModule;
 }
 
-mozilla::LogModule* GetMediaSourceAPILog()
+PRLogModuleInfo* GetMediaSourceAPILog()
 {
-  static mozilla::LazyLogModule sLogModule("MediaSource");
+  static PRLogModuleInfo* sLogModule = nullptr;
+  if (!sLogModule) {
+    sLogModule = PR_NewLogModule("MediaSource");
+  }
   return sLogModule;
 }
 

dom/media/mediasource/MediaSourceDecoder.cpp

@@ -17,7 +17,7 @@
 #include "MediaSourceDemuxer.h"
 #include "SourceBufferList.h"
 
-extern mozilla::LogModule* GetMediaSourceLog();
+extern PRLogModuleInfo* GetMediaSourceLog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))

dom/media/mediasource/MediaSourceResource.h

@@ -11,7 +11,7 @@
 #include "mozilla/Monitor.h"
 #include "mozilla/Logging.h"
 
-extern mozilla::LogModule* GetMediaSourceLog();
+extern PRLogModuleInfo* GetMediaSourceLog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("MediaSourceResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 

dom/media/mediasource/ResourceQueue.cpp

@@ -10,7 +10,7 @@
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Logging.h"
 
-extern mozilla::LogModule* GetSourceBufferResourceLog();
+extern PRLogModuleInfo* GetSourceBufferResourceLog();
 
 #define SBR_DEBUG(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), mozilla::LogLevel::Debug, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 #define SBR_DEBUGV(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), mozilla::LogLevel::Verbose, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))

dom/media/mediasource/SourceBuffer.cpp

@@ -26,8 +26,8 @@
 struct JSContext;
 class JSObject;
 
-extern mozilla::LogModule* GetMediaSourceLog();
-extern mozilla::LogModule* GetMediaSourceAPILog();
+extern PRLogModuleInfo* GetMediaSourceLog();
+extern PRLogModuleInfo* GetMediaSourceAPILog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))

dom/media/mediasource/SourceBufferList.cpp

@@ -16,8 +16,8 @@
 #include "nsThreadUtils.h"
 #include "mozilla/Logging.h"
 
-extern mozilla::LogModule* GetMediaSourceLog();
-extern mozilla::LogModule* GetMediaSourceAPILog();
+extern PRLogModuleInfo* GetMediaSourceLog();
+extern PRLogModuleInfo* GetMediaSourceAPILog();
 
 #define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), mozilla::LogLevel::Debug, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))

dom/media/mediasource/SourceBufferResource.cpp

@@ -13,9 +13,12 @@
 #include "mozilla/Logging.h"
 #include "MediaData.h"
 
-mozilla::LogModule* GetSourceBufferResourceLog()
+PRLogModuleInfo* GetSourceBufferResourceLog()
 {
-  static mozilla::LazyLogModule sLogModule("SourceBufferResource");
+  static PRLogModuleInfo* sLogModule = nullptr;
+  if (!sLogModule) {
+    sLogModule = PR_NewLogModule("SourceBufferResource");
+  }
   return sLogModule;
 }
 

dom/media/mediasource/TrackBuffersManager.cpp

@@ -23,14 +23,17 @@
 
 #include <limits>
 
-extern mozilla::LogModule* GetMediaSourceLog();
+extern PRLogModuleInfo* GetMediaSourceLog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("TrackBuffersManager(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("TrackBuffersManager(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
-mozilla::LogModule* GetMediaSourceSamplesLog()
+PRLogModuleInfo* GetMediaSourceSamplesLog()
 {
-  static mozilla::LazyLogModule sLogModule("MediaSourceSamples");
+  static PRLogModuleInfo* sLogModule = nullptr;
+  if (!sLogModule) {
+    sLogModule = PR_NewLogModule("MediaSourceSamples");
+  }
   return sLogModule;
 }
 #define SAMPLE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceSamplesLog(), mozilla::LogLevel::Debug, ("TrackBuffersManager(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))

dom/media/ogg/OggCodecState.cpp

@@ -32,7 +32,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 /** Decoder base class for Ogg-encapsulated streams. */

dom/media/ogg/OggReader.cpp

@@ -37,7 +37,7 @@ namespace mozilla {
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #ifdef SEEK_LOGGING
 #define SEEK_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)

dom/media/ogg/OpusParser.cpp

@@ -24,7 +24,7 @@ extern "C" {
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define OPUS_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 OpusParser::OpusParser():

dom/media/omx/AudioOffloadPlayer.cpp

@@ -42,7 +42,7 @@ using namespace android;
 
 namespace mozilla {
 
-LazyLogModule gAudioOffloadPlayerLog("AudioOffloadPlayer");
+PRLogModuleInfo* gAudioOffloadPlayerLog;
 #define AUDIO_OFFLOAD_LOG(type, msg) \
   MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
 
@@ -63,6 +63,10 @@ AudioOffloadPlayer::AudioOffloadPlayer(MediaOmxCommonDecoder* aObserver) :
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  if (!gAudioOffloadPlayerLog) {
+    gAudioOffloadPlayerLog = PR_NewLogModule("AudioOffloadPlayer");
+  }
+
   CHECK(aObserver);
 #if ANDROID_VERSION >= 21
   mSessionId = AudioSystem::newAudioUniqueId();

dom/media/omx/AudioOutput.cpp

@@ -24,7 +24,7 @@
 
 namespace mozilla {
 
-extern LazyLogModule gAudioOffloadPlayerLog;
+extern PRLogModuleInfo* gAudioOffloadPlayerLog;
 #define AUDIO_OFFLOAD_LOG(type, msg) \
   MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
 
@@ -37,6 +37,9 @@ AudioOutput::AudioOutput(int aSessionId, int aUid) :
   mUid(aUid),
   mSessionId(aSessionId)
 {
+  if (!gAudioOffloadPlayerLog) {
+    gAudioOffloadPlayerLog = PR_NewLogModule("AudioOffloadPlayer");
+  }
 }
 
 AudioOutput::~AudioOutput()

dom/media/omx/I420ColorConverterHelper.cpp

@@ -10,7 +10,7 @@
 
 #include "mozilla/Logging.h"
 
-mozilla::LazyLogModule gI420ColorConverterHelperLog("I420ColorConverterHelper");
+PRLogModuleInfo *gI420ColorConverterHelperLog;
 #define LOG(msg...) MOZ_LOG(gI420ColorConverterHelperLog, mozilla::LogLevel::Warning, (msg))
 
 namespace android {
@@ -19,6 +19,9 @@ I420ColorConverterHelper::I420ColorConverterHelper()
   : mHandle(nullptr)
   , mConverter({nullptr, nullptr, nullptr, nullptr, nullptr})
 {
+  if (!gI420ColorConverterHelperLog) {
+    gI420ColorConverterHelperLog = PR_NewLogModule("I420ColorConverterHelper");
+  }
 }
 
 I420ColorConverterHelper::~I420ColorConverterHelper()

dom/media/omx/MediaOmxCommonDecoder.cpp

@@ -20,7 +20,7 @@ using namespace android;
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 MediaOmxCommonDecoder::MediaOmxCommonDecoder(MediaDecoderOwner* aOwner)

dom/media/omx/MediaOmxCommonReader.cpp

@@ -23,7 +23,7 @@ using namespace android;
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 MediaOmxCommonReader::MediaOmxCommonReader(AbstractMediaDecoder *aDecoder)

dom/media/omx/MediaOmxReader.cpp

@@ -28,7 +28,7 @@ using namespace android;
 
 namespace mozilla {
 
-extern LazyLogModule gMediaDecoderLog;
+extern PRLogModuleInfo* gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 class MediaOmxReader::ProcessCachedDataTask : public Task

dom/media/omx/OmxDecoder.cpp

@@ -37,7 +37,7 @@
 #define OD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "OmxDecoder", __VA_ARGS__)
 
 #undef LOG
-mozilla::LazyLogModule gOmxDecoderLog("OmxDecoder");
+PRLogModuleInfo *gOmxDecoderLog;
 #define LOG(type, msg...) MOZ_LOG(gOmxDecoderLog, type, (msg))
 
 using namespace MPAPI;
@@ -102,6 +102,10 @@ static sp<IOMX> GetOMX()
 
 bool
 OmxDecoder::Init(sp<MediaExtractor>& extractor) {
+  if (!gOmxDecoderLog) {
+    gOmxDecoderLog = PR_NewLogModule("OmxDecoder");
+  }
+
   sp<MetaData> meta = extractor->getMetaData();
 
   ssize_t audioTrackIndex = -1;

dom/media/platforms/PlatformDecoderModule.cpp

@@ -6,7 +6,10 @@
 
 #include "PlatformDecoderModule.h"
 
-mozilla::LogModule* GetPDMLog() {
-  static mozilla::LazyLogModule log("PlatformDecoderModule");
+PRLogModuleInfo* GetPDMLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("PlatformDecoderModule");
+  }
   return log;
 }

dom/media/platforms/agnostic/OpusDecoder.cpp

@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <inttypes.h>  // For PRId64
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define OPUS_DEBUG(arg, ...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, \
     ("OpusDataDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 

dom/media/platforms/agnostic/VPXDecoder.cpp

@@ -14,7 +14,7 @@
 #include <algorithm>
 
 #undef LOG
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(arg, ...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, ("VPXDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 namespace mozilla {

dom/media/platforms/agnostic/VorbisDecoder.cpp

@@ -12,7 +12,7 @@
 #include "nsAutoPtr.h"
 
 #undef LOG
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(type, msg) MOZ_LOG(GetPDMLog(), type, msg)
 
 namespace mozilla {

dom/media/platforms/apple/AppleATDecoder.cpp

@@ -11,7 +11,7 @@
 #include "AppleATDecoder.h"
 #include "mozilla/Logging.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #define FourCC2Str(n) ((char[5]){(char)(n >> 24), (char)(n >> 16), (char)(n >> 8), (char)(n), 0})
 

dom/media/platforms/apple/AppleCMLinker.cpp

@@ -15,7 +15,7 @@
 #include "nsCocoaFeatures.h"
 #endif
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {

dom/media/platforms/apple/AppleVDADecoder.cpp

@@ -27,7 +27,7 @@
 #include "MacIOSurfaceImage.h"
 #endif
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 //#define LOG_MEDIA_SHA1
 

dom/media/platforms/apple/AppleVDALinker.cpp

@@ -10,7 +10,7 @@
 #include "MainThreadUtils.h"
 #include "nsDebug.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {

dom/media/platforms/apple/AppleVTDecoder.cpp

@@ -20,7 +20,7 @@
 #include "VideoUtils.h"
 #include "gfxPlatform.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 //#define LOG_MEDIA_SHA1
 

dom/media/platforms/apple/AppleVTLinker.cpp

@@ -11,7 +11,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "nsDebug.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {

dom/media/platforms/ffmpeg/FFmpegLog.h

@@ -7,7 +7,7 @@
 #ifndef __FFmpegLog_h__
 #define __FFmpegLog_h__
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define FFMPEG_LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 #endif // __FFmpegLog_h__

dom/media/platforms/gonk/GonkAudioDecoderManager.cpp

@@ -27,7 +27,7 @@
 #include <android/log.h>
 #define GADM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkAudioDecoderManager", __VA_ARGS__)
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 using namespace android;

dom/media/platforms/gonk/GonkMediaDataDecoder.cpp

@@ -20,7 +20,7 @@
 #include <utils/AndroidThreads.h>
 #endif
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 using namespace android;

dom/media/platforms/gonk/GonkVideoDecoderManager.cpp

@@ -32,7 +32,7 @@
 #include <android/log.h>
 #define GVDM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkVideoDecoderManager", __VA_ARGS__)
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 using namespace mozilla::layers;
 using namespace android;

dom/media/platforms/wmf/MFTDecoder.cpp

@@ -9,7 +9,7 @@
 #include "WMFUtils.h"
 #include "mozilla/Logging.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {

dom/media/platforms/wmf/WMFAudioMFTManager.cpp

@@ -13,7 +13,7 @@
 
 #include "mozilla/Logging.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {

dom/media/platforms/wmf/WMFMediaDataDecoder.cpp

@@ -12,7 +12,7 @@
 
 #include "mozilla/Logging.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {

dom/media/platforms/wmf/WMFVideoMFTManager.cpp

@@ -23,7 +23,7 @@
 #include "mozilla/Preferences.h"
 #include "nsPrintfCString.h"
 
-extern mozilla::LogModule* GetPDMLog();
+extern PRLogModuleInfo* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 using mozilla::layers::Image;

dom/media/platforms/wrappers/FuzzingWrapper.cpp

@@ -6,8 +6,11 @@
 
 #include "FuzzingWrapper.h"
 
-mozilla::LogModule* GetFuzzingWrapperLog() {
-  static mozilla::LazyLogModule log("MediaFuzzingWrapper");
+PRLogModuleInfo* GetFuzzingWrapperLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("MediaFuzzingWrapper");
+  }
   return log;
 }
 #define DFW_LOGD(arg, ...) MOZ_LOG(GetFuzzingWrapperLog(), mozilla::LogLevel::Debug, ("DecoderFuzzingWrapper(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))

dom/media/systemservices/CamerasChild.cpp

@@ -22,7 +22,7 @@
 
 #undef LOG
 #undef LOG_ENABLED
-mozilla::LazyLogModule gCamerasChildLog("CamerasChild");
+PRLogModuleInfo *gCamerasChildLog;
 #define LOG(args) MOZ_LOG(gCamerasChildLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gCamerasChildLog, mozilla::LogLevel::Debug)
 
@@ -56,6 +56,9 @@ public:
     : mCamerasMutex("CamerasSingleton::mCamerasMutex"),
       mCameras(nullptr),
       mCamerasChildThread(nullptr) {
+    if (!gCamerasChildLog) {
+      gCamerasChildLog = PR_NewLogModule("CamerasChild");
+    }
     LOG(("CamerasSingleton: %p", this));
   }
 
@@ -141,6 +144,10 @@ Cameras() {
   OffTheBooksMutexAutoLock lock(CamerasSingleton::Mutex());
   if (!CamerasSingleton::Child()) {
     MOZ_ASSERT(!NS_IsMainThread(), "Should not be on the main Thread");
+    if (!gCamerasChildLog) {
+      gCamerasChildLog = PR_NewLogModule("CamerasChild");
+    }
+
     MOZ_ASSERT(!CamerasSingleton::Thread());
     LOG(("No sCameras, setting up IPC Thread"));
     nsresult rv = NS_NewNamedThread("Cameras IPC",
@@ -699,6 +706,10 @@ CamerasChild::CamerasChild()
     mRequestMutex("mozilla::cameras::CamerasChild::mRequestMutex"),
     mReplyMonitor("mozilla::cameras::CamerasChild::mReplyMonitor")
 {
+  if (!gCamerasChildLog) {
+    gCamerasChildLog = PR_NewLogModule("CamerasChild");
+  }
+
   LOG(("CamerasChild: %p", this));
 
   MOZ_COUNT_CTOR(CamerasChild);

dom/media/systemservices/CamerasParent.cpp

@@ -18,7 +18,7 @@
 
 #undef LOG
 #undef LOG_ENABLED
-mozilla::LazyLogModule gCamerasParentLog("CamerasParent");
+PRLogModuleInfo *gCamerasParentLog;
 #define LOG(args) MOZ_LOG(gCamerasParentLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gCamerasParentLog, mozilla::LogLevel::Debug)
 
@@ -852,6 +852,9 @@ CamerasParent::CamerasParent()
     mDestroyed(false),
     mWebRTCAlive(true)
 {
+  if (!gCamerasParentLog) {
+    gCamerasParentLog = PR_NewLogModule("CamerasParent");
+  }
   LOG(("CamerasParent: %p", this));
 
   mPBackgroundThread = NS_GetCurrentThread();

dom/media/systemservices/LoadManager.cpp

@@ -19,7 +19,7 @@
 #include "mozilla/ArrayUtils.h"
 
 // NSPR_LOG_MODULES=LoadManager:5
-mozilla::LazyLogModule gLoadManagerLog("LoadManager");
+PRLogModuleInfo *gLoadManagerLog = nullptr;
 #undef LOG
 #undef LOG_ENABLED
 #define LOG(args) MOZ_LOG(gLoadManagerLog, mozilla::LogLevel::Debug, args)
@@ -46,6 +46,8 @@ LoadManagerSingleton::LoadManagerSingleton(int aLoadMeasurementInterval,
     mHighLoadThreshold(aHighLoadThreshold),
     mLowLoadThreshold(aLowLoadThreshold)
 {
+  if (!gLoadManagerLog)
+    gLoadManagerLog = PR_NewLogModule("LoadManager");
   LOG(("LoadManager - Initializing (%dms x %d, %f, %f)",
        mLoadMeasurementInterval, mAveragingMeasurements,
        mHighLoadThreshold, mLowLoadThreshold));

dom/media/systemservices/LoadManager.h

@@ -16,7 +16,7 @@
 #include "webrtc/common_types.h"
 #include "webrtc/video_engine/include/vie_base.h"
 
-extern mozilla::LazyLogModule gLoadManagerLog;
+extern PRLogModuleInfo *gLoadManagerLog;
 
 namespace mozilla {
 

dom/media/systemservices/MediaChild.cpp

@@ -13,7 +13,7 @@
 #include "nsQueryObject.h"
 
 #undef LOG
-mozilla::LazyLogModule gMediaChildLog("MediaChild");
+PRLogModuleInfo *gMediaChildLog;
 #define LOG(args) MOZ_LOG(gMediaChildLog, mozilla::LogLevel::Debug, args)
 
 namespace mozilla {
@@ -68,6 +68,9 @@ Child* Child::Get()
 Child::Child()
   : mActorDestroyed(false)
 {
+  if (!gMediaChildLog) {
+    gMediaChildLog = PR_NewLogModule("MediaChild");
+  }
   LOG(("media::Child: %p", this));
   MOZ_COUNT_CTOR(Child);
 }

dom/media/systemservices/MediaParent.cpp

@@ -24,7 +24,7 @@
 #include "mozilla/Logging.h"
 
 #undef LOG
-mozilla::LazyLogModule gMediaParentLog("MediaParent");
+PRLogModuleInfo *gMediaParentLog;
 #define LOG(args) MOZ_LOG(gMediaParentLog, mozilla::LogLevel::Debug, args)
 
 // A file in the profile dir is used to persist mOriginKeys used to anonymize
@@ -511,6 +511,8 @@ Parent<Super>::Parent(bool aSameProcess)
   , mDestroyed(false)
   , mSameProcess(aSameProcess)
 {
+  if (!gMediaParentLog)
+    gMediaParentLog = PR_NewLogModule("MediaParent");
   LOG(("media::Parent: %p", this));
 }
 

dom/media/systemservices/OpenSLESProvider.cpp

@@ -14,7 +14,7 @@
 // NSPR_LOG_MODULES=OpenSLESProvider:5
 #undef LOG
 #undef LOG_ENABLED
-mozilla::LazyLogModule gOpenSLESProviderLog("OpenSLESProvider");
+PRLogModuleInfo *gOpenSLESProviderLog;
 #define LOG(args) MOZ_LOG(gOpenSLESProviderLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gOpenSLESProviderLog, mozilla::LogLevel::Debug)
 
@@ -27,6 +27,8 @@ OpenSLESProvider::OpenSLESProvider()
     mIsRealized(false),
     mOpenSLESLib(nullptr)
 {
+  if (!gOpenSLESProviderLog)
+    gOpenSLESProviderLog = PR_NewLogModule("OpenSLESProvider");
   LOG(("OpenSLESProvider being initialized"));
 }
 

dom/media/systemservices/OpenSLESProvider.h

@@ -28,7 +28,7 @@ SLresult mozilla_realize_sles_engine(SLObjectItf aObjectm);
 #ifdef __cplusplus
 #include "mozilla/Mutex.h"
 
-extern mozilla::LazyLogModule gOpenSLESProviderLog;
+extern PRLogModuleInfo *gOpenSLESProviderLog;
 
 namespace mozilla {