Bug 1405531 - Remove unused MediaDataDemuxer::HasTrackType - r=jwwang

The only actual code use in MediaSourceDemuxer can trivially be folded into its caller GetNumberTracks in the same class. MozReview-Commit-ID: E6zh98zmJwJ
iaxat · Oct 4, 2017 · a30c36f · a30c36f
1 parent aa3e8d8
commit a30c36f
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 83 deletions.
diff --git a/dom/media/ADTSDemuxer.cpp b/dom/media/ADTSDemuxer.cpp
@@ -330,12 +330,6 @@ ADTSDemuxer::Init()
   return InitPromise::CreateAndResolve(NS_OK, __func__);
 }
 
-bool
-ADTSDemuxer::HasTrackType(TrackInfo::TrackType aType) const
-{
-  return aType == TrackInfo::kAudioTrack;
-}
-
 uint32_t
 ADTSDemuxer::GetNumberTracks(TrackInfo::TrackType aType) const
 {

diff --git a/dom/media/ADTSDemuxer.h b/dom/media/ADTSDemuxer.h
@@ -28,7 +28,6 @@ class ADTSDemuxer : public MediaDataDemuxer
   // MediaDataDemuxer interface.
   explicit ADTSDemuxer(MediaResource* aSource);
   RefPtr<InitPromise> Init() override;
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
   already_AddRefed<MediaTrackDemuxer>
   GetTrackDemuxer(TrackInfo::TrackType aType, uint32_t aTrackNumber) override;

diff --git a/dom/media/MediaDataDemuxer.h b/dom/media/MediaDataDemuxer.h
@@ -44,9 +44,6 @@ class MediaDataDemuxer
   // otherwise.
   virtual RefPtr<InitPromise> Init() = 0;
 
-  // Returns true if a aType track type is available.
-  virtual bool HasTrackType(TrackInfo::TrackType aType) const = 0;
-
   // Returns the number of tracks of aType type available. A value of
   // 0 indicates that no such type is available.
   virtual uint32_t GetNumberTracks(TrackInfo::TrackType aType) const = 0;

diff --git a/dom/media/flac/FlacDemuxer.cpp b/dom/media/flac/FlacDemuxer.cpp
@@ -578,12 +578,6 @@ FlacDemuxer::Init()
   return InitPromise::CreateAndResolve(NS_OK, __func__);
 }
 
-bool
-FlacDemuxer::HasTrackType(TrackInfo::TrackType aType) const
-{
-  return aType == TrackInfo::kAudioTrack;
-}
-
 uint32_t
 FlacDemuxer::GetNumberTracks(TrackInfo::TrackType aType) const
 {

diff --git a/dom/media/flac/FlacDemuxer.h b/dom/media/flac/FlacDemuxer.h
@@ -25,7 +25,6 @@ class FlacDemuxer : public MediaDataDemuxer
   // MediaDataDemuxer interface.
   explicit FlacDemuxer(MediaResource* aSource);
   RefPtr<InitPromise> Init() override;
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
   already_AddRefed<MediaTrackDemuxer> GetTrackDemuxer(
     TrackInfo::TrackType aType, uint32_t aTrackNumber) override;

diff --git a/dom/media/fmp4/MP4Demuxer.cpp b/dom/media/fmp4/MP4Demuxer.cpp
@@ -274,12 +274,6 @@ MP4Demuxer::Init()
   return InitPromise::CreateAndResolve(result, __func__);
 }
 
-bool
-MP4Demuxer::HasTrackType(TrackInfo::TrackType aType) const
-{
-  return GetNumberTracks(aType) != 0;
-}
-
 uint32_t
 MP4Demuxer::GetNumberTracks(TrackInfo::TrackType aType) const
 {

diff --git a/dom/media/fmp4/MP4Demuxer.h b/dom/media/fmp4/MP4Demuxer.h
@@ -29,8 +29,6 @@ class MP4Demuxer : public MediaDataDemuxer
 
   RefPtr<InitPromise> Init() override;
 
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
-
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
 
   already_AddRefed<MediaTrackDemuxer>

diff --git a/dom/media/hls/HLSDemuxer.cpp b/dom/media/hls/HLSDemuxer.cpp
@@ -184,19 +184,6 @@ void HLSDemuxer::NotifyDataArrived()
   HLS_DEBUG("HLSDemuxer", "NotifyDataArrived");
 }
 
-bool
-HLSDemuxer::HasTrackType(TrackType aType) const
-{
-  HLS_DEBUG("HLSDemuxer", "HasTrackType(%d)", aType);
-  if (mAudioDemuxer && aType == TrackType::kAudioTrack) {
-    return mAudioDemuxer->IsTrackValid();
-  }
-  if (mVideoDemuxer && aType == TrackType::kVideoTrack) {
-    return mVideoDemuxer->IsTrackValid();
-  }
-  return false;
-}
-
 uint32_t
 HLSDemuxer::GetNumberTracks(TrackType aType) const
 {

diff --git a/dom/media/hls/HLSDemuxer.h b/dom/media/hls/HLSDemuxer.h
@@ -33,8 +33,6 @@ class HLSDemuxer final : public MediaDataDemuxer
 
   RefPtr<InitPromise> Init() override;
 
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
-
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
 
   already_AddRefed<MediaTrackDemuxer>

diff --git a/dom/media/mediasource/MediaSourceDemuxer.cpp b/dom/media/mediasource/MediaSourceDemuxer.cpp
@@ -117,27 +117,21 @@ MediaSourceDemuxer::ScanSourceBuffersForContent()
   return !haveEmptySourceBuffer;
 }
 
