Commit Graph

121 Commits

Author SHA1 Message Date
Nicholas Nethercote
90eaa02ea0 Bug 1382099 - Remove MOZ_WIDGET_GONK from dom/media/. r=gerald.
As well as the obvious #ifdefs, this allows DOMHwMediaStream to be
removed, and also the "phone-state-changed" observer.

--HG--
extra : rebase_source : 373280183e228bd4b9bd9d866959409f2444c77e
2017-07-24 10:08:55 +10:00
Paul Adenot
404c800005 Bug 1341555 - Consolidate use of the MSG's AbstractMainThread, and stop having AbstractMainThread on MediaStreams. r=pehrsons
MozReview-Commit-ID: 5hGDQcfpH6a

--HG--
extra : rebase_source : 41bb678f37cfcdbc9912a25f45a5ca488084aabe
2017-06-29 11:30:57 -07:00
Bevis Tseng
72d516ef01 Bug 1314833 - Part 2.2: Use AbstractThread::CreateDirectTaskDrainer() to Drain Direct Tasks Dispatched to MediaStreamGraph. f=rjesup,r=padenot,jwwang
MozReview-Commit-ID: 1KgE3uKu4CG

--HG--
extra : rebase_source : 2ad950afe84675fb9bc4c449e53e7c0d52270175
2016-12-07 22:00:12 -10:00
Andrew McCreight
fccb0645ed Bug 1323042 - forbid MOZ_COUNT_{CTOR,DTOR} for nsISupports classes; r=froydnj 2016-12-12 09:27:58 -05:00
Nathan Froyd
826598caba Backout aba6c73511a2 (bug 1307961) for massive test bustage resulting in a CLOSED TREE; r=alltheorange 2016-12-12 08:45:46 -05:00
Andrew McCreight
e31b5489da Bug 1307961 - require consistent bloatview reporting for nsISupports classes; r=froydnj 2016-12-12 07:58:33 -05:00
Andreas Pehrson
bffd28794f Bug 1208316 - Punch a hole for media element captureStream to only go inactive as source ends. r=jib
MozReview-Commit-ID: 3H0m3fYMw1Y

--HG--
extra : rebase_source : 0eedf84ee9360fada6b4f4d17cb7bdf296f861e8
2016-09-15 14:18:22 +02:00
Andreas Pehrson
da3ba8634d Bug 1208316 - Route notifications of ending tracks through MediaStreamTrack instead of DOMMediaStream. r=jib
MozReview-Commit-ID: KMFE5HXEOtJ

--HG--
extra : rebase_source : 279dffcdd325a5ac78f115803269a724887b6ac0
2016-09-23 17:03:13 +02:00
Andreas Pehrson
456866fe62 Bug 1208316 - Implement MediaStream.active. r=jib, r=smaug
MozReview-Commit-ID: Fzk5vepqQ35

--HG--
extra : rebase_source : 1ddf804e4ca8604b36cf0e8b4752f638c45c9561
2016-09-08 13:44:49 +02:00
Sebastian Hengst
3c1524e5e0 Bug 1306137 - remove b2g camera code: Remove dom/camera/ and code which depends on it. r=aosmond,bkelly
MozReview-Commit-ID: 7gvZrDtmcZP

--HG--
extra : rebase_source : 31f06357fdc36566465668f55bf3fcc5402fe9e0
2016-10-04 20:16:28 +02:00
Andreas Pehrson
83dcc7266e Bug 1259788 - Break out AddTrackInternal() from DOMMediaStream::CreateDOMTrack. r=jesup
Sometimes a track is added to a stream synchronously (before the stream is
exposed to script), and sometimes asynchronously (see the mediacapture-main spec
on the "addtrack" event).

In the latter case we might still need to create the MediaStreamTrack object
synchronously for tracking purposes. CaptureStream of Media element playing a
MediaStream wants this.

MozReview-Commit-ID: 7me8xzN7rwj

--HG--
extra : rebase_source : 4f129b127b855e47aad2ae9ab3981ffde057412d
2016-08-12 13:50:41 +02:00
Jan-Ivar Bruaroey
594073da3e Bug 1213517 - make getUserMedia store initial constraints on resulting tracks. r=jesup
MozReview-Commit-ID: 291CrmVmq4x

