Source/modules/mediastream/MediaStream.h - Issue 827673002: Add MediaStream.active attribute

Side by Side Diff: Source/modules/mediastream/MediaStream.h

Issue 827673002: Add MediaStream.active attribute (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Allow addTrack/removeTrack when mediastream.ended is true Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html ('K') | « Source/core/events/EventTypeNames.in ('k') | Source/modules/mediastream/MediaStream.cpp » ('j') | Source/modules/mediastream/MediaStream.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 Google Inc. All rights reserved.

3 * Copyright (C) 2011 Ericsson AB. All rights reserved.	3 * Copyright (C) 2011 Ericsson AB. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58	58

59 void addTrack(MediaStreamTrack*, ExceptionState&);	59 void addTrack(MediaStreamTrack*, ExceptionState&);

60 void removeTrack(MediaStreamTrack*, ExceptionState&);	60 void removeTrack(MediaStreamTrack*, ExceptionState&);

61 MediaStreamTrack* getTrackById(String);	61 MediaStreamTrack* getTrackById(String);

62 MediaStream* clone(ExecutionContext*);	62 MediaStream* clone(ExecutionContext*);

63	63

64 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }	64 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }

65 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }	65 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }

66 MediaStreamTrackVector getTracks();	66 MediaStreamTrackVector getTracks();

67	67

	68 bool active() const { return m_descriptor->active(); }

68 bool ended() const;	69 bool ended() const;

69 void stop();	70 void stop();

70	71

	72 DEFINE_ATTRIBUTE_EVENT_LISTENER(active);

	73 DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);

71 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);	74 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);

72 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);	75 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);

73 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);	76 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);

74	77

75 void trackEnded();	78 void trackEnded();

76	79

77 // MediaStreamDescriptorClient	80 // MediaStreamDescriptorClient

78 virtual void streamEnded() override;	81 virtual void streamEnded() override;

79	82

80 MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }	83 MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }

(...skipping 11 matching lines...) Expand all Loading...
92 MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);	95 MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);

93 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co nst MediaStreamTrackVector& videoTracks);	96 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co nst MediaStreamTrackVector& videoTracks);

94	97

95 // ContextLifecycleObserver	98 // ContextLifecycleObserver

96 virtual void contextDestroyed() override;	99 virtual void contextDestroyed() override;

97	100

98 // MediaStreamDescriptorClient	101 // MediaStreamDescriptorClient

99 virtual void addRemoteTrack(MediaStreamComponent*) override;	102 virtual void addRemoteTrack(MediaStreamComponent*) override;

100 virtual void removeRemoteTrack(MediaStreamComponent*) override;	103 virtual void removeRemoteTrack(MediaStreamComponent*) override;

101	104

	105 bool emptyOrOnlyEndedTracks();

	106

102 void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);	107 void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);

103 void scheduledEventTimerFired(Timer<MediaStream>*);	108 void scheduledEventTimerFired(Timer<MediaStream>*);

104	109

105 bool m_stopped;	110 bool m_stopped;

106	111

107 MediaStreamTrackVector m_audioTracks;	112 MediaStreamTrackVector m_audioTracks;

108 MediaStreamTrackVector m_videoTracks;	113 MediaStreamTrackVector m_videoTracks;

109 RefPtr<MediaStreamDescriptor> m_descriptor;	114 RefPtr<MediaStreamDescriptor> m_descriptor;

110	115

111 Timer<MediaStream> m_scheduledEventTimer;	116 Timer<MediaStream> m_scheduledEventTimer;

112 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;	117 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;

113 };	118 };

114	119

115 typedef HeapVector<Member<MediaStream> > MediaStreamVector;	120 typedef HeapVector<Member<MediaStream> > MediaStreamVector;

116	121

117 } // namespace blink	122 } // namespace blink

118	123

119 #endif // MediaStream_h	124 #endif // MediaStream_h

OLD	NEW