зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1208371 - Rename CreateOwnDOMTrack/CreateClonedDOMTrack to CreateDOMTrack/CloneDOMTrack. r=jib
MozReview-Commit-ID: DOGiwcYycJY --HG-- extra : rebase_source : 197fc7a7c5d36200f987c38f26ab77ec8ea2d290
This commit is contained in:
Родитель
fd9e58b430
Коммит
a47ce20618
|
@ -681,8 +681,8 @@ HTMLCanvasElement::CaptureStream(const Optional<double>& aFrameRate,
|
|||
}
|
||||
|
||||
nsCOMPtr<nsIPrincipal> principal = NodePrincipal();
|
||||
stream->CreateOwnDOMTrack(videoTrackId, MediaSegment::VIDEO, nsString(),
|
||||
new BasicUnstoppableTrackSource(principal));
|
||||
stream->CreateDOMTrack(videoTrackId, MediaSegment::VIDEO, nsString(),
|
||||
new BasicUnstoppableTrackSource(principal));
|
||||
|
||||
rv = RegisterFrameCaptureListener(stream->FrameCaptureListener());
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
|
@ -2013,15 +2013,15 @@ HTMLMediaElement::CaptureStreamInternal(bool aFinishWhenEnded,
|
|||
TrackID audioTrackId = mMediaInfo.mAudio.mTrackId;
|
||||
RefPtr<MediaStreamTrackSource> trackSource =
|
||||
getter->GetMediaStreamTrackSource(audioTrackId);
|
||||
out->mStream->CreateOwnDOMTrack(audioTrackId, MediaSegment::AUDIO,
|
||||
nsString(), trackSource);
|
||||
out->mStream->CreateDOMTrack(audioTrackId, MediaSegment::AUDIO,
|
||||
nsString(), trackSource);
|
||||
}
|
||||
if (HasVideo()) {
|
||||
TrackID videoTrackId = mMediaInfo.mVideo.mTrackId;
|
||||
RefPtr<MediaStreamTrackSource> trackSource =
|
||||
getter->GetMediaStreamTrackSource(videoTrackId);
|
||||
out->mStream->CreateOwnDOMTrack(videoTrackId, MediaSegment::VIDEO,
|
||||
nsString(), trackSource);
|
||||
out->mStream->CreateDOMTrack(videoTrackId, MediaSegment::VIDEO,
|
||||
nsString(), trackSource);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -151,7 +151,7 @@ public:
|
|||
nsIPrincipal* principal = doc ? doc->NodePrincipal() : nullptr;
|
||||
source = new BasicUnstoppableTrackSource(principal);
|
||||
}
|
||||
track = mStream->CreateOwnDOMTrack(aTrackID, aType, nsString(), source);
|
||||
track = mStream->CreateDOMTrack(aTrackID, aType, nsString(), source);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -667,7 +667,7 @@ DOMMediaStream::CloneInternal(TrackForwardingOption aForwarding)
|
|||
LOG(LogLevel::Debug, ("DOMMediaStream %p forwarding external track %p to clone %p",
|
||||
this, &track, newStream.get()));
|
||||
RefPtr<MediaStreamTrack> trackClone =
|
||||
newStream->CreateClonedDOMTrack(track, allocatedTrackID++);
|
||||
newStream->CloneDOMTrack(track, allocatedTrackID++);
|
||||
}
|
||||
|
||||
if (aForwarding == TrackForwardingOption::ALL) {
|
||||
|
@ -787,7 +787,7 @@ DOMMediaStream::InitAudioCaptureStream(nsIPrincipal* aPrincipal, MediaStreamGrap
|
|||
InitInputStreamCommon(audioCaptureStream, aGraph);
|
||||
InitOwnedStreamCommon(aGraph);
|
||||
InitPlaybackStreamCommon(aGraph);
|
||||
CreateOwnDOMTrack(AUDIO_TRACK, MediaSegment::AUDIO, nsString(), audioCaptureSource);
|
||||
CreateDOMTrack(AUDIO_TRACK, MediaSegment::AUDIO, nsString(), audioCaptureSource);
|
||||
audioCaptureStream->Start();
|
||||
}
|
||||
|
||||
|
@ -943,9 +943,9 @@ DOMMediaStream::RemovePrincipalChangeObserver(
|
|||
}
|
||||
|
||||
MediaStreamTrack*
|
||||
DOMMediaStream::CreateOwnDOMTrack(TrackID aTrackID, MediaSegment::Type aType,
|
||||
const nsString& aLabel,
|
||||
MediaStreamTrackSource* aSource)
|
||||
DOMMediaStream::CreateDOMTrack(TrackID aTrackID, MediaSegment::Type aType,
|
||||
const nsString& aLabel,
|
||||
MediaStreamTrackSource* aSource)
|
||||
{
|
||||
MOZ_RELEASE_ASSERT(mInputStream);
|
||||
MOZ_RELEASE_ASSERT(mOwnedStream);
|
||||
|
@ -977,8 +977,8 @@ DOMMediaStream::CreateOwnDOMTrack(TrackID aTrackID, MediaSegment::Type aType,
|
|||
}
|
||||
|
||||
already_AddRefed<MediaStreamTrack>
|
||||
DOMMediaStream::CreateClonedDOMTrack(MediaStreamTrack& aTrack,
|
||||
TrackID aCloneTrackID)
|
||||
DOMMediaStream::CloneDOMTrack(MediaStreamTrack& aTrack,
|
||||
TrackID aCloneTrackID)
|
||||
{
|
||||
MOZ_RELEASE_ASSERT(mOwnedStream);
|
||||
MOZ_RELEASE_ASSERT(mPlaybackStream);
|
||||
|
|
|
@ -530,17 +530,17 @@ public:
|
|||
*
|
||||
* Creates a MediaStreamTrack, adds it to mTracks and returns it.
|
||||
*/
|
||||
MediaStreamTrack* CreateOwnDOMTrack(TrackID aTrackID, MediaSegment::Type aType,
|
||||
const nsString& aLabel,
|
||||
MediaStreamTrackSource* aSource);
|
||||
MediaStreamTrack* CreateDOMTrack(TrackID aTrackID, MediaSegment::Type aType,
|
||||
const nsString& aLabel,
|
||||
MediaStreamTrackSource* aSource);
|
||||
|
||||
/**
|
||||
* Creates a MediaStreamTrack cloned from aTrack, adds it to mTracks and
|
||||
* returns it.
|
||||
* aCloneTrackID is the TrackID the new track will get in mOwnedStream.
|
||||
*/
|
||||
already_AddRefed<MediaStreamTrack> CreateClonedDOMTrack(MediaStreamTrack& aTrack,
|
||||
TrackID aCloneTrackID);
|
||||
already_AddRefed<MediaStreamTrack> CloneDOMTrack(MediaStreamTrack& aTrack,
|
||||
TrackID aCloneTrackID);
|
||||
|
||||
// When the initial set of tracks has been added, run
|
||||
// aCallback->NotifyTracksAvailable.
|
||||
|
|
|
@ -880,8 +880,8 @@ public:
|
|||
mAudioDevice->GetSource()->GetMediaSource();
|
||||
RefPtr<MediaStreamTrackSource> audioSource =
|
||||
new LocalTrackSource(principal, mListener, source, kAudioTrack);
|
||||
domStream->CreateOwnDOMTrack(kAudioTrack, MediaSegment::AUDIO,
|
||||
audioDeviceName, audioSource);
|
||||
domStream->CreateDOMTrack(kAudioTrack, MediaSegment::AUDIO,
|
||||
audioDeviceName, audioSource);
|
||||
}
|
||||
if (mVideoDevice) {
|
||||
nsString videoDeviceName;
|
||||
|
@ -890,8 +890,8 @@ public:
|
|||
mVideoDevice->GetSource()->GetMediaSource();
|
||||
RefPtr<MediaStreamTrackSource> videoSource =
|
||||
new LocalTrackSource(principal, mListener, source, kVideoTrack);
|
||||
domStream->CreateOwnDOMTrack(kVideoTrack, MediaSegment::VIDEO,
|
||||
videoDeviceName, videoSource);
|
||||
domStream->CreateDOMTrack(kVideoTrack, MediaSegment::VIDEO,
|
||||
videoDeviceName, videoSource);
|
||||
}
|
||||
stream = domStream->GetInputStream()->AsSourceStream();
|
||||
}
|
||||
|
|
|
@ -213,7 +213,7 @@ MediaStreamTrack::Clone()
|
|||
newStream->InitOwnedStreamCommon(graph);
|
||||
newStream->InitPlaybackStreamCommon(graph);
|
||||
|
||||
return newStream->CreateClonedDOMTrack(*this, mTrackID);
|
||||
return newStream->CloneDOMTrack(*this, mTrackID);
|
||||
}
|
||||
|
||||
DOMMediaStream*
|
||||
|
|
|
@ -39,8 +39,8 @@ MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* a
|
|||
RefPtr<MediaStreamTrackSource> source =
|
||||
new BasicUnstoppableTrackSource(doc->NodePrincipal(),
|
||||
MediaSourceEnum::AudioCapture);
|
||||
mDOMStream->CreateOwnDOMTrack(AudioNodeStream::AUDIO_TRACK,
|
||||
MediaSegment::AUDIO, nsString(), source);
|
||||
mDOMStream->CreateDOMTrack(AudioNodeStream::AUDIO_TRACK,
|
||||
MediaSegment::AUDIO, nsString(), source);
|
||||
|
||||
ProcessedMediaStream* outputStream = mDOMStream->GetInputStream()->AsProcessedStream();
|
||||
MOZ_ASSERT(!!outputStream);
|
||||
|
|
|
@ -1815,15 +1815,15 @@ PeerConnectionImpl::CreateNewRemoteTracks(RefPtr<PeerConnectionObserver>& aPco)
|
|||
"Did someone add a track from elsewhere?");
|
||||
TrackID trackID = info->GetNumericTrackId(track->GetTrackId());
|
||||
if (track->GetMediaType() == SdpMediaSection::kAudio) {
|
||||
info->GetMediaStream()->CreateOwnDOMTrack(trackID,
|
||||
MediaSegment::AUDIO,
|
||||
nsString(),
|
||||
source);
|
||||
info->GetMediaStream()->CreateDOMTrack(trackID,
|
||||
MediaSegment::AUDIO,
|
||||
nsString(),
|
||||
source);
|
||||
} else {
|
||||
info->GetMediaStream()->CreateOwnDOMTrack(trackID,
|
||||
MediaSegment::VIDEO,
|
||||
nsString(),
|
||||
source);
|
||||
info->GetMediaStream()->CreateDOMTrack(trackID,
|
||||
MediaSegment::VIDEO,
|
||||
nsString(),
|
||||
source);
|
||||
}
|
||||
#endif
|
||||
CSFLogDebug(logTag, "Added remote track %s/%s",
|
||||
|
|
|
@ -435,8 +435,8 @@ public:
|
|||
void SetTrackEnabled(mozilla::TrackID aTrackID, bool aEnabled) {}
|
||||
|
||||
Fake_MediaStreamTrack*
|
||||
CreateOwnDOMTrack(mozilla::TrackID aTrackID, mozilla::MediaSegment::Type aType,
|
||||
const nsString& aLabel, Fake_MediaStreamTrackSource* aSource)
|
||||
CreateDOMTrack(mozilla::TrackID aTrackID, mozilla::MediaSegment::Type aType,
|
||||
const nsString& aLabel, Fake_MediaStreamTrackSource* aSource)
|
||||
{
|
||||
switch(aType) {
|
||||
case mozilla::MediaSegment::AUDIO: {
|
||||
|
|
Загрузка…
Ссылка в новой задаче