wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 07:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove separate MP3 name space

Browse source 
It is no longer needed.
This commit is contained in:
trav90 2018-12-08 16:29:04 -06:00 • committed by Roy Tam
commit 8cfddb6559
5 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dom/media/DecoderTraits.cpp
View file

@ -432,7 +432,7 @@ MediaDecoderReader* DecoderTraits::CreateReader(const nsACString& aType, Abstrac
} else } else
#endif #endif
if (IsMP3SupportedType(aType)) { if (IsMP3SupportedType(aType)) {
decoderReader = new MediaFormatReader(aDecoder, new mp3::MP3Demuxer(aDecoder->GetResource())); decoderReader = new MediaFormatReader(aDecoder, new MP3Demuxer(aDecoder->GetResource()));
} else } else
if (IsAACSupportedType(aType)) { if (IsAACSupportedType(aType)) {
decoderReader = new MediaFormatReader(aDecoder, new ADTSDemuxer(aDecoder->GetResource())); decoderReader = new MediaFormatReader(aDecoder, new ADTSDemuxer(aDecoder->GetResource()));

2
dom/media/MP3Decoder.cpp
View file

@ -24,7 +24,7 @@ MP3Decoder::Clone(MediaDecoderOwner* aOwner) {
MediaDecoderStateMachine* MediaDecoderStateMachine*
MP3Decoder::CreateStateMachine() { MP3Decoder::CreateStateMachine() {
RefPtr<MediaDecoderReader> reader = RefPtr<MediaDecoderReader> reader =
new MediaFormatReader(this, new mp3::MP3Demuxer(GetResource())); new MediaFormatReader(this, new MP3Demuxer(GetResource()));
return new MediaDecoderStateMachine(this, reader); return new MediaDecoderStateMachine(this, reader);
} }

2
dom/media/MP3Demuxer.cpp
View file

@ -33,7 +33,6 @@ using mozilla::media::TimeIntervals;
using mp4_demuxer::ByteReader; using mp4_demuxer::ByteReader;
namespace mozilla { namespace mozilla {
namespace mp3 {
// MP3Demuxer // MP3Demuxer
@ -1338,5 +1337,4 @@ ID3Parser::ID3Header::Update(uint8_t c) {
return IsValid(mPos++); return IsValid(mPos++);
} }
} // namespace mp3
} // namespace mozilla } // namespace mozilla

2
dom/media/MP3Demuxer.h
View file

@ -13,7 +13,6 @@
#include <vector> #include <vector>
namespace mozilla { namespace mozilla {
namespace mp3 {
class MP3TrackDemuxer; class MP3TrackDemuxer;
@ -468,7 +467,6 @@ private:
UniquePtr<AudioInfo> mInfo; UniquePtr<AudioInfo> mInfo;
}; };
} // namespace mp3
} // namespace mozilla } // namespace mozilla
#endif #endif

1
dom/media/gtest/TestMP3Demuxer.cpp
View file

@ -11,7 +11,6 @@
#include "MockMediaResource.h" #include "MockMediaResource.h"
using namespace mozilla; using namespace mozilla;
using namespace mozilla::mp3;
using media::TimeUnit; using media::TimeUnit;