Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1130923 - Remove some DASHDecoder remnants: RestrictedAccessMonitor and GetByteRangeForSeek. r=cpearce

Browse Source
This commit is contained in:
Matthew Gregan 2015-02-10 11:59:20 +13:00
parent ace9185d6f
commit 1fa4d0508d
2 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/MediaDecoder.cpp
View File

@ -1551,7 +1551,7 @@ bool MediaDecoder::OnDecodeThread() const {
}
ReentrantMonitor& MediaDecoder::GetReentrantMonitor() {
return mReentrantMonitor.GetReentrantMonitor();
return mReentrantMonitor;
}
ImageContainer* MediaDecoder::GetImageContainer()

43
dom/media/MediaDecoder.h
View File

@ -346,14 +346,6 @@ public:
// the seek target.
virtual nsresult Seek(double aTime, SeekTarget::Type aSeekType);
// Enables decoders to supply an enclosing byte range for a seek offset.
// E.g. used by ChannelMediaResource to download a whole cluster for
// DASH-WebM.
virtual nsresult GetByteRangeForSeek(int64_t const aOffset,
MediaByteRange &aByteRange) {
return NS_ERROR_NOT_AVAILABLE;
}
// Initialize state machine and schedule it.
nsresult InitializeStateMachine(MediaDecoder* aCloneDonor);
@ -1082,40 +1074,11 @@ protected:
// Media data resource.
nsRefPtr<MediaResource> mResource;
private:
// |ReentrantMonitor| for detecting when the video play state changes. A call
// to |Wait| on this monitor will block the thread until the next state
// change.
// Using a wrapper class to restrict direct access to the |ReentrantMonitor|
// object. Subclasses may override |MediaDecoder|::|GetReentrantMonitor|
// e.g. |DASHRepDecoder|::|GetReentrantMonitor| returns the monitor in the
// main |DASHDecoder| object. In this case, directly accessing the
// member variable mReentrantMonitor in |DASHRepDecoder| is wrong.
// The wrapper |RestrictedAccessMonitor| restricts use to the getter
// function rather than the object itself.
private:
class RestrictedAccessMonitor
{
public:
explicit RestrictedAccessMonitor(const char* aName) :
mReentrantMonitor(aName)
{
MOZ_COUNT_CTOR(RestrictedAccessMonitor);
}
~RestrictedAccessMonitor()
{
MOZ_COUNT_DTOR(RestrictedAccessMonitor);
}
// Returns a ref to the reentrant monitor
ReentrantMonitor& GetReentrantMonitor() {
return mReentrantMonitor;
}
private:
ReentrantMonitor mReentrantMonitor;
};
// The |RestrictedAccessMonitor| member object.
RestrictedAccessMonitor mReentrantMonitor;
// change. Explicitly private for force access via GetReentrantMonitor.
ReentrantMonitor mReentrantMonitor;
#ifdef MOZ_EME
nsRefPtr<CDMProxy> mProxy;