mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 805703. Part 1: MediaStreamGraph::CreateInputStream -> CreateSourceStream. r=jesup
--HG-- extra : rebase_source : 3c327e9ead92508f12df4b95f2fd24fa2ba97ab5
This commit is contained in:
parent
91a7abe566
commit
8fe699d05c
@ -2316,7 +2316,7 @@ MediaStreamGraph::GetInstance()
|
||||
}
|
||||
|
||||
SourceMediaStream*
|
||||
MediaStreamGraph::CreateInputStream(nsDOMMediaStream* aWrapper)
|
||||
MediaStreamGraph::CreateSourceStream(nsDOMMediaStream* aWrapper)
|
||||
{
|
||||
SourceMediaStream* stream = new SourceMediaStream(aWrapper);
|
||||
NS_ADDREF(stream);
|
||||
|
@ -797,7 +797,7 @@ public:
|
||||
* Create a stream that a media decoder (or some other source of
|
||||
* media data, such as a camera) can write to.
|
||||
*/
|
||||
SourceMediaStream* CreateInputStream(nsDOMMediaStream* aWrapper);
|
||||
SourceMediaStream* CreateSourceStream(nsDOMMediaStream* aWrapper);
|
||||
/**
|
||||
* Create a stream that will form the union of the tracks of its input
|
||||
* streams.
|
||||
|
@ -131,7 +131,7 @@ void nsBuiltinDecoder::RecreateDecodedStream(int64_t aStartTimeUSecs)
|
||||
DestroyDecodedStream();
|
||||
|
||||
mDecodedStream = new DecodedStreamData(this, aStartTimeUSecs,
|
||||
MediaStreamGraph::GetInstance()->CreateInputStream(nullptr));
|
||||
MediaStreamGraph::GetInstance()->CreateSourceStream(nullptr));
|
||||
|
||||
// Note that the delay between removing ports in DestroyDecodedStream
|
||||
// and adding new ones won't cause a glitch since all graph operations
|
||||
|
@ -75,22 +75,22 @@ nsDOMLocalMediaStream::Stop()
|
||||
}
|
||||
|
||||
already_AddRefed<nsDOMMediaStream>
|
||||
nsDOMMediaStream::CreateInputStream(uint32_t aHintContents)
|
||||
nsDOMMediaStream::CreateSourceStream(uint32_t aHintContents)
|
||||
{
|
||||
nsRefPtr<nsDOMMediaStream> stream = new nsDOMMediaStream();
|
||||
stream->SetHintContents(aHintContents);
|
||||
MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
|
||||
stream->mStream = gm->CreateInputStream(stream);
|
||||
stream->mStream = gm->CreateSourceStream(stream);
|
||||
return stream.forget();
|
||||
}
|
||||
|
||||
already_AddRefed<nsDOMLocalMediaStream>
|
||||
nsDOMLocalMediaStream::CreateInputStream(uint32_t aHintContents)
|
||||
nsDOMLocalMediaStream::CreateSourceStream(uint32_t aHintContents)
|
||||
{
|
||||
nsRefPtr<nsDOMLocalMediaStream> stream = new nsDOMLocalMediaStream();
|
||||
stream->SetHintContents(aHintContents);
|
||||
MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
|
||||
stream->mStream = gm->CreateInputStream(stream);
|
||||
stream->mStream = gm->CreateSourceStream(stream);
|
||||
return stream.forget();
|
||||
}
|
||||
|
||||
|
@ -56,7 +56,7 @@ public:
|
||||
/**
|
||||
* Create an nsDOMMediaStream whose underlying stream is a SourceMediaStream.
|
||||
*/
|
||||
static already_AddRefed<nsDOMMediaStream> CreateInputStream(uint32_t aHintContents);
|
||||
static already_AddRefed<nsDOMMediaStream> CreateSourceStream(uint32_t aHintContents);
|
||||
|
||||
// Hints to tell the SDP generator about whether this
|
||||
// MediaStream probably has audio and/or video
|
||||
@ -101,7 +101,7 @@ public:
|
||||
/**
|
||||
* Create an nsDOMLocalMediaStream whose underlying stream is a SourceMediaStream.
|
||||
*/
|
||||
static already_AddRefed<nsDOMLocalMediaStream> CreateInputStream(uint32_t aHintContents);
|
||||
static already_AddRefed<nsDOMLocalMediaStream> CreateSourceStream(uint32_t aHintContents);
|
||||
|
||||
/**
|
||||
* Create an nsDOMLocalMediaStream whose underlying stream is a TrackUnionStream.
|
||||
|
@ -148,7 +148,7 @@ DOMCameraPreview::DOMCameraPreview(ICameraControl* aCameraControl, uint32_t aWid
|
||||
|
||||
mImageContainer = LayerManager::CreateImageContainer();
|
||||
MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
|
||||
mStream = gm->CreateInputStream(this);
|
||||
mStream = gm->CreateSourceStream(this);
|
||||
mInput = GetStream()->AsSourceStream();
|
||||
|
||||
mListener = new DOMCameraPreviewListener(this);
|
||||
|
@ -245,7 +245,7 @@ public:
|
||||
uint32_t hints = (mAudioSource ? nsDOMMediaStream::HINT_CONTENTS_AUDIO : 0);
|
||||
hints |= (mVideoSource ? nsDOMMediaStream::HINT_CONTENTS_VIDEO : 0);
|
||||
|
||||
stream = nsDOMLocalMediaStream::CreateInputStream(hints);
|
||||
stream = nsDOMLocalMediaStream::CreateSourceStream(hints);
|
||||
|
||||
nsPIDOMWindow *window = static_cast<nsPIDOMWindow*>
|
||||
(nsGlobalWindow::GetInnerWindowWithId(mWindowID));
|
||||
|
@ -354,7 +354,7 @@ PeerConnectionImpl::MakeMediaStream(uint32_t aHint, nsIDOMMediaStream** aRetval)
|
||||
{
|
||||
MOZ_ASSERT(aRetval);
|
||||
|
||||
nsRefPtr<nsDOMMediaStream> stream = nsDOMMediaStream::CreateInputStream(aHint);
|
||||
nsRefPtr<nsDOMMediaStream> stream = nsDOMMediaStream::CreateSourceStream(aHint);
|
||||
NS_ADDREF(*aRetval = stream);
|
||||
|
||||
CSFLogDebugS(logTag, "PeerConnection " << static_cast<void*>(this)
|
||||
|
@ -145,7 +145,7 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIDOMMEDIASTREAM
|
||||
|
||||
static already_AddRefed<Fake_nsDOMMediaStream> CreateInputStream(uint32_t aHintContents) {
|
||||
static already_AddRefed<Fake_nsDOMMediaStream> CreateSourceStream(uint32_t aHintContents) {
|
||||
Fake_SourceMediaStream *source = new Fake_SourceMediaStream();
|
||||
|
||||
Fake_nsDOMMediaStream *ds = new Fake_nsDOMMediaStream(source);
|
||||
|
Loading…
Reference in New Issue
Block a user