--HG--
extra : rebase_source : d29e6996ee93b01c8abe3a98a3f6d05e98bce3c5
2015-11-24 23:42:26 -05:00
Iris Hsiao
725d265c2c Backed out changeset 0fc93ec9ccd7 (bug 1213517) 2016-07-18 15:41:37 +08:00
Jan-Ivar Bruaroey
e7503fa4a5 Bug 1213517 - make getUserMedia store initial constraints on resulting tracks. r=jesup
MozReview-Commit-ID: 291CrmVmq4x

--HG--
extra : rebase_source : d29e6996ee93b01c8abe3a98a3f6d05e98bce3c5
2015-11-24 23:42:26 -05:00
ctai
533acf2e59 Bug 1266646 - Rename MediaStreamDirectListener and MediaStreamTrackDirectListener to DirectMediaStreamListener and DirectMediaStreamTrackListener respectively. r=pehrsons
Rename those two function to better name alignment with AddDirectListener and AddDirectTrackListener.

MozReview-Commit-ID: 6QY08oyih1X

--HG--
extra : transplant_source : %5C%1C%23%AC%D7%0D%97%24%CB%ED%8E%D5%60/%5E%07%F2%85Z%DA
2016-04-29 11:45:25 +08:00
Andreas Pehrson
e028368c0f Bug 1280445 - Remove wrapper from MediaStream. r=jesup, r=padenot
MozReview-Commit-ID: CTCFloIUXKa

--HG--
extra : rebase_source : b1c2073c638bb65c19a0f40e8d17e9a5bae15c98
extra : source : c6d854b3209e7de7d97153c0bfc492c1d5f1e6b5
2016-06-29 12:27:13 +02:00
Andreas Pehrson
758a8d47ef Bug 1208328 - Implement MediaStream.onaddtrack. r=jib, r=smaug
MozReview-Commit-ID: JVZO5mlxvgW

--HG--
extra : rebase_source : da18976304f0483037acb7e271448b64fbd16935
extra : intermediate-source : d48bc6eca9c32c8fd9cf095e650febb09e0affce
extra : source : ba0529f6b0733534d50fa842dfebd52c6b477140
2016-05-31 09:29:52 +02:00
Andreas Pehrson
577b207b43 Bug 1274221 - Make FindOwnedDOMTrack look for (optionally) unique tracks. r=ctai
MozReview-Commit-ID: 1y8YuwJWIS5

--HG--
extra : rebase_source : eb5c6a4ddd2a3d2395870d1f94751e06991fe46f
extra : intermediate-source : 795bcfd6223de68845075d0987cb8f3268893918
extra : source : c2154e0e122ac3981d1c5c7e748633a64111cbf7
2016-05-24 13:26:25 +02:00
Andreas Pehrson
141eefc951 Bug 1208373 - Introduce a new blocking mode to MediaInputPort. r=jesup
This lets us notify about a created TrackUnionStream track (and since it was
created, we can notify when it ends), even though it has been blocked from main
thread.

MozReview-Commit-ID: HyopzISBfbb

