summaryrefslogtreecommitdiffstats
path: root/dom/media/ADTSDemuxer.h
diff options
context:
space:
mode:
Diffstat (limited to 'dom/media/ADTSDemuxer.h')
-rw-r--r--dom/media/ADTSDemuxer.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/dom/media/ADTSDemuxer.h b/dom/media/ADTSDemuxer.h
index 40ff44898e..67a661883f 100644
--- a/dom/media/ADTSDemuxer.h
+++ b/dom/media/ADTSDemuxer.h
@@ -11,14 +11,10 @@
#include "mozilla/Maybe.h"
#include "MediaDataDemuxer.h"
#include "MediaResource.h"
+#include "Adts.h"
namespace mozilla {
-namespace adts {
-class Frame;
-class FrameParser;
-} // namespace adts
-
class ADTSTrackDemuxer;
DDLoggedTypeDeclNameAndBase(ADTSDemuxer, MediaDataDemuxer);
@@ -87,16 +83,16 @@ class ADTSTrackDemuxer : public MediaTrackDemuxer,
media::TimeUnit ScanUntil(const media::TimeUnit& aTime);
// Finds the next valid frame and returns its byte range.
- const adts::Frame& FindNextFrame(bool findFirstFrame = false);
+ const ADTS::Frame& FindNextFrame(bool findFirstFrame = false);
// Skips the next frame given the provided byte range.
- bool SkipNextFrame(const adts::Frame& aFrame);
+ bool SkipNextFrame(const ADTS::Frame& aFrame);
// Returns the next ADTS frame, if available.
- already_AddRefed<MediaRawData> GetNextFrame(const adts::Frame& aFrame);
+ already_AddRefed<MediaRawData> GetNextFrame(const ADTS::Frame& aFrame);
// Updates post-read meta data.
- void UpdateState(const adts::Frame& aFrame);
+ void UpdateState(const ADTS::Frame& aFrame);
// Returns the frame index for the given offset.
int64_t FrameIndexFromOffset(uint64_t aOffset) const;
@@ -115,7 +111,7 @@ class ADTSTrackDemuxer : public MediaTrackDemuxer,
MediaResourceIndex mSource;
// ADTS frame parser used to detect frames and extract side info.
- adts::FrameParser* mParser;
+ ADTS::FrameParser* mParser;
// Current byte offset in the source stream.
uint64_t mOffset;