From a0056437d9a112fef91216d694254a88a92655d6 Mon Sep 17 00:00:00 2001 From: "Alfredo.Yang" Date: Thu, 16 Nov 2017 16:24:22 +0800 Subject: [PATCH] Bug 1417795 - remove mp4_demuxer namespace part2. r=kinetik MozReview-Commit-ID: F8z1QW6WuUU --HG-- extra : rebase_source : 9d137794bb1c6465da1d6b7aa6ba50265172ada3 --- dom/media/gtest/mp4_demuxer/TestInterval.cpp | 2 +- dom/media/gtest/mp4_demuxer/TestParser.cpp | 6 +++--- dom/media/mediasource/ContainerParser.cpp | 6 +++--- dom/media/mp4/Box.cpp | 4 ++-- dom/media/mp4/Box.h | 2 +- dom/media/mp4/BufferStream.cpp | 2 +- dom/media/mp4/BufferStream.h | 2 +- dom/media/mp4/DecoderData.cpp | 2 +- dom/media/mp4/Index.cpp | 8 ++++---- dom/media/mp4/Index.h | 6 +++--- dom/media/mp4/MP4Demuxer.cpp | 10 +++++----- dom/media/mp4/MP4Metadata.cpp | 6 +++--- dom/media/mp4/MP4Metadata.h | 4 ++-- dom/media/mp4/MoofParser.cpp | 6 +++--- dom/media/mp4/MoofParser.h | 10 +++++----- dom/media/mp4/ResourceStream.cpp | 2 +- dom/media/mp4/ResourceStream.h | 2 +- dom/media/mp4/SinfParser.cpp | 8 ++++---- dom/media/mp4/SinfParser.h | 4 ++-- dom/media/mp4/moz.build | 7 ++----- dom/media/platforms/agnostic/bytestreams/H264.h | 2 +- 21 files changed, 49 insertions(+), 52 deletions(-) diff --git a/dom/media/gtest/mp4_demuxer/TestInterval.cpp b/dom/media/gtest/mp4_demuxer/TestInterval.cpp index 68aa3b126827..13bf53914e2e 100644 --- a/dom/media/gtest/mp4_demuxer/TestInterval.cpp +++ b/dom/media/gtest/mp4_demuxer/TestInterval.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "gtest/gtest.h" -#include "mp4_demuxer/Interval.h" +#include "Interval.h" using namespace mp4_demuxer; using namespace mozilla; diff --git a/dom/media/gtest/mp4_demuxer/TestParser.cpp b/dom/media/gtest/mp4_demuxer/TestParser.cpp index 37a9a01e2a1d..f7b4829b3d4b 100644 --- a/dom/media/gtest/mp4_demuxer/TestParser.cpp +++ b/dom/media/gtest/mp4_demuxer/TestParser.cpp @@ -8,9 +8,9 @@ #include "MediaPrefs.h" #include "mozilla/ArrayUtils.h" #include "mozilla/Preferences.h" -#include "mp4_demuxer/BufferStream.h" -#include "mp4_demuxer/MP4Metadata.h" -#include "mp4_demuxer/MoofParser.h" +#include "BufferStream.h" +#include "MP4Metadata.h" +#include "MoofParser.h" using namespace mozilla; using namespace mp4_demuxer; diff --git a/dom/media/mediasource/ContainerParser.cpp b/dom/media/mediasource/ContainerParser.cpp index 372ba19c8e92..0554c437e3df 100644 --- a/dom/media/mediasource/ContainerParser.cpp +++ b/dom/media/mediasource/ContainerParser.cpp @@ -10,15 +10,15 @@ #include "mozilla/EndianUtils.h" #include "mozilla/IntegerPrintfMacros.h" #include "mozilla/ErrorResult.h" -#include "mp4_demuxer/MoofParser.h" +#include "MoofParser.h" #include "mozilla/Logging.h" #include "mozilla/Maybe.h" #include "mozilla/Result.h" #include "MediaData.h" #ifdef MOZ_FMP4 -#include "mp4_demuxer/AtomType.h" +#include "AtomType.h" #include "BufferReader.h" -#include "mp4_demuxer/Stream.h" +#include "Stream.h" #endif #include "nsAutoPtr.h" #include "SourceBufferResource.h" diff --git a/dom/media/mp4/Box.cpp b/dom/media/mp4/Box.cpp index 213391451b2d..2b6244fcd379 100644 --- a/dom/media/mp4/Box.cpp +++ b/dom/media/mp4/Box.cpp @@ -4,8 +4,8 @@ * 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 "mp4_demuxer/Box.h" -#include "mp4_demuxer/Stream.h" +#include "Box.h" +#include "Stream.h" #include "mozilla/EndianUtils.h" #include "mozilla/Unused.h" #include diff --git a/dom/media/mp4/Box.h b/dom/media/mp4/Box.h index 0890973bcb99..b4472cd75d32 100644 --- a/dom/media/mp4/Box.h +++ b/dom/media/mp4/Box.h @@ -11,7 +11,7 @@ #include "nsTArray.h" #include "MediaResource.h" #include "mozilla/EndianUtils.h" -#include "mp4_demuxer/AtomType.h" +#include "AtomType.h" #include "BufferReader.h" using namespace mozilla; diff --git a/dom/media/mp4/BufferStream.cpp b/dom/media/mp4/BufferStream.cpp index 6f6a58398026..0501df4c26ec 100644 --- a/dom/media/mp4/BufferStream.cpp +++ b/dom/media/mp4/BufferStream.cpp @@ -2,7 +2,7 @@ * 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 "mp4_demuxer/BufferStream.h" +#include "BufferStream.h" #include "MediaData.h" #include "MediaResource.h" #include diff --git a/dom/media/mp4/BufferStream.h b/dom/media/mp4/BufferStream.h index bb703db5d6ef..195832f2e98a 100644 --- a/dom/media/mp4/BufferStream.h +++ b/dom/media/mp4/BufferStream.h @@ -5,7 +5,7 @@ #ifndef BUFFER_STREAM_H_ #define BUFFER_STREAM_H_ -#include "mp4_demuxer/Stream.h" +#include "Stream.h" #include "nsTArray.h" #include "MediaResource.h" diff --git a/dom/media/mp4/DecoderData.cpp b/dom/media/mp4/DecoderData.cpp index 0bcfe0c2e30b..fcef34e46061 100644 --- a/dom/media/mp4/DecoderData.cpp +++ b/dom/media/mp4/DecoderData.cpp @@ -5,7 +5,7 @@ #include "Adts.h" #include "AnnexB.h" #include "BufferReader.h" -#include "mp4_demuxer/DecoderData.h" +#include "DecoderData.h" #include "mozilla/ArrayUtils.h" #include "mozilla/EndianUtils.h" #include "VideoUtils.h" diff --git a/dom/media/mp4/Index.cpp b/dom/media/mp4/Index.cpp index d493d95ac4e5..f0bdfa52c822 100644 --- a/dom/media/mp4/Index.cpp +++ b/dom/media/mp4/Index.cpp @@ -3,10 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "BufferReader.h" -#include "mp4_demuxer/Index.h" -#include "mp4_demuxer/Interval.h" -#include "mp4_demuxer/MP4Metadata.h" -#include "mp4_demuxer/SinfParser.h" +#include "Index.h" +#include "Interval.h" +#include "MP4Metadata.h" +#include "SinfParser.h" #include "nsAutoPtr.h" #include "mozilla/RefPtr.h" diff --git a/dom/media/mp4/Index.h b/dom/media/mp4/Index.h index 1ae0cafa9206..dc5e6fb23e03 100644 --- a/dom/media/mp4/Index.h +++ b/dom/media/mp4/Index.h @@ -8,9 +8,9 @@ #include "MediaData.h" #include "MediaResource.h" #include "TimeUnits.h" -#include "mp4_demuxer/MoofParser.h" -#include "mp4_demuxer/Interval.h" -#include "mp4_demuxer/Stream.h" +#include "MoofParser.h" +#include "Interval.h" +#include "Stream.h" #include "nsISupportsImpl.h" template class nsAutoPtr; diff --git a/dom/media/mp4/MP4Demuxer.cpp b/dom/media/mp4/MP4Demuxer.cpp index bddcf3f52ebf..e043c775b5f9 100644 --- a/dom/media/mp4/MP4Demuxer.cpp +++ b/dom/media/mp4/MP4Demuxer.cpp @@ -15,11 +15,11 @@ #include "mozilla/Telemetry.h" #include "AnnexB.h" #include "H264.h" -#include "mp4_demuxer/MoofParser.h" -#include "mp4_demuxer/MP4Metadata.h" -#include "mp4_demuxer/ResourceStream.h" -#include "mp4_demuxer/BufferStream.h" -#include "mp4_demuxer/Index.h" +#include "MoofParser.h" +#include "MP4Metadata.h" +#include "ResourceStream.h" +#include "BufferStream.h" +#include "Index.h" #include "nsAutoPtr.h" #include "nsPrintfCString.h" diff --git a/dom/media/mp4/MP4Metadata.cpp b/dom/media/mp4/MP4Metadata.cpp index a4cba8d84143..3708dda7d6e9 100644 --- a/dom/media/mp4/MP4Metadata.cpp +++ b/dom/media/mp4/MP4Metadata.cpp @@ -10,9 +10,9 @@ #include "mozilla/Telemetry.h" #include "mozilla/UniquePtr.h" #include "VideoUtils.h" -#include "mp4_demuxer/MoofParser.h" -#include "mp4_demuxer/MP4Metadata.h" -#include "mp4_demuxer/Stream.h" +#include "MoofParser.h" +#include "MP4Metadata.h" +#include "Stream.h" #include "MediaPrefs.h" #include "mp4parse.h" diff --git a/dom/media/mp4/MP4Metadata.h b/dom/media/mp4/MP4Metadata.h index 5446505c1027..8a16249ed9ec 100644 --- a/dom/media/mp4/MP4Metadata.h +++ b/dom/media/mp4/MP4Metadata.h @@ -7,8 +7,8 @@ #include "mozilla/TypeTraits.h" #include "mozilla/UniquePtr.h" -#include "mp4_demuxer/DecoderData.h" -#include "mp4_demuxer/Index.h" +#include "DecoderData.h" +#include "Index.h" #include "MediaData.h" #include "MediaInfo.h" #include "MediaResult.h" diff --git a/dom/media/mp4/MoofParser.cpp b/dom/media/mp4/MoofParser.cpp index 6c6a525f1353..14f6198d7855 100644 --- a/dom/media/mp4/MoofParser.cpp +++ b/dom/media/mp4/MoofParser.cpp @@ -2,9 +2,9 @@ * 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 "mp4_demuxer/MoofParser.h" -#include "mp4_demuxer/Box.h" -#include "mp4_demuxer/SinfParser.h" +#include "MoofParser.h" +#include "Box.h" +#include "SinfParser.h" #include #include "Intervals.h" diff --git a/dom/media/mp4/MoofParser.h b/dom/media/mp4/MoofParser.h index 6b1ba744685f..5c0de8b912e3 100644 --- a/dom/media/mp4/MoofParser.h +++ b/dom/media/mp4/MoofParser.h @@ -6,11 +6,11 @@ #define MOOF_PARSER_H_ #include "mozilla/ResultExtensions.h" -#include "mp4_demuxer/Atom.h" -#include "mp4_demuxer/AtomType.h" -#include "mp4_demuxer/SinfParser.h" -#include "mp4_demuxer/Stream.h" -#include "mp4_demuxer/Interval.h" +#include "Atom.h" +#include "AtomType.h" +#include "SinfParser.h" +#include "Stream.h" +#include "Interval.h" #include "MediaResource.h" namespace mp4_demuxer { diff --git a/dom/media/mp4/ResourceStream.cpp b/dom/media/mp4/ResourceStream.cpp index e1d3895a860e..def4a99647bb 100644 --- a/dom/media/mp4/ResourceStream.cpp +++ b/dom/media/mp4/ResourceStream.cpp @@ -4,7 +4,7 @@ * 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 "mp4_demuxer/ResourceStream.h" +#include "ResourceStream.h" namespace mp4_demuxer { diff --git a/dom/media/mp4/ResourceStream.h b/dom/media/mp4/ResourceStream.h index 6a60d5525da0..77edc0f24cea 100644 --- a/dom/media/mp4/ResourceStream.h +++ b/dom/media/mp4/ResourceStream.h @@ -6,7 +6,7 @@ #define RESOURCESTREAM_H_ #include "MediaResource.h" -#include "mp4_demuxer/Stream.h" +#include "Stream.h" #include "mozilla/RefPtr.h" namespace mp4_demuxer diff --git a/dom/media/mp4/SinfParser.cpp b/dom/media/mp4/SinfParser.cpp index 194ad5dfd5ed..bdc9cd942ebd 100644 --- a/dom/media/mp4/SinfParser.cpp +++ b/dom/media/mp4/SinfParser.cpp @@ -3,10 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/Unused.h" -#include "mp4_demuxer/SinfParser.h" -#include "mp4_demuxer/AtomType.h" -#include "mp4_demuxer/Box.h" -#include "mp4_demuxer/Stream.h" +#include "SinfParser.h" +#include "AtomType.h" +#include "Box.h" +#include "Stream.h" namespace mp4_demuxer { diff --git a/dom/media/mp4/SinfParser.h b/dom/media/mp4/SinfParser.h index a5bcd3efab09..b13e26b66419 100644 --- a/dom/media/mp4/SinfParser.h +++ b/dom/media/mp4/SinfParser.h @@ -7,8 +7,8 @@ #define SINF_PARSER_H_ #include "mozilla/ResultExtensions.h" -#include "mp4_demuxer/Atom.h" -#include "mp4_demuxer/AtomType.h" +#include "Atom.h" +#include "AtomType.h" namespace mp4_demuxer { diff --git a/dom/media/mp4/moz.build b/dom/media/mp4/moz.build index ada15976f83d..20fe4f6336f6 100644 --- a/dom/media/mp4/moz.build +++ b/dom/media/mp4/moz.build @@ -5,11 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. EXPORTS += [ - 'MP4Decoder.h', - 'MP4Demuxer.h', -] - -EXPORTS.mp4_demuxer += [ 'Atom.h', 'AtomType.h', 'Box.h', @@ -18,6 +13,8 @@ EXPORTS.mp4_demuxer += [ 'Index.h', 'Interval.h', 'MoofParser.h', + 'MP4Decoder.h', + 'MP4Demuxer.h', 'MP4Metadata.h', 'ResourceStream.h', 'SinfParser.h', diff --git a/dom/media/platforms/agnostic/bytestreams/H264.h b/dom/media/platforms/agnostic/bytestreams/H264.h index de49cfd24c18..20b3284d6553 100644 --- a/dom/media/platforms/agnostic/bytestreams/H264.h +++ b/dom/media/platforms/agnostic/bytestreams/H264.h @@ -5,7 +5,7 @@ #ifndef MP4_DEMUXER_H264_H_ #define MP4_DEMUXER_H264_H_ -#include "mp4_demuxer/DecoderData.h" +#include "DecoderData.h" namespace mp4_demuxer {