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 818670: Ensure PipelineListener doesn't release conduit off main thread r=derf

Browse Source
This commit is contained in:
Randell Jesup 2013-01-30 21:26:45 -05:00
parent 96dab7f75f
commit 8fae865146
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
View File

@ -222,6 +222,18 @@ class MediaPipeline : public sigslot::has_slots<> {
};
class ConduitDeleteEvent: public nsRunnable
{
public:
ConduitDeleteEvent(TemporaryRef<MediaSessionConduit> aConduit) :
mConduit(aConduit) {}
/* we exist solely to proxy release of the conduit */
NS_IMETHOD Run() { return NS_OK; }
private:
RefPtr<MediaSessionConduit> mConduit;
};
// A specialization of pipeline for reading from an input device
// and transmitting to the network.
class MediaPipelineTransmit : public MediaPipeline {
@ -262,6 +274,13 @@ class MediaPipelineTransmit : public MediaPipeline {
: conduit_(conduit), active_(false), samples_10ms_buffer_(nullptr),
buffer_current_(0), samplenum_10ms_(0){}
~PipelineListener()
{
// release conduit on mainthread. Must use forget()!
NS_DispatchToMainThread(new ConduitDeleteEvent(conduit_.forget()), NS_DISPATCH_NORMAL);
}
// XXX. This is not thread-safe but the hazard is just
// that active_ = true takes a while to propagate. Revisit
// when 823600 lands.
@ -272,8 +291,8 @@ class MediaPipelineTransmit : public MediaPipeline {
TrackRate rate,
TrackTicks offset,
uint32_t events,
const MediaSegment& queued_media);
virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime) {}
const MediaSegment& queued_media) MOZ_OVERRIDE;
virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime) MOZ_OVERRIDE {}
private:
virtual void ProcessAudioChunk(AudioSessionConduit *conduit,
@ -365,13 +384,19 @@ class MediaPipelineReceiveAudio : public MediaPipelineReceive {
PipelineListener(SourceMediaStream * source, TrackID track_id,
const RefPtr<MediaSessionConduit>& conduit);
~PipelineListener()
{
// release conduit on mainthread. Must use forget()!
NS_DispatchToMainThread(new ConduitDeleteEvent(conduit_.forget()), NS_DISPATCH_NORMAL);
}
// Implement MediaStreamListener
virtual void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
TrackRate rate,
TrackTicks offset,
uint32_t events,
const MediaSegment& queued_media) {}
virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime);
const MediaSegment& queued_media) MOZ_OVERRIDE {}
virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime) MOZ_OVERRIDE;
private:
SourceMediaStream *source_;