зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1202286 - Part 0 - Add some explicit namespace references to keep the compiler and IntelliSense happy. r=esawin
DecoderTraits.cpp pulls in MP3Demuxer.h which in turn pulls in mp4_demuxer/ByteReader.h. In that context, for some reason the ByteReader can't find the definition for MediaByteBuffer unless it is prefixed with the proper namespace. MP3Demuxer.cpp itself compiles fine, but for some reason in Visual Studio IntelliSense complains about TimeUnit and TimeIntervals being undefined unless the using statement uses the full namespace hierarchy. Also fix a small typo. --HG-- extra : rebase_source : fc46fc82bf06b61c9ac31c2f4331f84f8557c51e
This commit is contained in:
Родитель
5955ecaffd
Коммит
7db0ee08cb
|
@ -26,8 +26,8 @@ PRLogModuleInfo* gMP3DemuxerLog;
|
|||
#define MP3DEMUXER_LOGV(msg, ...)
|
||||
#endif
|
||||
|
||||
using media::TimeUnit;
|
||||
using media::TimeIntervals;
|
||||
using mozilla::media::TimeUnit;
|
||||
using mozilla::media::TimeIntervals;
|
||||
|
||||
namespace mozilla {
|
||||
namespace mp3 {
|
||||
|
|
|
@ -324,7 +324,7 @@ private:
|
|||
// MPEG streams.
|
||||
class MP3TrackDemuxer : public MediaTrackDemuxer {
|
||||
public:
|
||||
// Constructor, expecing a valid media resource.
|
||||
// Constructor, expecting a valid media resource.
|
||||
explicit MP3TrackDemuxer(MediaResource* aSource);
|
||||
|
||||
// Initializes the track demuxer by reading the first frame for meta data.
|
||||
|
|
|
@ -33,7 +33,7 @@ public:
|
|||
: mPtr(aData.Elements()), mRemaining(aData.Length()), mLength(aData.Length())
|
||||
{
|
||||
}
|
||||
explicit ByteReader(const MediaByteBuffer* aData)
|
||||
explicit ByteReader(const mozilla::MediaByteBuffer* aData)
|
||||
: mPtr(aData->Elements()), mRemaining(aData->Length()), mLength(aData->Length())
|
||||
{
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче