Changeset 156488 in webkit
- Timestamp:
- Sep 26, 2013 12:37:48 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r156473 r156488 217 217 Modules/mediasource/WebKitSourceBufferList.idl 218 218 219 Modules/mediastream/AudioStreamTrack.idl 219 220 Modules/mediastream/MediaStream.idl 220 221 Modules/mediastream/MediaStreamEvent.idl … … 240 241 Modules/mediastream/RTCStatsResponse.idl 241 242 Modules/mediastream/SourceInfo.idl 243 Modules/mediastream/VideoStreamTrack.idl 242 244 243 245 Modules/navigatorcontentutils/NavigatorContentUtils.idl … … 838 840 Modules/mediasource/SourceBufferList.cpp 839 841 842 Modules/mediastream/AudioStreamTrack.cpp 840 843 Modules/mediastream/MediaConstraintsImpl.cpp 841 844 Modules/mediastream/MediaStream.cpp … … 863 866 Modules/mediastream/UserMediaController.cpp 864 867 Modules/mediastream/UserMediaRequest.cpp 868 Modules/mediastream/VideoStreamTrack.cpp 865 869 866 870 Modules/navigatorcontentutils/NavigatorContentUtils.cpp -
trunk/Source/WebCore/ChangeLog
r156487 r156488 1 2013-09-26 Eric Carlson <eric.carlson@apple.com> 2 3 [MediaStream API] implement VideoStreamTrack and AudioStreamTrack 4 https://bugs.webkit.org/show_bug.cgi?id=121950 5 6 Reviewed by Dean Jackson. 7 8 No new tests, blocked by https://bugs.webkit.org/show_bug.cgi?id=121967 9 10 * CMakeLists.txt: Add new files. 11 * DerivedSources.make: Ditto. 12 * GNUmakefile.list.am: Ditto. 13 14 * Modules/mediastream/AudioStreamTrack.cpp: Added. 15 * Modules/mediastream/AudioStreamTrack.h: Added. 16 * Modules/mediastream/AudioStreamTrack.idl: Added. 17 18 * Modules/mediastream/MediaStream.cpp: 19 (WebCore::MediaStream::MediaStream): Create an AudioStreamTrack or a VideoStreamTrack. 20 (WebCore::MediaStream::addRemoteSource): Ditto. 21 22 * Modules/mediastream/MediaStreamTrack.cpp: 23 (WebCore::MediaStreamTrack::create): Removed. 24 * Modules/mediastream/MediaStreamTrack.h: 25 26 * Modules/mediastream/VideoStreamTrack.cpp: Added. 27 * Modules/mediastream/VideoStreamTrack.h: Added. 28 * Modules/mediastream/VideoStreamTrack.idl: Added. 29 30 * WebCore.xcodeproj/project.pbxproj: Add new files. 31 1 32 2013-09-26 Anders Carlsson <andersca@apple.com> 2 33 -
trunk/Source/WebCore/DerivedSources.make
r156381 r156488 125 125 $(WebCore)/Modules/mediasource/SourceBuffer.idl \ 126 126 $(WebCore)/Modules/mediasource/SourceBufferList.idl \ 127 $(WebCore)/Modules/mediastream/MediaStream.idl \ 127 $(WebCore)/Modules/mediastream/AudioStreamTrack.idl \ 128 $(WebCore)/Modules/mediastream/MediaStream.idl \ 128 129 $(WebCore)/Modules/mediastream/MediaStreamEvent.idl \ 129 130 $(WebCore)/Modules/mediastream/MediaStreamTrack.idl \ … … 147 148 $(WebCore)/Modules/mediastream/RTCStatsReport.idl \ 148 149 $(WebCore)/Modules/mediastream/RTCStatsResponse.idl \ 150 $(WebCore)/Modules/mediastream/VideoStreamTrack.idl \ 149 151 $(WebCore)/Modules/mediastream/SourceInfo.idl \ 150 152 $(WebCore)/Modules/notifications/DOMWindowNotifications.idl \ -
trunk/Source/WebCore/GNUmakefile.list.am
r156473 r156488 60 60 DerivedSources/WebCore/JSAudioProcessingEvent.cpp \ 61 61 DerivedSources/WebCore/JSAudioProcessingEvent.h \ 62 DerivedSources/WebCore/JSAudioStreamTrack.cpp \ 63 DerivedSources/WebCore/JSAudioStreamTrack.h \ 62 64 DerivedSources/WebCore/JSAudioTrack.cpp \ 63 65 DerivedSources/WebCore/JSAudioTrack.h \ … … 759 761 DerivedSources/WebCore/JSVoidCallback.cpp \ 760 762 DerivedSources/WebCore/JSVoidCallback.h \ 763 DerivedSources/WebCore/JSVideoStreamTrack.h \ 764 DerivedSources/WebCore/JSVideoStreamTrack.cpp \ 761 765 DerivedSources/WebCore/JSVideoTrack.cpp \ 762 766 DerivedSources/WebCore/JSVideoTrack.h \ … … 1251 1255 $(WebCore)/Modules/mediasource/WebKitSourceBuffer.idl \ 1252 1256 $(WebCore)/Modules/mediasource/WebKitSourceBufferList.idl \ 1257 $(WebCore)/Modules/mediastream/AudioStreamTrack.idl \ 1253 1258 $(WebCore)/Modules/mediastream/MediaStream.idl \ 1254 1259 $(WebCore)/Modules/mediastream/MediaStreamEvent.idl \ … … 1274 1279 $(WebCore)/Modules/mediastream/RTCStatsResponse.idl \ 1275 1280 $(WebCore)/Modules/mediastream/SourceInfo.idl \ 1281 $(WebCore)/Modules/mediastream/VideoStreamTrack.idl \ 1276 1282 $(WebCore)/Modules/navigatorcontentutils/NavigatorContentUtils.idl \ 1277 1283 $(WebCore)/Modules/notifications/DOMWindowNotifications.idl \ … … 1966 1972 Source/WebCore/Modules/mediasource/WebKitSourceBufferList.cpp \ 1967 1973 Source/WebCore/Modules/mediasource/WebKitSourceBufferList.h \ 1974 Source/WebCore/Modules/mediastream/AudioStreamTrack.cpp \ 1975 Source/WebCore/Modules/mediastream/AudioStreamTrack.h \ 1968 1976 Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp \ 1969 1977 Source/WebCore/Modules/mediastream/MediaConstraintsImpl.h \ … … 2023 2031 Source/WebCore/Modules/mediastream/UserMediaRequest.cpp \ 2024 2032 Source/WebCore/Modules/mediastream/UserMediaRequest.h \ 2033 Source/WebCore/Modules/mediastream/VideoStreamTrack.cpp \ 2034 Source/WebCore/Modules/mediastream/VideoStreamTrack.h \ 2025 2035 Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp \ 2026 2036 Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h \ -
trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp
r156473 r156488 30 30 #if ENABLE(MEDIA_STREAM) 31 31 32 #include "AudioStreamTrack.h" 32 33 #include "Event.h" 33 34 #include "ExceptionCode.h" … … 36 37 #include "MediaStreamSource.h" 37 38 #include "MediaStreamTrackEvent.h" 39 #include "VideoStreamTrack.h" 38 40 #include <wtf/NeverDestroyed.h> 39 41 … … 125 127 m_audioTracks.reserveCapacity(numberOfAudioTracks); 126 128 for (size_t i = 0; i < numberOfAudioTracks; i++) 127 m_audioTracks.append( MediaStreamTrack::create(context, m_descriptor->audioStreams(i)));129 m_audioTracks.append(AudioStreamTrack::create(context, m_descriptor->audioStreams(i))); 128 130 129 131 size_t numberOfVideoTracks = m_descriptor->numberOfVideoStreams(); 130 132 m_videoTracks.reserveCapacity(numberOfVideoTracks); 131 133 for (size_t i = 0; i < numberOfVideoTracks; i++) 132 m_videoTracks.append( MediaStreamTrack::create(context, m_descriptor->videoStreams(i)));134 m_videoTracks.append(VideoStreamTrack::create(context, m_descriptor->videoStreams(i))); 133 135 } 134 136 … … 276 278 source->setStream(descriptor()); 277 279 278 RefPtr<MediaStreamTrack> track = MediaStreamTrack::create(scriptExecutionContext(), source);280 RefPtr<MediaStreamTrack> track; 279 281 switch (source->type()) { 280 282 case MediaStreamSource::Audio: 283 track = AudioStreamTrack::create(scriptExecutionContext(), source); 281 284 m_audioTracks.append(track); 282 285 break; 283 286 case MediaStreamSource::Video: 287 track = VideoStreamTrack::create(scriptExecutionContext(), source); 284 288 m_videoTracks.append(track); 285 289 break; -
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
r156473 r156488 43 43 namespace WebCore { 44 44 45 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* context, const Dictionary& videoConstraints)46 {47 RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, 0, &videoConstraints));48 return track.release();49 }50 51 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* context, MediaStreamSource* source)52 {53 RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, source, 0));54 return track.release();55 }56 57 45 MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext* context, MediaStreamSource* source, const Dictionary*) 58 46 : ActiveDOMObject(context) -
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h
r156473 r156488 48 48 class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer { 49 49 public: 50 51 static PassRefPtr<MediaStreamTrack> create(ScriptExecutionContext*, const Dictionary&);52 static PassRefPtr<MediaStreamTrack> create(ScriptExecutionContext*, MediaStreamSource*);53 54 50 virtual ~MediaStreamTrack(); 55 51 56 const AtomicString& kind() const;52 virtual const AtomicString& kind() const = 0; 57 53 const String& id() const; 58 54 const String& label() const; … … 84 80 using RefCounted<MediaStreamTrack>::deref; 85 81 86 pr ivate:82 protected: 87 83 MediaStreamTrack(ScriptExecutionContext*, MediaStreamSource*, const Dictionary*); 88 84 85 private: 89 86 void trackDidEnd(); 90 87 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r156473 r156488 267 267 07B5A30D14687D7100A81ECE /* JSTextTrackListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07B5A30C14687D7100A81ECE /* JSTextTrackListCustom.cpp */; }; 268 268 07BDD6EC1469B4C2009C9F85 /* JSTrackEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07B5A30A14687B8400A81ECE /* JSTrackEventCustom.cpp */; }; 269 07C59B5317F4AC15000FBCBB /* AudioStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B4D17F4AC15000FBCBB /* AudioStreamTrack.cpp */; }; 270 07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B4E17F4AC15000FBCBB /* AudioStreamTrack.h */; }; 271 07C59B5617F4AC15000FBCBB /* VideoStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B5017F4AC15000FBCBB /* VideoStreamTrack.cpp */; }; 272 07C59B5717F4AC15000FBCBB /* VideoStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5117F4AC15000FBCBB /* VideoStreamTrack.h */; }; 273 07C59B5D17F4B208000FBCBB /* JSAudioStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B5917F4B208000FBCBB /* JSAudioStreamTrack.cpp */; }; 274 07C59B5E17F4B208000FBCBB /* JSAudioStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */; }; 275 07C59B5F17F4B208000FBCBB /* JSVideoStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */; }; 276 07C59B6017F4B208000FBCBB /* JSVideoStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */; }; 269 277 07CE77D516712A6A00C55A47 /* InbandTextTrackPrivateClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07CE77D416712A6A00C55A47 /* InbandTextTrackPrivateClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; 270 278 07DC5FD417D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07DC5FD317D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp */; }; … … 6668 6676 07B5A30A14687B8400A81ECE /* JSTrackEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackEventCustom.cpp; sourceTree = "<group>"; }; 6669 6677 07B5A30C14687D7100A81ECE /* JSTextTrackListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackListCustom.cpp; sourceTree = "<group>"; }; 6678 07C59B4D17F4AC15000FBCBB /* AudioStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioStreamTrack.cpp; sourceTree = "<group>"; }; 6679 07C59B4E17F4AC15000FBCBB /* AudioStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStreamTrack.h; sourceTree = "<group>"; }; 6680 07C59B4F17F4AC15000FBCBB /* AudioStreamTrack.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioStreamTrack.idl; sourceTree = "<group>"; }; 6681 07C59B5017F4AC15000FBCBB /* VideoStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoStreamTrack.cpp; sourceTree = "<group>"; }; 6682 07C59B5117F4AC15000FBCBB /* VideoStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoStreamTrack.h; sourceTree = "<group>"; }; 6683 07C59B5217F4AC15000FBCBB /* VideoStreamTrack.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VideoStreamTrack.idl; sourceTree = "<group>"; }; 6684 07C59B5917F4B208000FBCBB /* JSAudioStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSAudioStreamTrack.cpp; path = JSAudioStreamTrack.cpp; sourceTree = "<group>"; }; 6685 07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSAudioStreamTrack.h; path = JSAudioStreamTrack.h; sourceTree = "<group>"; }; 6686 07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSVideoStreamTrack.cpp; path = JSVideoStreamTrack.cpp; sourceTree = "<group>"; }; 6687 07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSVideoStreamTrack.h; path = JSVideoStreamTrack.h; sourceTree = "<group>"; }; 6670 6688 07CE77D416712A6A00C55A47 /* InbandTextTrackPrivateClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandTextTrackPrivateClient.h; sourceTree = "<group>"; }; 6671 6689 07DC5FD317D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCStatsResponseCustom.cpp; sourceTree = "<group>"; }; … … 13308 13326 isa = PBXGroup; 13309 13327 children = ( 13328 07C59B4D17F4AC15000FBCBB /* AudioStreamTrack.cpp */, 13329 07C59B4E17F4AC15000FBCBB /* AudioStreamTrack.h */, 13330 07C59B4F17F4AC15000FBCBB /* AudioStreamTrack.idl */, 13331 07C59B5017F4AC15000FBCBB /* VideoStreamTrack.cpp */, 13332 07C59B5117F4AC15000FBCBB /* VideoStreamTrack.h */, 13333 07C59B5217F4AC15000FBCBB /* VideoStreamTrack.idl */, 13310 13334 07221B4A17CEC32700848E51 /* MediaConstraintsImpl.cpp */, 13311 13335 07221B4B17CEC32700848E51 /* MediaConstraintsImpl.h */, … … 13451 13475 isa = PBXGroup; 13452 13476 children = ( 13477 07C59B5917F4B208000FBCBB /* JSAudioStreamTrack.cpp */, 13478 07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */, 13479 07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */, 13480 07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */, 13453 13481 07277E4017D018CC0015534D /* JSMediaStream.cpp */, 13454 13482 07277E4117D018CC0015534D /* JSMediaStream.h */, … … 21547 21575 FD315FFC12B0267600C1A359 /* AudioBufferSourceNode.h in Headers */, 21548 21576 FD31607C12B026F700C1A359 /* AudioBus.h in Headers */, 21577 07C59B5E17F4B208000FBCBB /* JSAudioStreamTrack.h in Headers */, 21549 21578 FD31607E12B026F700C1A359 /* AudioChannel.h in Headers */, 21550 21579 FD31600512B0267600C1A359 /* AudioContext.h in Headers */, … … 22785 22814 20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */, 22786 22815 71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */, 22816 07C59B6017F4B208000FBCBB /* JSVideoStreamTrack.h in Headers */, 22787 22817 7AA51DD6148506A900AD2752 /* InspectorMemoryAgent.h in Headers */, 22788 22818 4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */, … … 23610 23640 499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */, 23611 23641 493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */, 23642 07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */, 23612 23643 E1424C8A164B3B4E00F32D40 /* PlatformCookieJar.h in Headers */, 23613 23644 BC5C762B1497FE1400BC4775 /* PlatformEvent.h in Headers */, … … 24504 24535 BC6DADEF0A195FDF00E5CD14 /* WebFontCache.h in Headers */, 24505 24536 A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */, 24537 07C59B5717F4AC15000FBCBB /* VideoStreamTrack.h in Headers */, 24506 24538 49C7B9C91042D32F0009D447 /* WebGLBuffer.h in Headers */, 24507 24539 7E66E23416D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h in Headers */, … … 25299 25331 78D02BC5154A18DF00B62D05 /* CSSPropertyAnimation.cpp in Sources */, 25300 25332 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 25333 07C59B5617F4AC15000FBCBB /* VideoStreamTrack.cpp in Sources */, 25301 25334 82E3D8DE122EA0D1003AE5BC /* CSSPropertySourceData.cpp in Sources */, 25302 25335 BC5A12DF0DC0414800C9AFAD /* CSSReflectValue.cpp in Sources */, … … 25388 25421 F293B27E56C112F373FFF27E /* DNSResolveQueue.cpp in Sources */, 25389 25422 A8185F3C09765766005826D9 /* Document.cpp in Sources */, 25423 07C59B5D17F4B208000FBCBB /* JSAudioStreamTrack.cpp in Sources */, 25390 25424 A3BB59F31457A40D00AC56FE /* DocumentEventQueue.cpp in Sources */, 25391 25425 A8185F3F09765766005826D9 /* DocumentFragment.cpp in Sources */, … … 26886 26920 1A2A68230B5BEDE70002A480 /* ProgressTracker.cpp in Sources */, 26887 26921 E4BBED0E14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp in Sources */, 26922 07C59B5F17F4B208000FBCBB /* JSVideoStreamTrack.cpp in Sources */, 26888 26923 514C76740CE923A1007EF3CD /* ProtectionSpace.cpp in Sources */, 26889 26924 1AF8E13312565A4400230FF7 /* ProxyServer.cpp in Sources */, … … 26986 27021 1479FAF3109AE37500DED655 /* RenderRubyText.cpp in Sources */, 26987 27022 BC3BE9930E9C1C7C00835588 /* RenderScrollbar.cpp in Sources */, 27023 07C59B5317F4AC15000FBCBB /* AudioStreamTrack.cpp in Sources */, 26988 27024 BC3BE9AB0E9C242000835588 /* RenderScrollbarPart.cpp in Sources */, 26989 27025 BC3BE9A50E9C239600835588 /* RenderScrollbarTheme.cpp in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.