--HG--
extra : rebase_source : a18be6b0fcb194c016ae06c62eb5cebbf86eb8d5
extra : intermediate-source : 38e3e48c8dd011a0503f1241c7b21a630738c6c0
extra : source : 690904309e169aa74f95163f0d796493ef882972
2016-06-07 16:20:29 +02:00
Sebastian Hengst
6d87e39b07 Backed out 9 changesets (bug 1208373) for frequent failures in test_peerConnection_addtrack_removetrack_events.html on Android 4.3 debug. r=backout
Backed out changeset 95412432bf10 (bug 1208373)
Backed out changeset 38e3e48c8dd0 (bug 1208373)
Backed out changeset 72cf70065470 (bug 1208373)
Backed out changeset 8cffa26910a8 (bug 1208373)
Backed out changeset 9a8c5a9bb9d5 (bug 1208373)
Backed out changeset bc120c9071bb (bug 1208373)
Backed out changeset fb8a0b464701 (bug 1208373)
Backed out changeset 5ddb73097cfd (bug 1208373)
Backed out changeset c4827087a333 (bug 1208373)
2016-06-14 11:06:51 +02:00
Sebastian Hengst
82d615aa16 Backed out 3 changesets (bug 1274221) for frequent failures in test_peerConnection_addtrack_removetrack_events.html on Android 4.3 debug. r=backout
Backed out changeset 80443106b263 (bug 1274221)
Backed out changeset 795bcfd6223d (bug 1274221)
Backed out changeset 30c253e762c6 (bug 1274221)
2016-06-14 11:05:33 +02:00
Sebastian Hengst
edb7a37036 Backed out 5 changesets (bug 1208328) for frequent failures in test_peerConnection_addtrack_removetrack_events.html on Android 4.3 debug. r=backout
Backed out changeset 3160ce8f8759 (bug 1208328)
Backed out changeset aa209325161f (bug 1208328)
Backed out changeset d48bc6eca9c3 (bug 1208328)
Backed out changeset 945141b1f8da (bug 1208328)
Backed out changeset 48da132353c7 (bug 1208328)
2016-06-14 11:04:28 +02:00
Sebastian Hengst
f310d4012a Backed out changeset c89b8cc657b2 (bug 1266646) 2016-06-13 21:23:53 +02:00
ctai
4b40fd1bc1 Bug 1266646 - Rename MediaStreamDirectListener and MediaStreamTrackDirectListener to DirectMediaStreamListener and DirectMediaStreamTrackListener respectively. r=jesup,pehrsons
Rename those two function to better name alignment with AddDirectListener and AddDirectTrackListener.

MozReview-Commit-ID: 6QY08oyih1X

--HG--
extra : rebase_source : e0f2ac5de75d54a870f5a99f08505e40aa0696d9
2016-04-29 11:45:25 +08:00
Andreas Pehrson
e93d5f7b7d Bug 1208328 - Implement MediaStream.onaddtrack. r=jib, r=smaug
MozReview-Commit-ID: JVZO5mlxvgW

--HG--
extra : rebase_source : 49b0ebaff593c28b727602d7b61bab5feea80485
extra : source : ba0529f6b0733534d50fa842dfebd52c6b477140
2016-05-31 09:29:52 +02:00
Andreas Pehrson
b116cbbb27 Bug 1274221 - Make FindOwnedDOMTrack look for (optionally) unique tracks. r=ctai
MozReview-Commit-ID: 1y8YuwJWIS5

--HG--
extra : rebase_source : 0baab5c71f5e935f69dd3430fc6ce0a7f6c866b3
extra : intermediate-source : ce89c5b1f32de13ca7128de14538eabcb749b925
extra : source : c2154e0e122ac3981d1c5c7e748633a64111cbf7
2016-05-24 13:26:25 +02:00
Andreas Pehrson
d551df2bcf Bug 1208373 - Introduce a new blocking mode to MediaInputPort. r=jesup
This lets us notify about a created TrackUnionStream track (and since it was
created, we can notify when it ends), even though it has been blocked from main
thread.

MozReview-Commit-ID: HyopzISBfbb

--HG--
extra : rebase_source : a3d676257473bba08190b8e2b24d027c42306621
extra : intermediate-source : 5454dcaa31ff8eb060b6f1531a376dcbc24ffb4d
extra : source : 690904309e169aa74f95163f0d796493ef882972
2016-06-07 16:20:29 +02:00
Jonathan Watt
b15368cfcb Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
Carsten "Tomcat" Book
79d88f89e8 Backed out changeset 5454dcaa31ff (bug 1208373) 2016-06-09 15:18:42 +02:00
Carsten "Tomcat" Book
60e86b393e Backed out changeset ce89c5b1f32d (bug 1274221) 2016-06-09 15:18:38 +02:00
Carsten "Tomcat" Book
89552f5055 Backed out changeset ba0529f6b073 (bug 1208328) 2016-06-09 15:18:32 +02:00
Andreas Pehrson
2597c73af2 Bug 1208328 - Implement MediaStream.onaddtrack. r=jib, r=smaug
MozReview-Commit-ID: JVZO5mlxvgW

