wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1230882. Part 2 - remove DecodedStream::BeginShutdown() and other unused code. r=roc.

Browse Source
This commit is contained in:
JW Wang 2015-12-14 11:32:19 +08:00
parent 1a5e236dc8
commit 5b2c01a8c9
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/media/MediaDecoderStateMachine.cpp
View File

@ -2174,7 +2174,6 @@ MediaDecoderStateMachine::SeekCompleted()
RefPtr<ShutdownPromise>
MediaDecoderStateMachine::BeginShutdown()
{
mStreamSink->BeginShutdown();
return InvokeAsync(OwnerThread(), this, __func__,
&MediaDecoderStateMachine::Shutdown);
}

8
dom/media/mediasink/DecodedStream.cpp
View File

@ -314,7 +314,6 @@ DecodedStream::DecodedStream(AbstractThread* aOwnerThread,
MediaQueue<MediaData>& aAudioQueue,
MediaQueue<MediaData>& aVideoQueue)
: mOwnerThread(aOwnerThread)
, mShuttingDown(false)
, mPlaying(false)
, mSameOrigin(false)
, mAudioQueue(aAudioQueue)
@ -357,13 +356,6 @@ DecodedStream::OnEnded(TrackType aType)
return nullptr;
}
void
DecodedStream::BeginShutdown()
{
MOZ_ASSERT(NS_IsMainThread());
mShuttingDown = true;
}
void
DecodedStream::Start(int64_t aStartTime, const MediaInfo& aInfo)
{

3
dom/media/mediasink/DecodedStream.h
View File

@ -120,7 +120,6 @@ public:
bool IsPlaying() const override;
// TODO: fix these functions that don't fit into the interface of MediaSink.
void BeginShutdown();
void AddOutput(ProcessedMediaStream* aStream, bool aFinishWhenEnded);
void RemoveOutput(MediaStream* aStream);
void SetSameOrigin(bool aSameOrigin);
@ -154,8 +153,6 @@ private:
*/
// Data about MediaStreams that are being fed by the decoder.
OutputStreamManager mOutputStreamManager;
// True if MDSM has begun shutdown.
bool mShuttingDown;
/*
* Worker thread only members.