Bug 1390748 - Remove unnecessary includes in *Decoders. r=jwwang

MozReview-Commit-ID: 3bfAdpopOfp

--HG--
extra : rebase_source : c9b0a0991d731b38d3f077f90cd4f79b6470fe38

dom/media/ADTSDecoder.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ADTSDecoder.h"
-#include "ADTSDemuxer.h"
 #include "MediaContainerType.h"
 #include "PDMFactory.h"
 

dom/media/ADTSDecoder.h

@@ -7,8 +7,6 @@
 #ifndef ADTS_DECODER_H_
 #define ADTS_DECODER_H_
 
-#include "ChannelMediaDecoder.h"
-
 namespace mozilla {
 
 class MediaContainerType;

dom/media/flac/FlacDecoder.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "FlacDecoder.h"
-#include "FlacDemuxer.h"
 #include "MediaContainerType.h"
 #include "MediaPrefs.h"
 

dom/media/flac/FlacDecoder.h

@@ -7,8 +7,6 @@
 #ifndef FLAC_DECODER_H_
 #define FLAC_DECODER_H_
 
-#include "ChannelMediaDecoder.h"
-
 namespace mozilla {
 
 class MediaContainerType;

dom/media/fmp4/MP4Decoder.cpp

@@ -8,19 +8,10 @@
 #include "MediaContainerType.h"
 #include "MediaFormatReader.h"
 #include "MP4Demuxer.h"
-#include "mozilla/Preferences.h"
-#include "nsCharSeparatedTokenizer.h"
-#include "mozilla/CDMProxy.h"
-#include "mozilla/Logging.h"
-#include "mozilla/SharedThreadPool.h"
 #include "nsMimeTypes.h"
+#include "mozilla/SharedThreadPool.h"
 #include "VideoUtils.h"
 
-#ifdef MOZ_WIDGET_ANDROID
-#include "nsIGfxInfo.h"
-#endif
-#include "mozilla/layers/LayersTypes.h"
-
 #include "PDMFactory.h"
 
 namespace mozilla {

dom/media/fmp4/MP4Decoder.h

@@ -6,13 +6,14 @@
 #if !defined(MP4Decoder_h_)
 #define MP4Decoder_h_
 
-#include "ChannelMediaDecoder.h"
+class nsACString;
 #include "mozilla/dom/Promise.h"
 #include "mozilla/layers/KnowsCompositor.h"
 
 namespace mozilla {
 
 class MediaContainerType;
+class DecoderDoctorDiagnostics;
 
 // Decoder that uses a bundled MP4 demuxer and platform decoders to play MP4.
 class MP4Decoder

dom/media/mp3/MP3Decoder.cpp

@@ -1,4 +1,3 @@
-
 /* -*- 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
@@ -6,9 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MP3Decoder.h"
-
 #include "MediaContainerType.h"
-#include "MP3Demuxer.h"
 #include "PDMFactory.h"
 
 namespace mozilla {

dom/media/mp3/MP3Decoder.h

@@ -6,8 +6,6 @@
 #ifndef MP3Decoder_h_
 #define MP3Decoder_h_
 
-#include "ChannelMediaDecoder.h"
-
 namespace mozilla {
 
 class MediaContainerType;

dom/media/ogg/OggDecoder.cpp

@@ -4,12 +4,10 @@
  * 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 "OggDecoder.h"
 #include "MediaPrefs.h"
 #include "MediaContainerType.h"
-#include "MediaDecoderStateMachine.h"
-#include "MediaFormatReader.h"
-#include "OggDemuxer.h"
-#include "OggDecoder.h"
+#include "MediaDecoder.h"
 
 namespace mozilla {
 

dom/media/ogg/OggDecoder.h

@@ -6,8 +6,6 @@
 #if !defined(OggDecoder_h_)
 #define OggDecoder_h_
 
-#include "ChannelMediaDecoder.h"
-
 namespace mozilla {
 
 class MediaContainerType;

dom/media/wave/WaveDecoder.cpp

@@ -4,10 +4,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 "WaveDemuxer.h"
-#include "MediaContainerType.h"
 #include "WaveDecoder.h"
-#include "PDMFactory.h"
+#include "MediaContainerType.h"
+#include "MediaDecoder.h"
 
 namespace mozilla {
 

dom/media/wave/WaveDecoder.h

@@ -6,8 +6,6 @@
 #if !defined(WaveDecoder_h_)
 #define WaveDecoder_h_
 
-#include "ChannelMediaDecoder.h"
-
 namespace mozilla {
 
 class MediaContainerType;

dom/media/wave/WaveDemuxer.cpp

@@ -11,14 +11,13 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/EndianUtils.h"
+#include "mp4_demuxer/ByteReader.h"
 #include "nsAutoPtr.h"
 #include "VideoUtils.h"
 #include "TimeUnits.h"
-#include "prenv.h"
 
 using mozilla::media::TimeUnit;
 using mozilla::media::TimeIntervals;
-using mp4_demuxer::ByteReader;
 
 namespace mozilla {
 

dom/media/wave/WaveDemuxer.h

@@ -5,12 +5,12 @@
 #ifndef WAV_DEMUXER_H_
 #define WAV_DEMUXER_H_
 
-#include "mozilla/Attributes.h"
-#include "mozilla/Maybe.h"
 #include "MediaDataDemuxer.h"
 #include "MediaResource.h"
-#include "mp4_demuxer/ByteReader.h"
 
+namespace mp4_demuxer {
+class ByteReader;
+}
 using mp4_demuxer::ByteReader;
 
 namespace mozilla {

dom/media/webm/WebMDecoder.cpp

@@ -4,15 +4,12 @@
  * 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 "WebMDecoder.h"
 #include "mozilla/Preferences.h"
 #ifdef MOZ_AV1
 #include "AOMDecoder.h"
 #endif
 #include "MediaContainerType.h"
-#include "MediaFormatReader.h"
-#include "WebMDemuxer.h"
-#include "WebMDecoder.h"
-#include "VideoUtils.h"
 
 namespace mozilla {
 

dom/media/webm/WebMDecoder.h

@@ -6,8 +6,6 @@
 #if !defined(WebMDecoder_h_)
 #define WebMDecoder_h_
 
-#include "ChannelMediaDecoder.h"
-
 namespace mozilla {
 
 class MediaContainerType;