Bug 1334061: P4. Move MediaDataDecoderProxy into wrapper category. r?cpearce draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Thu, 16 Feb 2017 10:14:19 +0100
changeset 485536 448d6aaa85505c009fcafd64948be702a4309fa0
parent 485535 dfdb69da5ff416c5333ad815d9401cd00f73bcd1
child 485537 afb20f2b1cc51e39987a218b8887fca6601e465c
push id45757
push userbmo:jyavenard@mozilla.com
push dateThu, 16 Feb 2017 20:51:43 +0000
reviewerscpearce
bugs1334061
milestone54.0a1
Bug 1334061: P4. Move MediaDataDecoderProxy into wrapper category. r?cpearce We will later use it for non-EME/GMP related tasks. MozReview-Commit-ID: 4rIjviYdYkO
dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp
dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h
dom/media/platforms/agnostic/gmp/moz.build
dom/media/platforms/moz.build
dom/media/platforms/wrappers/MediaDataDecoderProxy.cpp
dom/media/platforms/wrappers/MediaDataDecoderProxy.h
--- a/dom/media/platforms/agnostic/gmp/moz.build
+++ b/dom/media/platforms/agnostic/gmp/moz.build
@@ -2,21 +2,19 @@
 # vim: set filetype=python:
 # 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/.
 
 EXPORTS += [
     'GMPDecoderModule.h',
     'GMPVideoDecoder.h',
-    'MediaDataDecoderProxy.h',
 ]
 
 UNIFIED_SOURCES += [
     'GMPDecoderModule.cpp',
     'GMPVideoDecoder.cpp',
-    'MediaDataDecoderProxy.cpp',
 ]
 
 # GMPVideoEncodedFrameImpl.h needs IPC
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/dom/media/platforms/moz.build
+++ b/dom/media/platforms/moz.build
@@ -9,29 +9,32 @@ EXPORTS += [
     'agnostic/OpusDecoder.h',
     'agnostic/TheoraDecoder.h',
     'agnostic/VorbisDecoder.h',
     'agnostic/VPXDecoder.h',
     'DurationMap.h',
     'MediaTelemetryConstants.h',
     'PDMFactory.h',
     'PlatformDecoderModule.h',
-    'wrappers/H264Converter.h'
+    'wrappers/H264Converter.h',
+    'wrappers/MediaDataDecoderProxy.h'
+
 ]
 
 UNIFIED_SOURCES += [
     'agnostic/AgnosticDecoderModule.cpp',
     'agnostic/BlankDecoderModule.cpp',
     'agnostic/OpusDecoder.cpp',
     'agnostic/TheoraDecoder.cpp',
     'agnostic/VorbisDecoder.cpp',
     'agnostic/VPXDecoder.cpp',
     'agnostic/WAVDecoder.cpp',
     'PDMFactory.cpp',
-    'wrappers/H264Converter.cpp'
+    'wrappers/H264Converter.cpp',
+    'wrappers/MediaDataDecoderProxy.cpp'
 ]
 
 DIRS += [
     'agnostic/eme',
     'agnostic/gmp',
     'omx'
 ]
 
rename from dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp
rename to dom/media/platforms/wrappers/MediaDataDecoderProxy.cpp
rename from dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h
rename to dom/media/platforms/wrappers/MediaDataDecoderProxy.h