-bool
-MediaSourceDemuxer::HasTrackType(TrackType aType) const
+uint32_t
+MediaSourceDemuxer::GetNumberTracks(TrackType aType) const
 {
   MonitorAutoLock mon(mMonitor);
 
   switch (aType) {
     case TrackType::kAudioTrack:
-      return mInfo.HasAudio();
+      return mInfo.HasAudio() ? 1u : 0;
     case TrackType::kVideoTrack:
-      return mInfo.HasVideo();
+      return mInfo.HasVideo() ? 1u : 0;
     default:
-      return false;
+      return 0;
   }
 }
 
-uint32_t
-MediaSourceDemuxer::GetNumberTracks(TrackType aType) const
-{
-  return HasTrackType(aType) ? 1u : 0;
-}
-
 already_AddRefed<MediaTrackDemuxer>
 MediaSourceDemuxer::GetTrackDemuxer(TrackType aType, uint32_t aTrackNumber)
 {

diff --git a/dom/media/mediasource/MediaSourceDemuxer.h b/dom/media/mediasource/MediaSourceDemuxer.h
@@ -30,8 +30,6 @@ class MediaSourceDemuxer : public MediaDataDemuxer
 
   RefPtr<InitPromise> Init() override;
 
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
-
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
 
   already_AddRefed<MediaTrackDemuxer>

diff --git a/dom/media/mp3/MP3Demuxer.cpp b/dom/media/mp3/MP3Demuxer.cpp
@@ -55,12 +55,6 @@ MP3Demuxer::Init()
   return InitPromise::CreateAndResolve(NS_OK, __func__);
 }
 
-bool
-MP3Demuxer::HasTrackType(TrackInfo::TrackType aType) const
-{
-  return aType == TrackInfo::kAudioTrack;
-}
-
 uint32_t
 MP3Demuxer::GetNumberTracks(TrackInfo::TrackType aType) const
 {

diff --git a/dom/media/mp3/MP3Demuxer.h b/dom/media/mp3/MP3Demuxer.h
@@ -19,7 +19,6 @@ class MP3Demuxer : public MediaDataDemuxer
   // MediaDataDemuxer interface.
   explicit MP3Demuxer(MediaResource* aSource);
   RefPtr<InitPromise> Init() override;
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
   already_AddRefed<MediaTrackDemuxer> GetTrackDemuxer(
       TrackInfo::TrackType aType, uint32_t aTrackNumber) override;

diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp
@@ -217,12 +217,6 @@ OggDemuxer::Init()
   return InitPromise::CreateAndResolve(NS_OK, __func__);
 }
 
-bool
-OggDemuxer::HasTrackType(TrackInfo::TrackType aType) const
-{
-  return !!GetNumberTracks(aType);
-}
-
 OggCodecState*
 OggDemuxer::GetTrackCodecState(TrackInfo::TrackType aType) const
 {

diff --git a/dom/media/ogg/OggDemuxer.h b/dom/media/ogg/OggDemuxer.h
@@ -23,8 +23,6 @@ class OggDemuxer : public MediaDataDemuxer
 
   RefPtr<InitPromise> Init() override;
 
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
-
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
 
   already_AddRefed<MediaTrackDemuxer> GetTrackDemuxer(TrackInfo::TrackType aType,

diff --git a/dom/media/wave/WaveDemuxer.cpp b/dom/media/wave/WaveDemuxer.cpp
@@ -47,12 +47,6 @@ WAVDemuxer::Init()
   return InitPromise::CreateAndResolve(NS_OK, __func__);
 }
 
-bool
-WAVDemuxer::HasTrackType(TrackInfo::TrackType aType) const
-{
-  return aType == TrackInfo::kAudioTrack;
-}
-
 uint32_t
 WAVDemuxer::GetNumberTracks(TrackInfo::TrackType aType) const
 {

diff --git a/dom/media/wave/WaveDemuxer.h b/dom/media/wave/WaveDemuxer.h
@@ -36,7 +36,6 @@ class WAVDemuxer : public MediaDataDemuxer
   // MediaDataDemuxer interface.
   explicit WAVDemuxer(MediaResource* aSource);
   RefPtr<InitPromise> Init() override;
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
   already_AddRefed<MediaTrackDemuxer> GetTrackDemuxer(
     TrackInfo::TrackType aType, uint32_t aTrackNumber) override;

diff --git a/dom/media/webm/WebMDemuxer.cpp b/dom/media/webm/WebMDemuxer.cpp
@@ -212,12 +212,6 @@ WebMDemuxer::InitBufferedState()
   mBufferedState = new WebMBufferedState;
 }
 
-bool
-WebMDemuxer::HasTrackType(TrackInfo::TrackType aType) const
-{
-  return !!GetNumberTracks(aType);
-}
-
 uint32_t
 WebMDemuxer::GetNumberTracks(TrackInfo::TrackType aType) const
 {

diff --git a/dom/media/webm/WebMDemuxer.h b/dom/media/webm/WebMDemuxer.h
@@ -132,8 +132,6 @@ class WebMDemuxer : public MediaDataDemuxer
 
   RefPtr<InitPromise> Init() override;
 
-  bool HasTrackType(TrackInfo::TrackType aType) const override;
-
   uint32_t GetNumberTracks(TrackInfo::TrackType aType) const override;
 
   UniquePtr<TrackInfo> GetTrackInfo(TrackInfo::TrackType aType,