--HG--
extra : rebase_source : b2ec734dc408e96c9a9f265c11c7308895c3b6ce
2016-05-31 09:29:52 +02:00
Andreas Pehrson
9c625f8d0f Bug 1274221 - Make FindOwnedDOMTrack look for (optionally) unique tracks. r=ctai
MozReview-Commit-ID: 1y8YuwJWIS5

--HG--
extra : rebase_source : fbf328d1ea7ba94d0cf5f4c9bf2e0e4738cf5f42
extra : source : c2154e0e122ac3981d1c5c7e748633a64111cbf7
2016-05-24 13:26:25 +02:00
Andreas Pehrson
5b155d5add Bug 1208373 - Introduce a new blocking mode to MediaInputPort. r=jesup
This lets us notify about a created TrackUnionStream track (and since it was
created, we can notify when it ends), even though it has been blocked from main
thread.

MozReview-Commit-ID: HyopzISBfbb

--HG--
extra : rebase_source : 55d6dd5d6a34a0b499b45e0b72f900fc37cff1bf
extra : source : 690904309e169aa74f95163f0d796493ef882972
2016-06-07 16:20:29 +02:00
Andreas Pehrson
05c6dff3b5 Bug 1208390 - Implement MediaStream.getTrackById(). r=jib, r=smaug
MozReview-Commit-ID: 5a90ZOx7eUE

--HG--
extra : rebase_source : b2fcb6aa7bc0a442cc80ecf3b9dce81415245b41
2016-05-20 13:01:30 +02:00
ctai
4e89100cf8 Bug 1266644 - Rename DOMMediaStream:: CreateXXXStream to DOMMediaStream:: CreateXXXStreamAsInput. r=jesup r=pehrsons
MozReview-Commit-ID: 4X0Q1XuENa4
2016-04-25 11:43:27 +08:00
ctai
8fcb64e480 Bug 1266644 - Rename StreamBuffer to StreamTracks. r=jesup r=pehrsons
Rename StreamBuffer to StreamTracks. We still need a place to keep the track information in every MediaStream, even the StreamBuffer::Track::mSegment is empty.

--HG--
rename : dom/media/StreamBuffer.cpp => StreamTracks.cpp
rename : dom/media/StreamBuffer.h => StreamTracks.h
2016-01-26 10:49:01 +08:00
Andreas Pehrson
1e072d6fc3 Bug 1266680 - Rename BlockTrackId to BlockSourceTrackId. r=jesup
It wasn't clear which TrackID should be passed to MediaInputPort::BlockTrackId(); source or destination.

MozReview-Commit-ID: I9LoSjdpRwE

--HG--
extra : rebase_source : 20eeb5e4ee47eb1cdf00e94cdc72ee11177bbee2
2016-04-22 17:14:26 +02:00
Thomas Zimmermann
d08ecacecf Bug 1262808: Refactor |PrincipalID| to |PrincipalHandle| in Gonk media code, r=rjesup
This patch renames |PrincipalID| to |PrincipalHandle| and fixes related
media code of Gonk.
2016-04-12 16:54:41 +02:00
Andreas Pehrson
b40a807720 Bug 1208371 - Move GetCurrentTime undef to DOMMediaStream.cpp. r=jesup
Not sure why this surfaced now. Include ordering must have changed.

MozReview-Commit-ID: 43eGMdVoycw

--HG--
extra : rebase_source : 5013c1bb93060ea593bca96fe84f3418ea1aefa3
2016-01-22 17:23:10 +08:00
Andreas Pehrson
ee5913bb8b Bug 1208371 - Move MediaStreamTrack's label to MediaStreamTrackSource. r=jib
MozReview-Commit-ID: Aj7Cht4zxc6

--HG--
extra : rebase_source : c454a9f2b81a6a1eb574c1abee0fab64abbe5b72
2016-01-22 16:27:37 +08:00
Andreas Pehrson
6862394047 Bug 1208371 - Ensure DOMMediaStream principals reflect what could reside in their playback streams. r=mt,jesup
Calculating a principal when adding a track is easy - just combine the new
track principal into the stream's principal.

When removing a track it's a bit trickier. The DOMMediaStream has to wait until
the MediaStreamGraph has removed the track from the underlying playback stream.

