Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 19:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1208373 - Implement MediaStreamTrack.readyState. r=jib,smaug

Browse Source 
MozReview-Commit-ID: EoMaG0R3Dpp

--HG--
extra : rebase_source : e329085837c597610d32823c6c5b6efad23f27a1
extra : source : eb945c96027405effd2138a069eabd68f192f15c
This commit is contained in:
Andreas Pehrson 2016-05-10 17:03:37 +02:00
parent df1fe74fee
commit 11e0c929f7
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/media/DOMMediaStream.cpp
View File

@ -1035,6 +1035,15 @@ DOMMediaStream::CloneDOMTrack(MediaStreamTrack& aTrack,
NotifyTrackAdded(newTrack);
newTrack->SetEnabled(aTrack.Enabled());
newTrack->SetReadyState(aTrack.ReadyState());
if (aTrack.Ended()) {
// For extra suspenders, make sure that we don't forward data by mistake
// to the clone when the original has already ended.
RefPtr<Pledge<bool, nsresult>> blockingPledge =
inputPort->BlockSourceTrackId(inputTrackID);
Unused << blockingPledge;
}
return newTrack.forget();
}

16
dom/media/MediaStreamTrack.cpp
View File

@ -115,7 +115,8 @@ MediaStreamTrack::MediaStreamTrack(DOMMediaStream* aStream, TrackID aTrackID,
: mOwningStream(aStream), mTrackID(aTrackID),
mInputTrackID(aInputTrackID), mSource(aSource),
mPrincipal(aSource->GetPrincipal()),
mEnded(false), mEnabled(true), mRemote(aSource->IsRemote()), mStopped(false)
mReadyState(MediaStreamTrackState::Live),
mEnabled(true), mRemote(aSource->IsRemote())
{
if (!gMediaStreamTrackLog) {
@ -216,8 +217,8 @@ MediaStreamTrack::Stop()
{
LOG(LogLevel::Info, ("MediaStreamTrack %p Stop()", this));
if (mStopped) {
LOG(LogLevel::Warning, ("MediaStreamTrack %p Already stopped", this));
if (Ended()) {
LOG(LogLevel::Warning, ("MediaStreamTrack %p Already ended", this));
return;
}
@ -239,7 +240,7 @@ MediaStreamTrack::Stop()
RefPtr<Pledge<bool>> p = port->BlockSourceTrackId(mInputTrackID);
Unused << p;
mStopped = true;
mReadyState = MediaStreamTrackState::Ended;
}
already_AddRefed<Promise>
@ -354,15 +355,16 @@ void
MediaStreamTrack::NotifyEndedImpl()
{
MOZ_ASSERT(NS_IsMainThread());
if (mEnded) {
if (Ended()) {
return;
}
LOG(LogLevel::Info, ("MediaStreamTrack %p ended", this));
DispatchTrustedEvent(NS_LITERAL_STRING("ended"));
mReadyState = MediaStreamTrackState::Ended;
mEnded = true;
DispatchTrustedEvent(NS_LITERAL_STRING("ended"));
}
void

15
dom/media/MediaStreamTrack.h
View File

@ -264,10 +264,20 @@ public:
already_AddRefed<Promise>
ApplyConstraints(const dom::MediaTrackConstraints& aConstraints, ErrorResult &aRv);
already_AddRefed<MediaStreamTrack> Clone();
MediaStreamTrackState ReadyState() { return mReadyState; }
IMPL_EVENT_HANDLER(ended)
bool Ended() const { return mEnded; }
/**
* Convenience (and legacy) method for when ready state is "ended".
*/
bool Ended() const { return mReadyState == MediaStreamTrackState::Ended; }
/**
* Forces the ready state to a particular value, for instance when we're
* cloning an already ended track.
*/
void SetReadyState(MediaStreamTrackState aState) { mReadyState = aState; }
private:
/**
@ -408,10 +418,9 @@ protected:
nsCOMPtr<nsIPrincipal> mPendingPrincipal;
RefPtr<PrincipalHandleListener> mPrincipalHandleListener;
nsString mID;
bool mEnded;
MediaStreamTrackState mReadyState;
bool mEnabled;
const bool mRemote;
bool mStopped;
};
} // namespace dom

7
dom/webidl/MediaStreamTrack.webidl
View File

@ -63,6 +63,11 @@ dictionary MediaTrackConstraints : MediaTrackConstraintSet {
sequence<MediaTrackConstraintSet> advanced;
};
enum MediaStreamTrackState {
"live",
"ended"
};
[Exposed=Window]
interface MediaStreamTrack : EventTarget {
readonly attribute DOMString kind;
@ -74,7 +79,7 @@ interface MediaStreamTrack : EventTarget {
// attribute EventHandler onunmute;
// readonly attribute boolean _readonly;
// readonly attribute boolean remote;
// readonly attribute MediaStreamTrackState readyState;
readonly attribute MediaStreamTrackState readyState;
attribute EventHandler onended;
MediaStreamTrack clone ();
void stop ();