From 7db0ee08cb210656f62641509980a59593b2d4a0 Mon Sep 17 00:00:00 2001 From: Jan Henning Date: Thu, 1 Oct 2015 11:29:48 +0200 Subject: [PATCH] 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 --- dom/media/MP3Demuxer.cpp | 4 ++-- dom/media/MP3Demuxer.h | 2 +- media/libstagefright/binding/include/mp4_demuxer/ByteReader.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/media/MP3Demuxer.cpp b/dom/media/MP3Demuxer.cpp index e2819d6a05a2..0e0e3faf67e0 100644 --- a/dom/media/MP3Demuxer.cpp +++ b/dom/media/MP3Demuxer.cpp @@ -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 { diff --git a/dom/media/MP3Demuxer.h b/dom/media/MP3Demuxer.h index a21b026dda85..29fa74ce3c79 100644 --- a/dom/media/MP3Demuxer.h +++ b/dom/media/MP3Demuxer.h @@ -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. diff --git a/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h b/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h index 4617612250d4..521714e06cdd 100644 --- a/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h +++ b/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h @@ -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()) { }