We do this by letting the MediaStreamGraph return a Pledge (single threaded
Promise) when blocking a track in a stream (the way we end removed tracks).
The pledge gets passed to the MediaStreamGraph and when the block has been
applied it is passed back to the main thread where it is finally resolved
and the DOMMediaStream may recompute its principal once all outstanding
track removals have been applied.

MozReview-Commit-ID: 3QP0YcDyfGf

--HG--
extra : rebase_source : 6642849ec1c7d774467395dee82b0a37fdd33a99
2016-03-16 16:00:34 +01:00
Andreas Pehrson
be74876e25 Bug 1208371 - Add PrincipalHandle to MediaChunks. r=mt,jesup
PrincipalHandle is a thread safe pointer to a holder of (the main-thread-only
nsIPrincipal) that can be passed around the MSG.

A MediaStreamTrack whose source has just updated its principal, sets the new
principal aside (as its "pending principal"), and combines the new principal
into its current principal.

Then the source starts passing the new principal to the MediaStreamGraph as
a PrincipalHandle.

Changes to a track's PrincipalHandle on the MSG will be surfaced through the
MediaStreamTrackListener API. These changes are dispatched to main thread
and compared to a MediaStreamTrack's pending principal. In case of a match
the track knows the correct principal is flowing and can move the pending
principal to be the current principal and update any main thread principal
observers.

MozReview-Commit-ID: D0JXGWhQFFU

--HG--
extra : rebase_source : 296e269bb46fc5a85a9c3f90dfc0dc40e53572bc
2016-04-06 14:56:44 +02:00
Andreas Pehrson
0b6623e60e Bug 1208371 - Remove PeerIdentity from DOMMediaStream. r=mt
MozReview-Commit-ID: 5e4TxCiWwGF

--HG--
extra : rebase_source : 7ee47cf4e606cb2d90b0bbb8237d8155bc96d2ee
2016-01-05 10:16:29 +08:00
Andreas Pehrson
eb7cd31741 Bug 1208371 - Make PeerIdentity RefCounted. r=mt
This so it can be shared between multiple tracks.

MozReview-Commit-ID: 3mjQImVY0f8

--HG--
extra : rebase_source : 9c8d11bb38e06a2cf5f7bf1c24ca657e28387682
2016-01-05 10:16:28 +08:00
Andreas Pehrson
705ec66ce8 Bug 1208371 - Remove ref counting from DOMMediaStream::TrackListener. r=roc
This makes it consistent with PrincipalChangeObserver.

MozReview-Commit-ID: 91PtqFZRcW6

--HG--
extra : rebase_source : e39abb668be7fbd0dae0a701ec17b048c8761879
2016-01-05 10:16:28 +08:00
Andreas Pehrson
c742b9dadf Bug 1208371 - Change HTMLMediaElement video sinks to check principal for video only tracks. r=mt
MozReview-Commit-ID: KGbyJDgpBOn

--HG--
extra : rebase_source : 526556a2174417ec68cb0a84acb1f3fe704ebaf0
2016-01-26 15:36:52 +08:00
Andreas Pehrson
ca18203053 Bug 1208371 - Remove CORSMode methods from DOMMediaStream. r=mt
MozReview-Commit-ID: KiJPucdErFV

--HG--
extra : rebase_source : 776469c4c19b78fa510d423065f4c9264ae27bf6
2016-01-05 10:16:27 +08:00
Andreas Pehrson
a47ce20618 Bug 1208371 - Rename CreateOwnDOMTrack/CreateClonedDOMTrack to CreateDOMTrack/CloneDOMTrack. r=jib
MozReview-Commit-ID: DOGiwcYycJY

--HG--
extra : rebase_source : 197fc7a7c5d36200f987c38f26ab77ec8ea2d290
2016-01-05 10:16:26 +08:00
Andreas Pehrson
6d73d83ee7 Bug 1208371 - Various cleanups in DOMMediaStream/MediaStreamTrack. r=jib
MozReview-Commit-ID: DE0Gqto3Led

--HG--
extra : rebase_source : 8c49e98f0740b4e658010b98f57d090776930666
2016-01-21 19:05:53 +08:00