mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 779715. Part 5: Rename identifiers related to media element 'src' MediaStreams to be more specifically about 'src'. r=cpearce 

--HG--
extra : rebase_source : c93f9bf3825ba933ef5a797a516a9ee1f4927e17
This commit is contained in:
Robert O'Callahan 2012-08-20 16:52:59 +12:00
Родитель e2bfc32abd
Коммит 4f3b9a0ca4
2 изменённых файлов: 67 добавлений и 67 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
content/html/content/public/nsHTMLMediaElement.h
Просмотреть файл

@ -373,10 +373,10 @@ public:
*/
void FireTimeUpdate(bool aPeriodic);
MediaStream* GetMediaStream()
MediaStream* GetSrcMediaStream()
{
NS_ASSERTION(mStream, "Don't call this when not playing a stream");
return mStream->GetStream();
NS_ASSERTION(mSrcStream, "Don't call this when not playing a stream");
return mSrcStream->GetStream();
}
protected:
@ -403,11 +403,11 @@ protected:
/**
* Initialize the media element for playback of mSrcAttrStream
*/
void SetupMediaStreamPlayback();
void SetupSrcMediaStreamPlayback();
/**
* Stop playback on mStream.
* Stop playback on mSrcStream.
*/
void EndMediaStreamPlayback();
void EndSrcMediaStreamPlayback();
/**
* Returns an nsDOMMediaStream containing the played contents of this
@ -623,7 +623,7 @@ protected:
void ProcessMediaFragmentURI();
// The current decoder. Load() has been called on this decoder.
// At most one of mDecoder and mStream can be non-null.
// At most one of mDecoder and mSrcStream can be non-null.
nsRefPtr<nsMediaDecoder> mDecoder;
// A reference to the VideoFrameContainer which contains the current frame
@ -636,8 +636,8 @@ protected:
// Holds a reference to the DOM wrapper for the MediaStream that we're
// actually playing.
// At most one of mDecoder and mStream can be non-null.
nsRefPtr<nsDOMMediaStream> mStream;
// At most one of mDecoder and mSrcStream can be non-null.
nsRefPtr<nsDOMMediaStream> mSrcStream;
// Holds references to the DOM wrappers for the MediaStreams that we're
// writing to.
@ -647,8 +647,8 @@ protected:
};
nsTArray<OutputMediaStream> mOutputStreams;
// Holds a reference to the MediaStreamListener attached to mStream. STRONG!
StreamListener* mStreamListener;
// Holds a reference to the MediaStreamListener attached to mSrcStream. STRONG!
StreamListener* mSrcStreamListener;
// Holds a reference to the first channel we open to the media resource.
// Once the decoder is created, control over the channel passes to the

112
content/html/content/src/nsHTMLMediaElement.cpp
Просмотреть файл

@ -394,7 +394,7 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLMediaElement, nsGenericHTMLElement)
NS_IMPL_CYCLE_COLLECTION_CLASS(nsHTMLMediaElement)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericHTMLElement)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mStream)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSrcStream)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSrcAttrStream)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSourcePointer)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mLoadBlockedDoc)
@ -405,10 +405,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericH
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLMediaElement, nsGenericHTMLElement)
if (tmp->mStream) {
if (tmp->mSrcStream) {
// Need to EndMediaStreamPlayback to clear mStream and make sure everything
// gets unhooked correctly.
tmp->EndMediaStreamPlayback();
tmp->EndSrcMediaStreamPlayback();
}
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSrcAttrStream)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSourcePointer)
@ -493,8 +493,8 @@ NS_IMETHODIMP nsHTMLMediaElement::GetError(nsIDOMMediaError * *aError)
/* readonly attribute boolean ended; */
NS_IMETHODIMP nsHTMLMediaElement::GetEnded(bool *aEnded)
{
if (mStream) {
*aEnded = GetMediaStream()->IsFinished();
if (mSrcStream) {
*aEnded = GetSrcMediaStream()->IsFinished();
} else if (mDecoder) {
*aEnded = mDecoder->IsEnded();
}
@ -576,8 +576,8 @@ void nsHTMLMediaElement::AbortExistingLoads()
fireTimeUpdate = mDecoder->GetCurrentTime() != 0.0;
ShutdownDecoder();
}
if (mStream) {
EndMediaStreamPlayback();
if (mSrcStream) {
EndSrcMediaStreamPlayback();
}
mLoadingSrc = nullptr;
@ -604,7 +604,7 @@ void nsHTMLMediaElement::AbortExistingLoads()
if (mNetworkState != nsIDOMHTMLMediaElement::NETWORK_EMPTY) {
mNetworkState = nsIDOMHTMLMediaElement::NETWORK_EMPTY;
NS_ASSERTION(!mDecoder && !mStream, "How did someone setup a new stream/decoder already?");
NS_ASSERTION(!mDecoder && !mSrcStream, "How did someone setup a new stream/decoder already?");
ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING);
mPaused = true;
@ -753,7 +753,7 @@ void nsHTMLMediaElement::SelectResource()
// If we have a 'src' attribute, use that exclusively.
nsAutoString src;
if (mSrcAttrStream) {
SetupMediaStreamPlayback();
SetupSrcMediaStreamPlayback();
} else if (GetAttr(kNameSpaceID_None, nsGkAtoms::src, src)) {
nsCOMPtr<nsIURI> uri;
nsresult rv = NewURIFromString(src, getter_AddRefs(uri));
@ -1214,8 +1214,8 @@ NS_IMETHODIMP nsHTMLMediaElement::GetSeeking(bool *aSeeking)
/* attribute double currentTime; */
NS_IMETHODIMP nsHTMLMediaElement::GetCurrentTime(double *aCurrentTime)
{
if (mStream) {
*aCurrentTime = MediaTimeToSeconds(GetMediaStream()->GetCurrentTime());
if (mSrcStream) {
*aCurrentTime = MediaTimeToSeconds(GetSrcMediaStream()->GetCurrentTime());
} else if (mDecoder) {
*aCurrentTime = mDecoder->GetCurrentTime();
} else {
@ -1228,7 +1228,7 @@ NS_IMETHODIMP nsHTMLMediaElement::SetCurrentTime(double aCurrentTime)
{
StopSuspendingAfterFirstFrame();
if (mStream) {
if (mSrcStream) {
// do nothing since streams aren't seekable; we effectively clamp to
// the current time.
return NS_ERROR_DOM_INVALID_STATE_ERR;
@ -1284,7 +1284,7 @@ NS_IMETHODIMP nsHTMLMediaElement::SetCurrentTime(double aCurrentTime)
/* readonly attribute double duration; */
NS_IMETHODIMP nsHTMLMediaElement::GetDuration(double *aDuration)
{
if (mStream) {
if (mSrcStream) {
*aDuration = std::numeric_limits<double>::infinity();
} else if (mDecoder) {
*aDuration = mDecoder->GetDuration();
@ -1361,8 +1361,8 @@ NS_IMETHODIMP nsHTMLMediaElement::Pause()
AddRemoveSelfReference();
if (!oldPaused) {
if (mStream) {
GetMediaStream()->ChangeExplicitBlockerCount(1);
if (mSrcStream) {
GetSrcMediaStream()->ChangeExplicitBlockerCount(1);
}
FireTimeUpdate(false);
DispatchAsyncEvent(NS_LITERAL_STRING("pause"));
@ -1394,8 +1394,8 @@ NS_IMETHODIMP nsHTMLMediaElement::SetVolume(double aVolume)
mDecoder->SetVolume(mVolume);
} else if (mAudioStream) {
mAudioStream->SetVolume(mVolume);
} else if (mStream) {
GetMediaStream()->SetAudioOutputVolume(this, float(mVolume));
} else if (mSrcStream) {
GetSrcMediaStream()->SetAudioOutputVolume(this, float(mVolume));
}
}
@ -1511,8 +1511,8 @@ NS_IMETHODIMP nsHTMLMediaElement::SetMuted(bool aMuted)
mDecoder->SetVolume(effectiveVolume);
} else if (mAudioStream) {
mAudioStream->SetVolume(effectiveVolume);
} else if (mStream) {
GetMediaStream()->SetAudioOutputVolume(this, effectiveVolume);
} else if (mSrcStream) {
GetSrcMediaStream()->SetAudioOutputVolume(this, effectiveVolume);
}
DispatchAsyncEvent(NS_LITERAL_STRING("volumechange"));
@ -1663,7 +1663,7 @@ nsHTMLMediaElement::LookupMediaElementURITable(nsIURI* aURI)
nsHTMLMediaElement::nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: nsGenericHTMLElement(aNodeInfo),
mStreamListener(nullptr),
mSrcStreamListener(nullptr),
mCurrentLoadID(0),
mNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY),
mReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING),
@ -1729,8 +1729,8 @@ nsHTMLMediaElement::~nsHTMLMediaElement()
if (mDecoder) {
ShutdownDecoder();
}
if (mStream) {
EndMediaStreamPlayback();
if (mSrcStream) {
EndSrcMediaStreamPlayback();
}
NS_ASSERTION(MediaElementTableCount(this, mLoadingSrc) == 0,
@ -1805,8 +1805,8 @@ NS_IMETHODIMP nsHTMLMediaElement::Play()
// seek to the effective start.
// TODO: The playback rate must be set to the default playback rate.
if (mPaused) {
if (mStream) {
GetMediaStream()->ChangeExplicitBlockerCount(-1);
if (mSrcStream) {
GetSrcMediaStream()->ChangeExplicitBlockerCount(-1);
}
DispatchAsyncEvent(NS_LITERAL_STRING("play"));
switch (mReadyState) {
@ -2595,28 +2595,28 @@ private:
bool mPendingNotifyOutput;
};
void nsHTMLMediaElement::SetupMediaStreamPlayback()
void nsHTMLMediaElement::SetupSrcMediaStreamPlayback()
{
NS_ASSERTION(!mStream && !mStreamListener, "Should have been ended already");
NS_ASSERTION(!mSrcStream && !mSrcStreamListener, "Should have been ended already");
mStream = mSrcAttrStream;
mSrcStream = mSrcAttrStream;
// XXX if we ever support capturing the output of a media element which is
// playing a stream, we'll need to add a CombineWithPrincipal call here.
mStreamListener = new StreamListener(this);
NS_ADDREF(mStreamListener);
GetMediaStream()->AddListener(mStreamListener);
mSrcStreamListener = new StreamListener(this);
NS_ADDREF(mSrcStreamListener);
GetSrcMediaStream()->AddListener(mSrcStreamListener);
if (mPaused) {
GetMediaStream()->ChangeExplicitBlockerCount(1);
GetSrcMediaStream()->ChangeExplicitBlockerCount(1);
}
if (mPausedForInactiveDocument) {
GetMediaStream()->ChangeExplicitBlockerCount(1);
GetSrcMediaStream()->ChangeExplicitBlockerCount(1);
}
ChangeDelayLoadStatus(false);
GetMediaStream()->AddAudioOutput(this);
GetMediaStream()->SetAudioOutputVolume(this, float(mMuted ? 0.0 : mVolume));
GetSrcMediaStream()->AddAudioOutput(this);
GetSrcMediaStream()->SetAudioOutputVolume(this, float(mMuted ? 0.0 : mVolume));
VideoFrameContainer* container = GetVideoFrameContainer();
if (container) {
GetMediaStream()->AddVideoOutput(container);
GetSrcMediaStream()->AddVideoOutput(container);
}
ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
@ -2624,25 +2624,25 @@ void nsHTMLMediaElement::SetupMediaStreamPlayback()
ResourceLoaded();
}
void nsHTMLMediaElement::EndMediaStreamPlayback()
void nsHTMLMediaElement::EndSrcMediaStreamPlayback()
{
GetMediaStream()->RemoveListener(mStreamListener);
GetSrcMediaStream()->RemoveListener(mSrcStreamListener);
// Kill its reference to this element
mStreamListener->Forget();
NS_RELEASE(mStreamListener); // sets to null
GetMediaStream()->RemoveAudioOutput(this);
mSrcStreamListener->Forget();
NS_RELEASE(mSrcStreamListener); // sets to null
GetSrcMediaStream()->RemoveAudioOutput(this);
VideoFrameContainer* container = GetVideoFrameContainer();
if (container) {
GetMediaStream()->RemoveVideoOutput(container);
GetSrcMediaStream()->RemoveVideoOutput(container);
container->GetImageContainer()->SetCurrentImage(nullptr);
}
if (mPaused) {
GetMediaStream()->ChangeExplicitBlockerCount(-1);
GetSrcMediaStream()->ChangeExplicitBlockerCount(-1);
}
if (mPausedForInactiveDocument) {
GetMediaStream()->ChangeExplicitBlockerCount(-1);
GetSrcMediaStream()->ChangeExplicitBlockerCount(-1);
}
mStream = nullptr;
mSrcStream = nullptr;
}
nsresult nsHTMLMediaElement::NewURIFromString(const nsAutoString& aURISpec, nsIURI** aURI)
@ -2759,7 +2759,7 @@ void nsHTMLMediaElement::ResourceLoaded()
// MediaStream sources are put into HAVE_CURRENT_DATA state here on setup. If the
// stream is not blocked, we will receive a notification that will put it
// into HAVE_ENOUGH_DATA state.
ChangeReadyState(mStream ? nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA
ChangeReadyState(mSrcStream ? nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA
: nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA);
}
// Ensure a progress event is dispatched at the end of download.
@ -2828,7 +2828,7 @@ void nsHTMLMediaElement::PlaybackEnded()
NS_ASSERTION(!mDecoder || mDecoder->IsEnded(),
"Decoder fired ended, but not in ended state");
if (mStream || (mDecoder && mDecoder->IsInfinite())) {
if (mSrcStream || (mDecoder && mDecoder->IsInfinite())) {
LOG(PR_LOG_DEBUG, ("%p, got duration by reaching the end of the resource", this));
DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
}
@ -2930,7 +2930,7 @@ void nsHTMLMediaElement::UpdateReadyStateForData(NextFrameStatus aNextFrame)
return;
}
if (mStream) {
if (mSrcStream) {
ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA);
return;
}
@ -3037,9 +3037,9 @@ void nsHTMLMediaElement::NotifyAutoplayDataReady()
GetCurrentTime(&mCurrentPlayRangeStart);
}
mDecoder->Play();
} else if (mStream) {
} else if (mSrcStream) {
SetPlayedOrSeeked(true);
GetMediaStream()->ChangeExplicitBlockerCount(-1);
GetSrcMediaStream()->ChangeExplicitBlockerCount(-1);
}
DispatchAsyncEvent(NS_LITERAL_STRING("play"));
}
@ -3164,8 +3164,8 @@ already_AddRefed<nsIPrincipal> nsHTMLMediaElement::GetCurrentPrincipal()
if (mDecoder) {
return mDecoder->GetCurrentPrincipal();
}
if (mStream) {
nsRefPtr<nsIPrincipal> principal = mStream->GetPrincipal();
if (mSrcStream) {
nsRefPtr<nsIPrincipal> principal = mSrcStream->GetPrincipal();
return principal.forget();
}
return nullptr;
@ -3197,8 +3197,8 @@ void nsHTMLMediaElement::NotifyOwnerDocumentActivityChanged()
if (mDecoder) {
mDecoder->Pause();
mDecoder->Suspend();
} else if (mStream) {
GetMediaStream()->ChangeExplicitBlockerCount(1);
} else if (mSrcStream) {
GetSrcMediaStream()->ChangeExplicitBlockerCount(1);
}
} else {
if (mDecoder) {
@ -3206,8 +3206,8 @@ void nsHTMLMediaElement::NotifyOwnerDocumentActivityChanged()
if (!mPaused && !mDecoder->IsEnded()) {
mDecoder->Play();
}
} else if (mStream) {
GetMediaStream()->ChangeExplicitBlockerCount(-1);
} else if (mSrcStream) {
GetSrcMediaStream()->ChangeExplicitBlockerCount(-1);
}
DispatchPendingMediaEvents();
}
@ -3231,7 +3231,7 @@ void nsHTMLMediaElement::AddRemoveSelfReference()
ownerDoc->IsActive() &&
(mDelayingLoadEvent ||
(!mPaused && mDecoder && !mDecoder->IsEnded()) ||
(!mPaused && mStream && !mStream->IsFinished()) ||
(!mPaused && mSrcStream && !mSrcStream->IsFinished()) ||
(mDecoder && mDecoder->IsSeeking()) ||
CanActivateAutoplay() ||
mNetworkState == nsIDOMHTMLMediaElement::NETWORK_LOADING);