corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1300529 - Remove default arguments from HTMLMediaElement::CaptureStreamInternal. r=padenot

Browse Source 
MozReview-Commit-ID: IL7odCBP74
This commit is contained in:
Andreas Pehrson
2016-09-07 15:14:15 +02:00
parent 400162d0c8
commit f20ab4d087
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dom/html/HTMLMediaElement.cpp
View File

@@ -2544,6 +2544,8 @@ HTMLMediaElement::CaptureStreamInternal(bool aFinishWhenEnded,
bool aCaptureAudio,
MediaStreamGraph* aGraph)
{
MOZ_RELEASE_ASSERT(aGraph);
nsPIDOMWindowInner* window = OwnerDoc()->GetInnerWindow();
if (!window) {
return nullptr;
@@ -2554,13 +2556,6 @@ HTMLMediaElement::CaptureStreamInternal(bool aFinishWhenEnded,
}
#endif
if (!aGraph) {
MediaStreamGraph::GraphDriverType graphDriverType =
HasAudio() ? MediaStreamGraph::AUDIO_THREAD_DRIVER
: MediaStreamGraph::SYSTEM_THREAD_DRIVER;
aGraph = MediaStreamGraph::GetInstance(graphDriverType, mAudioChannel);
}
if (!mOutputStreams.IsEmpty() &&
aGraph != mOutputStreams[0].mStream->GetInputStream()->Graph()) {
return nullptr;
@@ -2655,7 +2650,10 @@ already_AddRefed<DOMMediaStream>
HTMLMediaElement::CaptureAudio(ErrorResult& aRv,
MediaStreamGraph* aGraph)
{
RefPtr<DOMMediaStream> stream = CaptureStreamInternal(false, aGraph);
MOZ_RELEASE_ASSERT(aGraph);
RefPtr<DOMMediaStream> stream =
CaptureStreamInternal(false, true, aGraph);
if (!stream) {
aRv.Throw(NS_ERROR_FAILURE);
return nullptr;
@@ -2665,10 +2663,16 @@ HTMLMediaElement::CaptureAudio(ErrorResult& aRv,
}
already_AddRefed<DOMMediaStream>
HTMLMediaElement::MozCaptureStream(ErrorResult& aRv,
MediaStreamGraph* aGraph)
HTMLMediaElement::MozCaptureStream(ErrorResult& aRv)
{
RefPtr<DOMMediaStream> stream = CaptureStreamInternal(false, aGraph);
MediaStreamGraph::GraphDriverType graphDriverType =
HasAudio() ? MediaStreamGraph::AUDIO_THREAD_DRIVER
: MediaStreamGraph::SYSTEM_THREAD_DRIVER;
MediaStreamGraph* graph =
MediaStreamGraph::GetInstance(graphDriverType, mAudioChannel);
RefPtr<DOMMediaStream> stream =
CaptureStreamInternal(false, false, graph);
if (!stream) {
aRv.Throw(NS_ERROR_FAILURE);
return nullptr;
@@ -2678,10 +2682,16 @@ HTMLMediaElement::MozCaptureStream(ErrorResult& aRv,
}
already_AddRefed<DOMMediaStream>
HTMLMediaElement::MozCaptureStreamUntilEnded(ErrorResult& aRv,
MediaStreamGraph* aGraph)
HTMLMediaElement::MozCaptureStreamUntilEnded(ErrorResult& aRv)
{
RefPtr<DOMMediaStream> stream = CaptureStreamInternal(true, aGraph);
MediaStreamGraph::GraphDriverType graphDriverType =
HasAudio() ? MediaStreamGraph::AUDIO_THREAD_DRIVER
: MediaStreamGraph::SYSTEM_THREAD_DRIVER;
MediaStreamGraph* graph =
MediaStreamGraph::GetInstance(graphDriverType, mAudioChannel);
RefPtr<DOMMediaStream> stream =
CaptureStreamInternal(true, false, graph);
if (!stream) {
aRv.Throw(NS_ERROR_FAILURE);
return nullptr;
@@ -6574,7 +6584,8 @@ HTMLMediaElement::AudioCaptureStreamChangeIfNeeded()
if (GetSrcMediaStream()) {
mCaptureStreamPort = msg->ConnectToCaptureStream(id, GetSrcMediaStream());
} else {
RefPtr<DOMMediaStream> stream = CaptureStreamInternal(false, msg);
RefPtr<DOMMediaStream> stream =
CaptureStreamInternal(false, false, msg);
mCaptureStreamPort = msg->ConnectToCaptureStream(id, stream->GetPlaybackStream());
}
} else if (!mAudioCapturedByWindow && mCaptureStreamPort) {