Bug 1204776: P3. Have FFmpeg PDM use PlatformDecoderModule log. r=cpearce
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 15 Sep 2015 15:22:47 +1000
changeset 295327 e3595c625039fd9a1f048459582974a8265a2b2c
parent 295326 58190c41c658c3f85e4cd854582d18f7b592755d
child 295328 e8eb8b46b68d2a0b04d704602a0c4cf96fd78af8
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1204776
milestone43.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 1204776: P3. Have FFmpeg PDM use PlatformDecoderModule log. r=cpearce
dom/media/platforms/ffmpeg/FFmpegLog.cpp
dom/media/platforms/ffmpeg/FFmpegLog.h
dom/media/platforms/moz.build
deleted file mode 100644
--- a/dom/media/platforms/ffmpeg/FFmpegLog.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozilla/Logging.h"
-
-PRLogModuleInfo* GetFFmpegDecoderLog()
-{
-  static PRLogModuleInfo* sFFmpegDecoderLog = nullptr;
-  if (!sFFmpegDecoderLog) {
-    sFFmpegDecoderLog = PR_NewLogModule("FFmpegDecoderModule");
-  }
-  return sFFmpegDecoderLog;
-}
-
--- a/dom/media/platforms/ffmpeg/FFmpegLog.h
+++ b/dom/media/platforms/ffmpeg/FFmpegLog.h
@@ -2,12 +2,12 @@
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef __FFmpegLog_h__
 #define __FFmpegLog_h__
 
-extern PRLogModuleInfo* GetFFmpegDecoderLog();
-#define FFMPEG_LOG(...) MOZ_LOG(GetFFmpegDecoderLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
+extern PRLogModuleInfo* GetPDMLog();
+#define FFMPEG_LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 #endif // __FFmpegLog_h__
--- a/dom/media/platforms/moz.build
+++ b/dom/media/platforms/moz.build
@@ -33,17 +33,16 @@ if CONFIG['MOZ_WMF']:
 if CONFIG['MOZ_EME']:
     DIRS += ['agnostic/eme']
 
 if CONFIG['MOZ_FFMPEG']:
     EXPORTS += [
         'ffmpeg/FFmpegRuntimeLinker.h',
     ]
     UNIFIED_SOURCES += [
-        'ffmpeg/FFmpegLog.cpp',
         'ffmpeg/FFmpegRuntimeLinker.cpp',
     ]
     DIRS += [
         'ffmpeg/libav53',
         'ffmpeg/libav54',
         'ffmpeg/libav55',
     ]
     LOCAL_INCLUDES += [