Bug 1117261 - Mark virtual overridden functions as MOZ_OVERRIDE in DOM media code; r=rillian

This commit is contained in:
Ehsan Akhgari 2015-01-02 21:08:06 -05:00
parent 02203cdfb4
commit 31a966ecd6
25 changed files with 196 additions and 203 deletions

View File

@ -19,10 +19,10 @@ public:
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE; virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual AudioStreamTrack* AsAudioStreamTrack() { return this; } virtual AudioStreamTrack* AsAudioStreamTrack() MOZ_OVERRIDE { return this; }
// WebIDL // WebIDL
virtual void GetKind(nsAString& aKind) { aKind.AssignLiteral("audio"); } virtual void GetKind(nsAString& aKind) MOZ_OVERRIDE { aKind.AssignLiteral("audio"); }
}; };
} }

View File

@ -40,26 +40,26 @@ protected:
} }
private: private:
virtual nsresult Close() { return NS_OK; } virtual nsresult Close() MOZ_OVERRIDE { return NS_OK; }
virtual void Suspend(bool aCloseImmediately) {} virtual void Suspend(bool aCloseImmediately) MOZ_OVERRIDE {}
virtual void Resume() {} virtual void Resume() MOZ_OVERRIDE {}
// Get the current principal for the channel // Get the current principal for the channel
virtual already_AddRefed<nsIPrincipal> GetCurrentPrincipal() virtual already_AddRefed<nsIPrincipal> GetCurrentPrincipal() MOZ_OVERRIDE
{ {
nsCOMPtr<nsIPrincipal> principal = mPrincipal; nsCOMPtr<nsIPrincipal> principal = mPrincipal;
return principal.forget(); return principal.forget();
} }
virtual bool CanClone() { return false; } virtual bool CanClone() MOZ_OVERRIDE { return false; }
virtual already_AddRefed<MediaResource> CloneData(MediaDecoder* aDecoder) virtual already_AddRefed<MediaResource> CloneData(MediaDecoder* aDecoder) MOZ_OVERRIDE
{ {
return nullptr; return nullptr;
} }
// These methods are called off the main thread. // These methods are called off the main thread.
// The mode is initially MODE_PLAYBACK. // The mode is initially MODE_PLAYBACK.
virtual void SetReadMode(MediaCacheStream::ReadMode aMode) {} virtual void SetReadMode(MediaCacheStream::ReadMode aMode) MOZ_OVERRIDE {}
virtual void SetPlaybackRate(uint32_t aBytesPerSecond) {} virtual void SetPlaybackRate(uint32_t aBytesPerSecond) MOZ_OVERRIDE {}
virtual nsresult Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes) virtual nsresult Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes) MOZ_OVERRIDE
{ {
*aBytes = std::min(mLength - mOffset, aCount); *aBytes = std::min(mLength - mOffset, aCount);
memcpy(aBuffer, mBuffer + mOffset, *aBytes); memcpy(aBuffer, mBuffer + mOffset, *aBytes);
@ -68,13 +68,13 @@ private:
return NS_OK; return NS_OK;
} }
virtual nsresult ReadAt(int64_t aOffset, char* aBuffer, virtual nsresult ReadAt(int64_t aOffset, char* aBuffer,
uint32_t aCount, uint32_t* aBytes) uint32_t aCount, uint32_t* aBytes) MOZ_OVERRIDE
{ {
nsresult rv = Seek(nsISeekableStream::NS_SEEK_SET, aOffset); nsresult rv = Seek(nsISeekableStream::NS_SEEK_SET, aOffset);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
return Read(aBuffer, aCount, aBytes); return Read(aBuffer, aCount, aBytes);
} }
virtual nsresult Seek(int32_t aWhence, int64_t aOffset) virtual nsresult Seek(int32_t aWhence, int64_t aOffset) MOZ_OVERRIDE
{ {
MOZ_ASSERT(aOffset <= UINT32_MAX); MOZ_ASSERT(aOffset <= UINT32_MAX);
switch (aWhence) { switch (aWhence) {
@ -100,22 +100,20 @@ private:
return NS_OK; return NS_OK;
} }
virtual void StartSeekingForMetadata() {} virtual int64_t Tell() MOZ_OVERRIDE { return mOffset; }
virtual void EndSeekingForMetadata() {}
virtual int64_t Tell() { return mOffset; }
virtual void Pin() {} virtual void Pin() MOZ_OVERRIDE {}
virtual void Unpin() {} virtual void Unpin() MOZ_OVERRIDE {}
virtual double GetDownloadRate(bool* aIsReliable) { *aIsReliable = false; return 0.; } virtual double GetDownloadRate(bool* aIsReliable) MOZ_OVERRIDE { *aIsReliable = false; return 0.; }
virtual int64_t GetLength() { return mLength; } virtual int64_t GetLength() MOZ_OVERRIDE { return mLength; }
virtual int64_t GetNextCachedData(int64_t aOffset) { return aOffset; } virtual int64_t GetNextCachedData(int64_t aOffset) MOZ_OVERRIDE { return aOffset; }
virtual int64_t GetCachedDataEnd(int64_t aOffset) { return mLength; } virtual int64_t GetCachedDataEnd(int64_t aOffset) MOZ_OVERRIDE { return mLength; }
virtual bool IsDataCachedToEndOfResource(int64_t aOffset) { return true; } virtual bool IsDataCachedToEndOfResource(int64_t aOffset) MOZ_OVERRIDE { return true; }
virtual bool IsSuspendedByCache() { return false; } virtual bool IsSuspendedByCache() MOZ_OVERRIDE { return false; }
virtual bool IsSuspended() { return false; } virtual bool IsSuspended() MOZ_OVERRIDE { return false; }
virtual nsresult ReadFromCache(char* aBuffer, virtual nsresult ReadFromCache(char* aBuffer,
int64_t aOffset, int64_t aOffset,
uint32_t aCount) uint32_t aCount) MOZ_OVERRIDE
{ {
if (aOffset < 0) { if (aOffset < 0) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -126,12 +124,12 @@ private:
return NS_OK; return NS_OK;
} }
virtual nsresult Open(nsIStreamListener** aStreamListener) virtual nsresult Open(nsIStreamListener** aStreamListener) MOZ_OVERRIDE
{ {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
virtual nsresult GetCachedRanges(nsTArray<MediaByteRange>& aRanges) virtual nsresult GetCachedRanges(nsTArray<MediaByteRange>& aRanges) MOZ_OVERRIDE
{ {
aRanges.AppendElement(MediaByteRange(0, mLength)); aRanges.AppendElement(MediaByteRange(0, mLength));
return NS_OK; return NS_OK;

View File

@ -266,7 +266,7 @@ public:
*/ */
void RunThread(); void RunThread();
friend class MediaStreamGraphInitThreadRunnable; friend class MediaStreamGraphInitThreadRunnable;
uint32_t IterationDuration() { virtual uint32_t IterationDuration() MOZ_OVERRIDE {
return MEDIA_GRAPH_TARGET_PERIOD_MS; return MEDIA_GRAPH_TARGET_PERIOD_MS;
} }
@ -312,7 +312,7 @@ public:
virtual void WaitForNextIteration() MOZ_OVERRIDE; virtual void WaitForNextIteration() MOZ_OVERRIDE;
virtual void WakeUp() MOZ_OVERRIDE; virtual void WakeUp() MOZ_OVERRIDE;
virtual TimeStamp GetCurrentTimeStamp() MOZ_OVERRIDE; virtual TimeStamp GetCurrentTimeStamp() MOZ_OVERRIDE;
virtual OfflineClockDriver* AsOfflineClockDriver() { virtual OfflineClockDriver* AsOfflineClockDriver() MOZ_OVERRIDE {
return this; return this;
} }
@ -378,7 +378,7 @@ public:
void StateCallback(cubeb_state aState); void StateCallback(cubeb_state aState);
/* This is an approximation of the number of millisecond there are between two /* This is an approximation of the number of millisecond there are between two
* iterations of the graph. */ * iterations of the graph. */
uint32_t IterationDuration(); virtual uint32_t IterationDuration() MOZ_OVERRIDE;
/* This function gets called when the graph has produced the audio frames for /* This function gets called when the graph has produced the audio frames for
* this iteration. */ * this iteration. */
@ -388,7 +388,7 @@ public:
uint32_t aFrames, uint32_t aFrames,
uint32_t aSampleRate) MOZ_OVERRIDE; uint32_t aSampleRate) MOZ_OVERRIDE;
virtual AudioCallbackDriver* AsAudioCallbackDriver() { virtual AudioCallbackDriver* AsAudioCallbackDriver() MOZ_OVERRIDE {
return this; return this;
} }

View File

@ -616,7 +616,7 @@ public:
virtual bool IsMediaSeekable() MOZ_FINAL MOZ_OVERRIDE; virtual bool IsMediaSeekable() MOZ_FINAL MOZ_OVERRIDE;
// Returns true if seeking is supported on a transport level (e.g. the server // Returns true if seeking is supported on a transport level (e.g. the server
// supports range requests, we are playing a file, etc.). // supports range requests, we are playing a file, etc.).
virtual bool IsTransportSeekable(); virtual bool IsTransportSeekable() MOZ_OVERRIDE;
// Return the time ranges that can be seeked into. // Return the time ranges that can be seeked into.
virtual nsresult GetSeekable(dom::TimeRanges* aSeekable); virtual nsresult GetSeekable(dom::TimeRanges* aSeekable);
@ -749,7 +749,7 @@ public:
// or equal to aPublishTime. // or equal to aPublishTime.
void QueueMetadata(int64_t aPublishTime, void QueueMetadata(int64_t aPublishTime,
nsAutoPtr<MediaInfo> aInfo, nsAutoPtr<MediaInfo> aInfo,
nsAutoPtr<MetadataTags> aTags); nsAutoPtr<MetadataTags> aTags) MOZ_OVERRIDE;
int64_t GetSeekTime() { return mRequestedSeekTarget.mTime; } int64_t GetSeekTime() { return mRequestedSeekTarget.mTime; }
void ResetSeekTime() { mRequestedSeekTarget.Reset(); } void ResetSeekTime() { mRequestedSeekTarget.Reset(); }
@ -775,11 +775,11 @@ public:
// Called when the metadata from the media file has been loaded by the // Called when the metadata from the media file has been loaded by the
// state machine. Call on the main thread only. // state machine. Call on the main thread only.
virtual void MetadataLoaded(nsAutoPtr<MediaInfo> aInfo, virtual void MetadataLoaded(nsAutoPtr<MediaInfo> aInfo,
nsAutoPtr<MetadataTags> aTags); nsAutoPtr<MetadataTags> aTags) MOZ_OVERRIDE;
// Called when the first audio and/or video from the media file has been loaded // Called when the first audio and/or video from the media file has been loaded
// by the state machine. Call on the main thread only. // by the state machine. Call on the main thread only.
virtual void FirstFrameLoaded(nsAutoPtr<MediaInfo> aInfo); virtual void FirstFrameLoaded(nsAutoPtr<MediaInfo> aInfo) MOZ_OVERRIDE;
// Called from MetadataLoaded(). Creates audio tracks and adds them to its // Called from MetadataLoaded(). Creates audio tracks and adds them to its
// owner's audio track list, and implies to video tracks respectively. // owner's audio track list, and implies to video tracks respectively.

View File

@ -597,7 +597,7 @@ public:
} }
} }
virtual void Stop() virtual void Stop() MOZ_OVERRIDE
{ {
if (mSourceStream) { if (mSourceStream) {
mSourceStream->EndAllTrackAndFinish(); mSourceStream->EndAllTrackAndFinish();
@ -608,7 +608,7 @@ public:
// single-source trackunion like we have here, the TrackUnion will assign trackids // single-source trackunion like we have here, the TrackUnion will assign trackids
// that match the source's trackids, so we can avoid needing a mapping function. // that match the source's trackids, so we can avoid needing a mapping function.
// XXX This will not handle more complex cases well. // XXX This will not handle more complex cases well.
virtual void StopTrack(TrackID aTrackID) virtual void StopTrack(TrackID aTrackID) MOZ_OVERRIDE
{ {
if (mSourceStream) { if (mSourceStream) {
mSourceStream->EndTrack(aTrackID); mSourceStream->EndTrack(aTrackID);
@ -681,12 +681,12 @@ public:
GetStream()->AsProcessedStream()->ForwardTrackEnabled(aID, aEnabled); GetStream()->AsProcessedStream()->ForwardTrackEnabled(aID, aEnabled);
} }
virtual DOMLocalMediaStream* AsDOMLocalMediaStream() virtual DOMLocalMediaStream* AsDOMLocalMediaStream() MOZ_OVERRIDE
{ {
return this; return this;
} }
virtual MediaEngineSource* GetMediaEngine(TrackID aTrackID) virtual MediaEngineSource* GetMediaEngine(TrackID aTrackID) MOZ_OVERRIDE
{ {
// MediaEngine supports only one video and on video track now and TrackID is // MediaEngine supports only one video and on video track now and TrackID is
// fixed in MediaEngine. // fixed in MediaEngine.

View File

@ -220,12 +220,12 @@ protected:
} }
protected: protected:
virtual void DoResolve(ResolveValueType aResolveValue) virtual void DoResolve(ResolveValueType aResolveValue) MOZ_OVERRIDE
{ {
InvokeCallbackMethod(mThisVal.get(), mResolveMethod, aResolveValue); InvokeCallbackMethod(mThisVal.get(), mResolveMethod, aResolveValue);
} }
virtual void DoReject(RejectValueType aRejectValue) virtual void DoReject(RejectValueType aRejectValue) MOZ_OVERRIDE
{ {
InvokeCallbackMethod(mThisVal.get(), mRejectMethod, aRejectValue); InvokeCallbackMethod(mThisVal.get(), mRejectMethod, aRejectValue);
} }

View File

@ -73,7 +73,7 @@ public:
NS_METHOD NS_METHOD
CollectReports(nsIHandleReportCallback* aHandleReport, CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE
{ {
int64_t amount = 0; int64_t amount = 0;
RecordersArray& recorders = GetRecorders(); RecordersArray& recorders = GetRecorders();
@ -651,7 +651,7 @@ private:
} }
} }
NS_IMETHODIMP Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) NS_IMETHODIMP Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) MOZ_OVERRIDE
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
LOG(PR_LOG_DEBUG, ("Session.Observe XPCOM_SHUTDOWN %p", this)); LOG(PR_LOG_DEBUG, ("Session.Observe XPCOM_SHUTDOWN %p", this));

View File

@ -1199,60 +1199,60 @@ public:
} }
// Main thread // Main thread
virtual nsresult Open(nsIStreamListener** aStreamListener); virtual nsresult Open(nsIStreamListener** aStreamListener) MOZ_OVERRIDE;
virtual nsresult Close(); virtual nsresult Close() MOZ_OVERRIDE;
virtual void Suspend(bool aCloseImmediately) {} virtual void Suspend(bool aCloseImmediately) MOZ_OVERRIDE {}
virtual void Resume() {} virtual void Resume() MOZ_OVERRIDE {}
virtual already_AddRefed<nsIPrincipal> GetCurrentPrincipal(); virtual already_AddRefed<nsIPrincipal> GetCurrentPrincipal() MOZ_OVERRIDE;
virtual bool CanClone(); virtual bool CanClone() MOZ_OVERRIDE;
virtual already_AddRefed<MediaResource> CloneData(MediaDecoder* aDecoder); virtual already_AddRefed<MediaResource> CloneData(MediaDecoder* aDecoder) MOZ_OVERRIDE;
virtual nsresult ReadFromCache(char* aBuffer, int64_t aOffset, uint32_t aCount); virtual nsresult ReadFromCache(char* aBuffer, int64_t aOffset, uint32_t aCount) MOZ_OVERRIDE;
// These methods are called off the main thread. // These methods are called off the main thread.
// Other thread // Other thread
virtual void SetReadMode(MediaCacheStream::ReadMode aMode) {} virtual void SetReadMode(MediaCacheStream::ReadMode aMode) MOZ_OVERRIDE {}
virtual void SetPlaybackRate(uint32_t aBytesPerSecond) {} virtual void SetPlaybackRate(uint32_t aBytesPerSecond) MOZ_OVERRIDE {}
virtual nsresult Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes); virtual nsresult Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes) MOZ_OVERRIDE;
virtual nsresult ReadAt(int64_t aOffset, char* aBuffer, virtual nsresult ReadAt(int64_t aOffset, char* aBuffer,
uint32_t aCount, uint32_t* aBytes); uint32_t aCount, uint32_t* aBytes) MOZ_OVERRIDE;
virtual nsresult Seek(int32_t aWhence, int64_t aOffset); virtual nsresult Seek(int32_t aWhence, int64_t aOffset) MOZ_OVERRIDE;
virtual int64_t Tell(); virtual int64_t Tell() MOZ_OVERRIDE;
// Any thread // Any thread
virtual void Pin() {} virtual void Pin() MOZ_OVERRIDE {}
virtual void Unpin() {} virtual void Unpin() MOZ_OVERRIDE {}
virtual double GetDownloadRate(bool* aIsReliable) virtual double GetDownloadRate(bool* aIsReliable) MOZ_OVERRIDE
{ {
// The data's all already here // The data's all already here
*aIsReliable = true; *aIsReliable = true;
return 100*1024*1024; // arbitray, use 100MB/s return 100*1024*1024; // arbitray, use 100MB/s
} }
virtual int64_t GetLength() { virtual int64_t GetLength() MOZ_OVERRIDE {
MutexAutoLock lock(mLock); MutexAutoLock lock(mLock);
EnsureSizeInitialized(); EnsureSizeInitialized();
return mSizeInitialized ? mSize : 0; return mSizeInitialized ? mSize : 0;
} }
virtual int64_t GetNextCachedData(int64_t aOffset) virtual int64_t GetNextCachedData(int64_t aOffset) MOZ_OVERRIDE
{ {
MutexAutoLock lock(mLock); MutexAutoLock lock(mLock);
EnsureSizeInitialized(); EnsureSizeInitialized();
return (aOffset < mSize) ? aOffset : -1; return (aOffset < mSize) ? aOffset : -1;
} }
virtual int64_t GetCachedDataEnd(int64_t aOffset) { virtual int64_t GetCachedDataEnd(int64_t aOffset) MOZ_OVERRIDE {
MutexAutoLock lock(mLock); MutexAutoLock lock(mLock);
EnsureSizeInitialized(); EnsureSizeInitialized();
return std::max(aOffset, mSize); return std::max(aOffset, mSize);
} }
virtual bool IsDataCachedToEndOfResource(int64_t aOffset) { return true; } virtual bool IsDataCachedToEndOfResource(int64_t aOffset) MOZ_OVERRIDE { return true; }
virtual bool IsSuspendedByCache() { return true; } virtual bool IsSuspendedByCache() MOZ_OVERRIDE { return true; }
virtual bool IsSuspended() { return true; } virtual bool IsSuspended() MOZ_OVERRIDE { return true; }
virtual bool IsTransportSeekable() MOZ_OVERRIDE { return true; } virtual bool IsTransportSeekable() MOZ_OVERRIDE { return true; }
nsresult GetCachedRanges(nsTArray<MediaByteRange>& aRanges); nsresult GetCachedRanges(nsTArray<MediaByteRange>& aRanges) MOZ_OVERRIDE;
virtual size_t SizeOfExcludingThis( virtual size_t SizeOfExcludingThis(
MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE

View File

@ -430,7 +430,7 @@ private:
class BaseMediaResource : public MediaResource { class BaseMediaResource : public MediaResource {
public: public:
virtual nsIURI* URI() const { return mURI; } virtual nsIURI* URI() const MOZ_OVERRIDE { return mURI; }
virtual void SetLoadInBackground(bool aLoadInBackground) MOZ_OVERRIDE; virtual void SetLoadInBackground(bool aLoadInBackground) MOZ_OVERRIDE;
virtual size_t SizeOfExcludingThis( virtual size_t SizeOfExcludingThis(
@ -564,15 +564,15 @@ public:
virtual void NotifyLastByteRange() MOZ_OVERRIDE; virtual void NotifyLastByteRange() MOZ_OVERRIDE;
// Main thread // Main thread
virtual nsresult Open(nsIStreamListener** aStreamListener); virtual nsresult Open(nsIStreamListener** aStreamListener) MOZ_OVERRIDE;
virtual nsresult Close(); virtual nsresult Close() MOZ_OVERRIDE;
virtual void Suspend(bool aCloseImmediately); virtual void Suspend(bool aCloseImmediately) MOZ_OVERRIDE;
virtual void Resume(); virtual void Resume() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPrincipal> GetCurrentPrincipal(); virtual already_AddRefed<nsIPrincipal> GetCurrentPrincipal() MOZ_OVERRIDE;
// Return true if the stream has been closed. // Return true if the stream has been closed.
bool IsClosed() const { return mCacheStream.IsClosed(); } bool IsClosed() const { return mCacheStream.IsClosed(); }
virtual bool CanClone(); virtual bool CanClone() MOZ_OVERRIDE;
virtual already_AddRefed<MediaResource> CloneData(MediaDecoder* aDecoder); virtual already_AddRefed<MediaResource> CloneData(MediaDecoder* aDecoder) MOZ_OVERRIDE;
// Set statistics to be recorded to the object passed in. If not called, // Set statistics to be recorded to the object passed in. If not called,
// |ChannelMediaResource| will create it's own statistics objects in |Open|. // |ChannelMediaResource| will create it's own statistics objects in |Open|.
void RecordStatisticsTo(MediaChannelStatistics *aStatistics) MOZ_OVERRIDE { void RecordStatisticsTo(MediaChannelStatistics *aStatistics) MOZ_OVERRIDE {
@ -582,28 +582,28 @@ public:
mChannelStatistics = aStatistics; mChannelStatistics = aStatistics;
} }
} }
virtual nsresult ReadFromCache(char* aBuffer, int64_t aOffset, uint32_t aCount); virtual nsresult ReadFromCache(char* aBuffer, int64_t aOffset, uint32_t aCount) MOZ_OVERRIDE;
virtual void EnsureCacheUpToDate(); virtual void EnsureCacheUpToDate() MOZ_OVERRIDE;
// Other thread // Other thread
virtual void SetReadMode(MediaCacheStream::ReadMode aMode); virtual void SetReadMode(MediaCacheStream::ReadMode aMode) MOZ_OVERRIDE;
virtual void SetPlaybackRate(uint32_t aBytesPerSecond); virtual void SetPlaybackRate(uint32_t aBytesPerSecond) MOZ_OVERRIDE;
virtual nsresult Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes); virtual nsresult Read(char* aBuffer, uint32_t aCount, uint32_t* aBytes) MOZ_OVERRIDE;
virtual nsresult ReadAt(int64_t offset, char* aBuffer, virtual nsresult ReadAt(int64_t offset, char* aBuffer,
uint32_t aCount, uint32_t* aBytes); uint32_t aCount, uint32_t* aBytes) MOZ_OVERRIDE;
virtual nsresult Seek(int32_t aWhence, int64_t aOffset); virtual nsresult Seek(int32_t aWhence, int64_t aOffset) MOZ_OVERRIDE;
virtual int64_t Tell(); virtual int64_t Tell() MOZ_OVERRIDE;
// Any thread // Any thread
virtual void Pin(); virtual void Pin() MOZ_OVERRIDE;
virtual void Unpin(); virtual void Unpin() MOZ_OVERRIDE;
virtual double GetDownloadRate(bool* aIsReliable); virtual double GetDownloadRate(bool* aIsReliable) MOZ_OVERRIDE;
virtual int64_t GetLength(); virtual int64_t GetLength() MOZ_OVERRIDE;
virtual int64_t GetNextCachedData(int64_t aOffset); virtual int64_t GetNextCachedData(int64_t aOffset) MOZ_OVERRIDE;
virtual int64_t GetCachedDataEnd(int64_t aOffset); virtual int64_t GetCachedDataEnd(int64_t aOffset) MOZ_OVERRIDE;
virtual bool IsDataCachedToEndOfResource(int64_t aOffset); virtual bool IsDataCachedToEndOfResource(int64_t aOffset) MOZ_OVERRIDE;
virtual bool IsSuspendedByCache(); virtual bool IsSuspendedByCache() MOZ_OVERRIDE;
virtual bool IsSuspended(); virtual bool IsSuspended() MOZ_OVERRIDE;
virtual bool IsTransportSeekable() MOZ_OVERRIDE; virtual bool IsTransportSeekable() MOZ_OVERRIDE;
virtual size_t SizeOfExcludingThis( virtual size_t SizeOfExcludingThis(
@ -645,7 +645,7 @@ public:
}; };
friend class Listener; friend class Listener;
nsresult GetCachedRanges(nsTArray<MediaByteRange>& aRanges); virtual nsresult GetCachedRanges(nsTArray<MediaByteRange>& aRanges) MOZ_OVERRIDE;
protected: protected:
// These are called on the main thread by Listener. // These are called on the main thread by Listener.

View File

@ -143,11 +143,11 @@ protected:
*/ */
template <class C, class Chunk> class MediaSegmentBase : public MediaSegment { template <class C, class Chunk> class MediaSegmentBase : public MediaSegment {
public: public:
virtual MediaSegment* CreateEmptyClone() const virtual MediaSegment* CreateEmptyClone() const MOZ_OVERRIDE
{ {
return new C(); return new C();
} }
virtual void AppendFrom(MediaSegment* aSource) virtual void AppendFrom(MediaSegment* aSource) MOZ_OVERRIDE
{ {
NS_ASSERTION(aSource->GetType() == C::StaticType(), "Wrong type"); NS_ASSERTION(aSource->GetType() == C::StaticType(), "Wrong type");
AppendFromInternal(static_cast<C*>(aSource)); AppendFromInternal(static_cast<C*>(aSource));
@ -157,7 +157,7 @@ public:
AppendFromInternal(aSource); AppendFromInternal(aSource);
} }
virtual void AppendSlice(const MediaSegment& aSource, virtual void AppendSlice(const MediaSegment& aSource,
StreamTime aStart, StreamTime aEnd) StreamTime aStart, StreamTime aEnd) MOZ_OVERRIDE
{ {
NS_ASSERTION(aSource.GetType() == C::StaticType(), "Wrong type"); NS_ASSERTION(aSource.GetType() == C::StaticType(), "Wrong type");
AppendSliceInternal(static_cast<const C&>(aSource), aStart, aEnd); AppendSliceInternal(static_cast<const C&>(aSource), aStart, aEnd);
@ -170,7 +170,7 @@ public:
* Replace the first aDuration ticks with null media data, because the data * Replace the first aDuration ticks with null media data, because the data
* will not be required again. * will not be required again.
*/ */
virtual void ForgetUpTo(StreamTime aDuration) virtual void ForgetUpTo(StreamTime aDuration) MOZ_OVERRIDE
{ {
if (mChunks.IsEmpty() || aDuration <= 0) { if (mChunks.IsEmpty() || aDuration <= 0) {
return; return;
@ -188,7 +188,7 @@ public:
mChunks.InsertElementAt(0)->SetNull(aDuration); mChunks.InsertElementAt(0)->SetNull(aDuration);
mDuration += aDuration; mDuration += aDuration;
} }
virtual void FlushAfter(StreamTime aNewEnd) virtual void FlushAfter(StreamTime aNewEnd) MOZ_OVERRIDE
{ {
if (mChunks.IsEmpty()) { if (mChunks.IsEmpty()) {
return; return;
@ -211,7 +211,7 @@ public:
} }
mDuration = aNewEnd; mDuration = aNewEnd;
} }
virtual void InsertNullDataAtStart(StreamTime aDuration) virtual void InsertNullDataAtStart(StreamTime aDuration) MOZ_OVERRIDE
{ {
if (aDuration <= 0) { if (aDuration <= 0) {
return; return;
@ -226,7 +226,7 @@ public:
#endif #endif
mDuration += aDuration; mDuration += aDuration;
} }
virtual void AppendNullData(StreamTime aDuration) virtual void AppendNullData(StreamTime aDuration) MOZ_OVERRIDE
{ {
if (aDuration <= 0) { if (aDuration <= 0) {
return; return;
@ -238,7 +238,7 @@ public:
} }
mDuration += aDuration; mDuration += aDuration;
} }
virtual void ReplaceWithDisabled() virtual void ReplaceWithDisabled() MOZ_OVERRIDE
{ {
if (GetType() != AUDIO) { if (GetType() != AUDIO) {
MOZ_CRASH("Disabling unknown segment type"); MOZ_CRASH("Disabling unknown segment type");
@ -247,7 +247,7 @@ public:
Clear(); Clear();
AppendNullData(duration); AppendNullData(duration);
} }
virtual void Clear() virtual void Clear() MOZ_OVERRIDE
{ {
mDuration = 0; mDuration = 0;
mChunks.Clear(); mChunks.Clear();

View File

@ -693,10 +693,10 @@ public:
mNeedsMixing(false) mNeedsMixing(false)
{} {}
virtual SourceMediaStream* AsSourceStream() { return this; } virtual SourceMediaStream* AsSourceStream() MOZ_OVERRIDE { return this; }
// Media graph thread only // Media graph thread only
virtual void DestroyImpl(); virtual void DestroyImpl() MOZ_OVERRIDE;
// Call these on any thread. // Call these on any thread.
/** /**
@ -1069,7 +1069,7 @@ public:
*/ */
void SetAutofinish(bool aAutofinish); void SetAutofinish(bool aAutofinish);
virtual ProcessedMediaStream* AsProcessedStream() { return this; } virtual ProcessedMediaStream* AsProcessedStream() MOZ_OVERRIDE { return this; }
friend class MediaStreamGraphImpl; friend class MediaStreamGraphImpl;
@ -1087,7 +1087,7 @@ public:
{ {
return mInputs.Length(); return mInputs.Length();
} }
virtual void DestroyImpl(); virtual void DestroyImpl() MOZ_OVERRIDE;
/** /**
* This gets called after we've computed the blocking states for all * This gets called after we've computed the blocking states for all
* streams (mBlocked is up to date up to mStateComputedTime). * streams (mBlocked is up to date up to mStateComputedTime).

View File

@ -43,9 +43,9 @@ public:
// the shared pool singleton when the refcount drops to 0. The addref/release // the shared pool singleton when the refcount drops to 0. The addref/release
// are implemented using locking, so it's not recommended that you use them // are implemented using locking, so it's not recommended that you use them
// in a tight loop. // in a tight loop.
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr); NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) MOZ_OVERRIDE;
NS_IMETHOD_(MozExternalRefCountType) AddRef(void); NS_IMETHOD_(MozExternalRefCountType) AddRef(void) MOZ_OVERRIDE;
NS_IMETHOD_(MozExternalRefCountType) Release(void); NS_IMETHOD_(MozExternalRefCountType) Release(void) MOZ_OVERRIDE;
// Forward behaviour to wrapped thread pool implementation. // Forward behaviour to wrapped thread pool implementation.
NS_FORWARD_SAFE_NSITHREADPOOL(mPool); NS_FORWARD_SAFE_NSITHREADPOOL(mPool);

View File

@ -19,10 +19,10 @@ public:
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE; virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
virtual VideoStreamTrack* AsVideoStreamTrack() { return this; } virtual VideoStreamTrack* AsVideoStreamTrack() MOZ_OVERRIDE { return this; }
// WebIDL // WebIDL
virtual void GetKind(nsAString& aKind) { aKind.AssignLiteral("video"); } virtual void GetKind(nsAString& aKind) MOZ_OVERRIDE { aKind.AssignLiteral("video"); }
}; };
} }

View File

@ -37,7 +37,7 @@ public:
nsresult GetEncodedTrack(EncodedFrameContainer& aData) MOZ_OVERRIDE; nsresult GetEncodedTrack(EncodedFrameContainer& aData) MOZ_OVERRIDE;
protected: protected:
int GetPacketDuration(); int GetPacketDuration() MOZ_OVERRIDE;
nsresult Init(int aChannels, int aSamplingRate) MOZ_OVERRIDE; nsresult Init(int aChannels, int aSamplingRate) MOZ_OVERRIDE;

View File

@ -15,14 +15,14 @@ class MP4Decoder : public MediaDecoder
{ {
public: public:
virtual MediaDecoder* Clone() { virtual MediaDecoder* Clone() MOZ_OVERRIDE {
if (!IsEnabled()) { if (!IsEnabled()) {
return nullptr; return nullptr;
} }
return new MP4Decoder(); return new MP4Decoder();
} }
virtual MediaDecoderStateMachine* CreateStateMachine(); virtual MediaDecoderStateMachine* CreateStateMachine() MOZ_OVERRIDE;
#ifdef MOZ_EME #ifdef MOZ_EME
virtual nsresult SetCDMProxy(CDMProxy* aProxy) MOZ_OVERRIDE; virtual nsresult SetCDMProxy(CDMProxy* aProxy) MOZ_OVERRIDE;

View File

@ -111,7 +111,7 @@ private:
virtual bool RecvDecrypt(const uint32_t& aId, virtual bool RecvDecrypt(const uint32_t& aId,
const nsTArray<uint8_t>& aBuffer, const nsTArray<uint8_t>& aBuffer,
const GMPDecryptionData& aMetadata); const GMPDecryptionData& aMetadata) MOZ_OVERRIDE;
// Resolve/reject promise on completion. // Resolve/reject promise on completion.
virtual bool RecvSetServerCertificate(const uint32_t& aPromiseId, virtual bool RecvSetServerCertificate(const uint32_t& aPromiseId,

View File

@ -88,7 +88,7 @@ public:
// through. // through.
bool UseBufferingHeuristics() MOZ_OVERRIDE { return false; } bool UseBufferingHeuristics() MOZ_OVERRIDE { return false; }
bool IsMediaSeekable() { return true; } bool IsMediaSeekable() MOZ_OVERRIDE { return true; }
nsresult ReadMetadata(MediaInfo* aInfo, MetadataTags** aTags) MOZ_OVERRIDE; nsresult ReadMetadata(MediaInfo* aInfo, MetadataTags** aTags) MOZ_OVERRIDE;
void ReadUpdatedMetadata(MediaInfo* aInfo) MOZ_OVERRIDE; void ReadUpdatedMetadata(MediaInfo* aInfo) MOZ_OVERRIDE;
@ -108,7 +108,7 @@ public:
nsRefPtr<ShutdownPromise> Shutdown() MOZ_OVERRIDE; nsRefPtr<ShutdownPromise> Shutdown() MOZ_OVERRIDE;
virtual void BreakCycles(); virtual void BreakCycles() MOZ_OVERRIDE;
bool IsShutdown() bool IsShutdown()
{ {

View File

@ -101,7 +101,7 @@ public:
} }
#ifdef MOZ_EME #ifdef MOZ_EME
virtual nsresult SetCDMProxy(CDMProxy* aProxy) virtual nsresult SetCDMProxy(CDMProxy* aProxy) MOZ_OVERRIDE
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
ReentrantMonitorAutoEnter mon(GetReentrantMonitor()); ReentrantMonitorAutoEnter mon(GetReentrantMonitor());

View File

@ -54,30 +54,30 @@ protected:
~OggReader(); ~OggReader();
public: public:
virtual nsresult Init(MediaDecoderReader* aCloneDonor); virtual nsresult Init(MediaDecoderReader* aCloneDonor) MOZ_OVERRIDE;
virtual nsresult ResetDecode(); virtual nsresult ResetDecode() MOZ_OVERRIDE;
virtual bool DecodeAudioData(); virtual bool DecodeAudioData() MOZ_OVERRIDE;
// If the Theora granulepos has not been captured, it may read several packets // If the Theora granulepos has not been captured, it may read several packets
// until one with a granulepos has been captured, to ensure that all packets // until one with a granulepos has been captured, to ensure that all packets
// read have valid time info. // read have valid time info.
virtual bool DecodeVideoFrame(bool &aKeyframeSkip, virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
int64_t aTimeThreshold); int64_t aTimeThreshold) MOZ_OVERRIDE;
virtual bool HasAudio() { virtual bool HasAudio() MOZ_OVERRIDE {
return (mVorbisState != 0 && mVorbisState->mActive) || return (mVorbisState != 0 && mVorbisState->mActive) ||
(mOpusState != 0 && mOpusState->mActive); (mOpusState != 0 && mOpusState->mActive);
} }
virtual bool HasVideo() { virtual bool HasVideo() MOZ_OVERRIDE {
return mTheoraState != 0 && mTheoraState->mActive; return mTheoraState != 0 && mTheoraState->mActive;
} }
virtual nsresult ReadMetadata(MediaInfo* aInfo, virtual nsresult ReadMetadata(MediaInfo* aInfo,
MetadataTags** aTags); MetadataTags** aTags) MOZ_OVERRIDE;
virtual nsRefPtr<SeekPromise> virtual nsRefPtr<SeekPromise>
Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE; Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE;
virtual nsresult GetBuffered(dom::TimeRanges* aBuffered); virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) MOZ_OVERRIDE;
virtual bool IsMediaSeekable() MOZ_OVERRIDE; virtual bool IsMediaSeekable() MOZ_OVERRIDE;

View File

@ -20,29 +20,29 @@ protected:
~RawReader(); ~RawReader();
public: public:
virtual nsresult Init(MediaDecoderReader* aCloneDonor); virtual nsresult Init(MediaDecoderReader* aCloneDonor) MOZ_OVERRIDE;
virtual nsresult ResetDecode(); virtual nsresult ResetDecode() MOZ_OVERRIDE;
virtual bool DecodeAudioData(); virtual bool DecodeAudioData() MOZ_OVERRIDE;
virtual bool DecodeVideoFrame(bool &aKeyframeSkip, virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
int64_t aTimeThreshold); int64_t aTimeThreshold) MOZ_OVERRIDE;
virtual bool HasAudio() virtual bool HasAudio() MOZ_OVERRIDE
{ {
return false; return false;
} }
virtual bool HasVideo() virtual bool HasVideo() MOZ_OVERRIDE
{ {
return true; return true;
} }
virtual nsresult ReadMetadata(MediaInfo* aInfo, virtual nsresult ReadMetadata(MediaInfo* aInfo,
MetadataTags** aTags); MetadataTags** aTags) MOZ_OVERRIDE;
virtual nsRefPtr<SeekPromise> virtual nsRefPtr<SeekPromise>
Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE; Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE;
virtual nsresult GetBuffered(dom::TimeRanges* aBuffered); virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) MOZ_OVERRIDE;
virtual bool IsMediaSeekable() MOZ_OVERRIDE; virtual bool IsMediaSeekable() MOZ_OVERRIDE;

View File

@ -26,32 +26,27 @@ protected:
~WaveReader(); ~WaveReader();
public: public:
virtual nsresult Init(MediaDecoderReader* aCloneDonor); virtual nsresult Init(MediaDecoderReader* aCloneDonor) MOZ_OVERRIDE;
virtual bool DecodeAudioData(); virtual bool DecodeAudioData() MOZ_OVERRIDE;
virtual bool DecodeVideoFrame(bool &aKeyframeSkip, virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
int64_t aTimeThreshold); int64_t aTimeThreshold) MOZ_OVERRIDE;
virtual bool HasAudio() virtual bool HasAudio() MOZ_OVERRIDE
{ {
return true; return true;
} }
virtual bool HasVideo() virtual bool HasVideo() MOZ_OVERRIDE
{ {
return false; return false;
} }
virtual nsresult ReadMetadata(MediaInfo* aInfo, virtual nsresult ReadMetadata(MediaInfo* aInfo,
MetadataTags** aTags); MetadataTags** aTags) MOZ_OVERRIDE;
virtual nsRefPtr<SeekPromise> virtual nsRefPtr<SeekPromise>
Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE; Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE;
virtual nsresult GetBuffered(dom::TimeRanges* aBuffered); virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) MOZ_OVERRIDE;
// To seek in a buffered range, we just have to seek the stream.
virtual bool IsSeekableInBufferedRanges() {
return true;
}
virtual bool IsMediaSeekable() MOZ_OVERRIDE; virtual bool IsMediaSeekable() MOZ_OVERRIDE;

View File

@ -134,34 +134,34 @@ protected:
public: public:
virtual nsRefPtr<ShutdownPromise> Shutdown() MOZ_OVERRIDE; virtual nsRefPtr<ShutdownPromise> Shutdown() MOZ_OVERRIDE;
virtual nsresult Init(MediaDecoderReader* aCloneDonor); virtual nsresult Init(MediaDecoderReader* aCloneDonor) MOZ_OVERRIDE;
virtual nsresult ResetDecode(); virtual nsresult ResetDecode() MOZ_OVERRIDE;
virtual bool DecodeAudioData(); virtual bool DecodeAudioData() MOZ_OVERRIDE;
virtual bool DecodeVideoFrame(bool &aKeyframeSkip, virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
int64_t aTimeThreshold); int64_t aTimeThreshold) MOZ_OVERRIDE;
virtual bool HasAudio() virtual bool HasAudio() MOZ_OVERRIDE
{ {
NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
return mHasAudio; return mHasAudio;
} }
virtual bool HasVideo() virtual bool HasVideo() MOZ_OVERRIDE
{ {
NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
return mHasVideo; return mHasVideo;
} }
virtual nsresult ReadMetadata(MediaInfo* aInfo, virtual nsresult ReadMetadata(MediaInfo* aInfo,
MetadataTags** aTags); MetadataTags** aTags) MOZ_OVERRIDE;
virtual nsRefPtr<SeekPromise> virtual nsRefPtr<SeekPromise>
Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE; Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_OVERRIDE;
virtual nsresult GetBuffered(dom::TimeRanges* aBuffered); virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) MOZ_OVERRIDE;
virtual void NotifyDataArrived(const char* aBuffer, uint32_t aLength, virtual void NotifyDataArrived(const char* aBuffer, uint32_t aLength,
int64_t aOffset); int64_t aOffset) MOZ_OVERRIDE;
virtual int64_t GetEvictionOffset(double aTime); virtual int64_t GetEvictionOffset(double aTime) MOZ_OVERRIDE;
virtual bool IsMediaSeekable() MOZ_OVERRIDE; virtual bool IsMediaSeekable() MOZ_OVERRIDE;

View File

@ -49,7 +49,7 @@ public:
return false; return false;
} }
virtual const MediaSourceType GetMediaSource() { virtual const MediaSourceType GetMediaSource() MOZ_OVERRIDE {
return MediaSourceType::Camera; return MediaSourceType::Camera;
} }

View File

@ -37,38 +37,38 @@ class MediaEngineDefaultVideoSource : public nsITimerCallback,
public: public:
MediaEngineDefaultVideoSource(); MediaEngineDefaultVideoSource();
virtual void GetName(nsAString&); virtual void GetName(nsAString&) MOZ_OVERRIDE;
virtual void GetUUID(nsAString&); virtual void GetUUID(nsAString&) MOZ_OVERRIDE;
virtual nsresult Allocate(const VideoTrackConstraintsN &aConstraints, virtual nsresult Allocate(const VideoTrackConstraintsN &aConstraints,
const MediaEnginePrefs &aPrefs); const MediaEnginePrefs &aPrefs) MOZ_OVERRIDE;
virtual nsresult Deallocate(); virtual nsresult Deallocate() MOZ_OVERRIDE;
virtual nsresult Start(SourceMediaStream*, TrackID); virtual nsresult Start(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
virtual nsresult Stop(SourceMediaStream*, TrackID); virtual nsresult Stop(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
virtual void SetDirectListeners(bool aHasDirectListeners) {}; virtual void SetDirectListeners(bool aHasDirectListeners) MOZ_OVERRIDE {};
virtual nsresult Config(bool aEchoOn, uint32_t aEcho, virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
bool aAgcOn, uint32_t aAGC, bool aAgcOn, uint32_t aAGC,
bool aNoiseOn, uint32_t aNoise, bool aNoiseOn, uint32_t aNoise,
int32_t aPlayoutDelay) { return NS_OK; }; int32_t aPlayoutDelay) MOZ_OVERRIDE { return NS_OK; };
virtual void NotifyPull(MediaStreamGraph* aGraph, virtual void NotifyPull(MediaStreamGraph* aGraph,
SourceMediaStream *aSource, SourceMediaStream *aSource,
TrackID aId, TrackID aId,
StreamTime aDesiredTime) MOZ_OVERRIDE; StreamTime aDesiredTime) MOZ_OVERRIDE;
virtual bool SatisfiesConstraintSets( virtual bool SatisfiesConstraintSets(
const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) MOZ_OVERRIDE
{ {
return true; return true;
} }
virtual bool IsFake() { virtual bool IsFake() MOZ_OVERRIDE {
return true; return true;
} }
virtual const MediaSourceType GetMediaSource() { virtual const MediaSourceType GetMediaSource() MOZ_OVERRIDE {
return MediaSourceType::Camera; return MediaSourceType::Camera;
} }
virtual nsresult TakePhoto(PhotoCallback* aCallback) virtual nsresult TakePhoto(PhotoCallback* aCallback) MOZ_OVERRIDE
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -105,33 +105,33 @@ class MediaEngineDefaultAudioSource : public nsITimerCallback,
public: public:
MediaEngineDefaultAudioSource(); MediaEngineDefaultAudioSource();
virtual void GetName(nsAString&); virtual void GetName(nsAString&) MOZ_OVERRIDE;
virtual void GetUUID(nsAString&); virtual void GetUUID(nsAString&) MOZ_OVERRIDE;
virtual nsresult Allocate(const AudioTrackConstraintsN &aConstraints, virtual nsresult Allocate(const AudioTrackConstraintsN &aConstraints,
const MediaEnginePrefs &aPrefs); const MediaEnginePrefs &aPrefs) MOZ_OVERRIDE;
virtual nsresult Deallocate(); virtual nsresult Deallocate() MOZ_OVERRIDE;
virtual nsresult Start(SourceMediaStream*, TrackID); virtual nsresult Start(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
virtual nsresult Stop(SourceMediaStream*, TrackID); virtual nsresult Stop(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
virtual void SetDirectListeners(bool aHasDirectListeners) {}; virtual void SetDirectListeners(bool aHasDirectListeners) MOZ_OVERRIDE {};
virtual nsresult Config(bool aEchoOn, uint32_t aEcho, virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
bool aAgcOn, uint32_t aAGC, bool aAgcOn, uint32_t aAGC,
bool aNoiseOn, uint32_t aNoise, bool aNoiseOn, uint32_t aNoise,
int32_t aPlayoutDelay) { return NS_OK; }; int32_t aPlayoutDelay) MOZ_OVERRIDE { return NS_OK; };
virtual void NotifyPull(MediaStreamGraph* aGraph, virtual void NotifyPull(MediaStreamGraph* aGraph,
SourceMediaStream *aSource, SourceMediaStream *aSource,
TrackID aId, TrackID aId,
StreamTime aDesiredTime) MOZ_OVERRIDE {} StreamTime aDesiredTime) MOZ_OVERRIDE {}
virtual bool IsFake() { virtual bool IsFake() MOZ_OVERRIDE {
return true; return true;
} }
virtual const MediaSourceType GetMediaSource() { virtual const MediaSourceType GetMediaSource() MOZ_OVERRIDE {
return MediaSourceType::Microphone; return MediaSourceType::Microphone;
} }
virtual nsresult TakePhoto(PhotoCallback* aCallback) virtual nsresult TakePhoto(PhotoCallback* aCallback) MOZ_OVERRIDE
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }

View File

@ -65,18 +65,18 @@ public:
NS_DECL_THREADSAFE_ISUPPORTS NS_DECL_THREADSAFE_ISUPPORTS
// ViEExternalRenderer. // ViEExternalRenderer.
virtual int FrameSizeChange(unsigned int w, unsigned int h, unsigned int streams); virtual int FrameSizeChange(unsigned int w, unsigned int h, unsigned int streams) MOZ_OVERRIDE;
virtual int DeliverFrame(unsigned char* buffer, virtual int DeliverFrame(unsigned char* buffer,
int size, int size,
uint32_t time_stamp, uint32_t time_stamp,
int64_t render_time, int64_t render_time,
void *handle); void *handle) MOZ_OVERRIDE;
/** /**
* Does DeliverFrame() support a null buffer and non-null handle * Does DeliverFrame() support a null buffer and non-null handle
* (video texture)? * (video texture)?
* XXX Investigate! Especially for Android/B2G * XXX Investigate! Especially for Android/B2G
*/ */
virtual bool IsTextureSupported() { return false; } virtual bool IsTextureSupported() MOZ_OVERRIDE { return false; }
MediaEngineWebRTCVideoSource(webrtc::VideoEngine* aVideoEnginePtr, int aIndex, MediaEngineWebRTCVideoSource(webrtc::VideoEngine* aVideoEnginePtr, int aIndex,
MediaSourceType aMediaSource = MediaSourceType::Camera) MediaSourceType aMediaSource = MediaSourceType::Camera)
@ -90,19 +90,19 @@ public:
} }
virtual nsresult Allocate(const VideoTrackConstraintsN& aConstraints, virtual nsresult Allocate(const VideoTrackConstraintsN& aConstraints,
const MediaEnginePrefs& aPrefs); const MediaEnginePrefs& aPrefs) MOZ_OVERRIDE;
virtual nsresult Deallocate(); virtual nsresult Deallocate() MOZ_OVERRIDE;
virtual nsresult Start(SourceMediaStream*, TrackID); virtual nsresult Start(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
virtual nsresult Stop(SourceMediaStream*, TrackID); virtual nsresult Stop(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
virtual void NotifyPull(MediaStreamGraph* aGraph, virtual void NotifyPull(MediaStreamGraph* aGraph,
SourceMediaStream* aSource, SourceMediaStream* aSource,
TrackID aId, TrackID aId,
StreamTime aDesiredTime) MOZ_OVERRIDE; StreamTime aDesiredTime) MOZ_OVERRIDE;
virtual const MediaSourceType GetMediaSource() { virtual const MediaSourceType GetMediaSource() MOZ_OVERRIDE {
return mMediaSource; return mMediaSource;
} }
virtual nsresult TakePhoto(PhotoCallback* aCallback) virtual nsresult TakePhoto(PhotoCallback* aCallback) MOZ_OVERRIDE
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -110,7 +110,7 @@ public:
void Refresh(int aIndex); void Refresh(int aIndex);
bool SatisfiesConstraintSets( bool SatisfiesConstraintSets(
const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets); const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) MOZ_OVERRIDE;
protected: protected:
~MediaEngineWebRTCVideoSource() { Shutdown(); } ~MediaEngineWebRTCVideoSource() { Shutdown(); }
@ -162,34 +162,34 @@ public:
Init(); Init();
} }
virtual void GetName(nsAString& aName); virtual void GetName(nsAString& aName) MOZ_OVERRIDE;
virtual void GetUUID(nsAString& aUUID); virtual void GetUUID(nsAString& aUUID) MOZ_OVERRIDE;
virtual nsresult Allocate(const AudioTrackConstraintsN& aConstraints, virtual nsresult Allocate(const AudioTrackConstraintsN& aConstraints,
const MediaEnginePrefs& aPrefs); const MediaEnginePrefs& aPrefs) MOZ_OVERRIDE;
virtual nsresult Deallocate(); virtual nsresult Deallocate() MOZ_OVERRIDE;
virtual nsresult Start(SourceMediaStream* aStream, TrackID aID); virtual nsresult Start(SourceMediaStream* aStream, TrackID aID) MOZ_OVERRIDE;
virtual nsresult Stop(SourceMediaStream* aSource, TrackID aID); virtual nsresult Stop(SourceMediaStream* aSource, TrackID aID) MOZ_OVERRIDE;
virtual void SetDirectListeners(bool aHasDirectListeners) {}; virtual void SetDirectListeners(bool aHasDirectListeners) MOZ_OVERRIDE {};
virtual nsresult Config(bool aEchoOn, uint32_t aEcho, virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
bool aAgcOn, uint32_t aAGC, bool aAgcOn, uint32_t aAGC,
bool aNoiseOn, uint32_t aNoise, bool aNoiseOn, uint32_t aNoise,
int32_t aPlayoutDelay); int32_t aPlayoutDelay) MOZ_OVERRIDE;
virtual void NotifyPull(MediaStreamGraph* aGraph, virtual void NotifyPull(MediaStreamGraph* aGraph,
SourceMediaStream* aSource, SourceMediaStream* aSource,
TrackID aId, TrackID aId,
StreamTime aDesiredTime) MOZ_OVERRIDE; StreamTime aDesiredTime) MOZ_OVERRIDE;
virtual bool IsFake() { virtual bool IsFake() MOZ_OVERRIDE {
return false; return false;
} }
virtual const MediaSourceType GetMediaSource() { virtual const MediaSourceType GetMediaSource() MOZ_OVERRIDE {
return MediaSourceType::Microphone; return MediaSourceType::Microphone;
} }
virtual nsresult TakePhoto(PhotoCallback* aCallback) virtual nsresult TakePhoto(PhotoCallback* aCallback) MOZ_OVERRIDE
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -197,7 +197,7 @@ public:
// VoEMediaProcess. // VoEMediaProcess.
void Process(int channel, webrtc::ProcessingTypes type, void Process(int channel, webrtc::ProcessingTypes type,
int16_t audio10ms[], int length, int16_t audio10ms[], int length,
int samplingFreq, bool isStereo); int samplingFreq, bool isStereo) MOZ_OVERRIDE;
NS_DECL_THREADSAFE_ISUPPORTS NS_DECL_THREADSAFE_ISUPPORTS