From b5b62d841c733dcb62112f3158f1488e670671d6 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 02:32:20 +0000 Subject: Issue #80 - De-unify dom/media part 1 This de-unifies up to and including dom/media/platforms with the exception of dom/media/platforms/wmf, because that one throws weird errors in the Win SDK which don't have a clear cause (yet) --- dom/media/platforms/agnostic/TheoraDecoder.cpp | 1 + dom/media/platforms/agnostic/eme/moz.build | 2 +- dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 1 + dom/media/platforms/agnostic/gmp/moz.build | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'dom/media/platforms/agnostic') diff --git a/dom/media/platforms/agnostic/TheoraDecoder.cpp b/dom/media/platforms/agnostic/TheoraDecoder.cpp index b216791e4..695e697d7 100644 --- a/dom/media/platforms/agnostic/TheoraDecoder.cpp +++ b/dom/media/platforms/agnostic/TheoraDecoder.cpp @@ -10,6 +10,7 @@ #include "nsError.h" #include "TimeUnits.h" #include "mozilla/PodOperations.h" +#include "mozilla/SyncRunnable.h" #include diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index 78b76d4d4..e48d49d80 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/dom/media/platforms/agnostic/eme/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'SamplesWaitingForKey.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'EMEAudioDecoder.cpp', 'EMEDecoderModule.cpp', 'EMEVideoDecoder.cpp', diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp index 912b88ce1..26d029da0 100644 --- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp +++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp @@ -10,6 +10,7 @@ #include "prsystem.h" #include "MediaData.h" #include "GMPDecoderModule.h" +#include "MP4Decoder.h" #include "VPXDecoder.h" namespace mozilla { diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build index eb2738e26..644df47a3 100644 --- a/dom/media/platforms/agnostic/gmp/moz.build +++ b/dom/media/platforms/agnostic/gmp/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'MediaDataDecoderProxy.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'GMPAudioDecoder.cpp', 'GMPDecoderModule.cpp', 'GMPVideoDecoder.cpp', -- cgit v1.2.3 From 400e9018fd5b1b8e50ba5ea403ba98f9a658c076 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 22 Apr 2020 15:14:53 +0200 Subject: Revert "Issue #80 - De-unify dom/media part 1" This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6. --- dom/media/platforms/agnostic/TheoraDecoder.cpp | 1 - dom/media/platforms/agnostic/eme/moz.build | 2 +- dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 1 - dom/media/platforms/agnostic/gmp/moz.build | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) (limited to 'dom/media/platforms/agnostic') diff --git a/dom/media/platforms/agnostic/TheoraDecoder.cpp b/dom/media/platforms/agnostic/TheoraDecoder.cpp index 695e697d7..b216791e4 100644 --- a/dom/media/platforms/agnostic/TheoraDecoder.cpp +++ b/dom/media/platforms/agnostic/TheoraDecoder.cpp @@ -10,7 +10,6 @@ #include "nsError.h" #include "TimeUnits.h" #include "mozilla/PodOperations.h" -#include "mozilla/SyncRunnable.h" #include diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index e48d49d80..78b76d4d4 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/dom/media/platforms/agnostic/eme/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'SamplesWaitingForKey.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'EMEAudioDecoder.cpp', 'EMEDecoderModule.cpp', 'EMEVideoDecoder.cpp', diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp index 26d029da0..912b88ce1 100644 --- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp +++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp @@ -10,7 +10,6 @@ #include "prsystem.h" #include "MediaData.h" #include "GMPDecoderModule.h" -#include "MP4Decoder.h" #include "VPXDecoder.h" namespace mozilla { diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build index 644df47a3..eb2738e26 100644 --- a/dom/media/platforms/agnostic/gmp/moz.build +++ b/dom/media/platforms/agnostic/gmp/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'MediaDataDecoderProxy.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'GMPAudioDecoder.cpp', 'GMPDecoderModule.cpp', 'GMPVideoDecoder.cpp', -- cgit v1.2.3 From 5a64ee34a9e5242bbe5fe4e509ef38ef42f360fa Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 02:32:20 +0000 Subject: Issue #80 - Re-land early dom/media de-unification with fixups. For some reason these changes never got merged back to master after reverting to work on a branch... --- dom/media/platforms/agnostic/TheoraDecoder.cpp | 1 + dom/media/platforms/agnostic/eme/moz.build | 2 +- dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 1 + dom/media/platforms/agnostic/gmp/moz.build | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'dom/media/platforms/agnostic') diff --git a/dom/media/platforms/agnostic/TheoraDecoder.cpp b/dom/media/platforms/agnostic/TheoraDecoder.cpp index b216791e4..695e697d7 100644 --- a/dom/media/platforms/agnostic/TheoraDecoder.cpp +++ b/dom/media/platforms/agnostic/TheoraDecoder.cpp @@ -10,6 +10,7 @@ #include "nsError.h" #include "TimeUnits.h" #include "mozilla/PodOperations.h" +#include "mozilla/SyncRunnable.h" #include diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index 78b76d4d4..e48d49d80 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/dom/media/platforms/agnostic/eme/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'SamplesWaitingForKey.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'EMEAudioDecoder.cpp', 'EMEDecoderModule.cpp', 'EMEVideoDecoder.cpp', diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp index 912b88ce1..26d029da0 100644 --- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp +++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp @@ -10,6 +10,7 @@ #include "prsystem.h" #include "MediaData.h" #include "GMPDecoderModule.h" +#include "MP4Decoder.h" #include "VPXDecoder.h" namespace mozilla { diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build index eb2738e26..644df47a3 100644 --- a/dom/media/platforms/agnostic/gmp/moz.build +++ b/dom/media/platforms/agnostic/gmp/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'MediaDataDecoderProxy.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'GMPAudioDecoder.cpp', 'GMPDecoderModule.cpp', 'GMPVideoDecoder.cpp', -- cgit v1.2.3 From a680bdc637e0393aaa08d575c66f7166b788b443 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 23 Sep 2020 13:55:00 +0000 Subject: Issue #1656 - Part 1: Nuke most vim config lines in the tree. Since these are just interpreted comments, there's 0 impact on actual code. This removes all lines that match /* vim: set(.*)tw=80: */ with S&R -- there are a few others scattered around which will be removed manually in a second part. --- dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'dom/media/platforms/agnostic') diff --git a/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp b/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp index 58098c2b3..532fc63c0 100644 --- a/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp +++ b/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.cpp @@ -1,5 +1,4 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ -- cgit v1.2.3 From d5a2c45aad51e3fcf5f48f8afe8609c1e8726a02 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 23 Sep 2020 15:52:00 +0000 Subject: Issue #1656 - Part 6: Clean up the build files --- dom/media/platforms/agnostic/eme/moz.build | 1 - dom/media/platforms/agnostic/gmp/moz.build | 1 - 2 files changed, 2 deletions(-) (limited to 'dom/media/platforms/agnostic') diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index e48d49d80..97156f33a 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/dom/media/platforms/agnostic/eme/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# 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/. diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build index 644df47a3..64e258620 100644 --- a/dom/media/platforms/agnostic/gmp/moz.build +++ b/dom/media/platforms/agnostic/gmp/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# 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/. -- cgit v1.2.3