Commit Graph

11342 Commits

Author SHA1 Message Date
JW Wang
6ab3fdad07 Bug 1388228. P5 - move some more members to ChannelMediaDecoder. r=gerald
Those members only make sense for ChannelMediaResource.

MozReview-Commit-ID: 2z6WPQeJnIT

--HG--
extra : rebase_source : 7f43635ee91c8fad1d6ad6f56788e880d54beab2
2017-08-07 13:23:43 +08:00
JW Wang
e5f016de87 Bug 1388228. P4 - move the implementation of MediaDecoder::CanPlayThroughImpl() down to ChannelMediaDecoder. r=gerald
Because GetStatistics() only makes sense for ChannelMediaResource.

MozReview-Commit-ID: HkEpb4frUx1

--HG--
extra : rebase_source : 7086721f47b381b692a165302ff3bdc13caa8b41
2017-08-07 11:48:43 +08:00
JW Wang
303f74001a Bug 1388228. P3 - following P2, we can now remove unused code and canonicals. r=gerald
Note we remove the log in BufferingState::Enter() which prevents us from
removing ChannelMediaResource related code from MDSM. We can add it back
in the future after the refactoring.

MozReview-Commit-ID: B94iOI0bTXC

--HG--
extra : rebase_source : 857b7420ab9b52c07dc8a917c1f9344096ed20e6
extra : source : 2c350a4f3cbdf6f446b5e1cc8d6e0892722866d0
2017-08-04 17:56:28 +08:00
JW Wang
b4e54281c9 Bug 1388228. P2 - cache the result of CanPlayThrough() and mirror it to MDSM. r=gerald
So we don't duplicate the code of calculating CanPlayThrough from
download rate and playback rate in MediaDecoder.

MozReview-Commit-ID: 7M5JAuUxFFc

--HG--
extra : rebase_source : cb216a1af59b9d8207e3056a5d3ae05e93d85e74
extra : source : a183c089760e329508fac44239fee42c1f047b80
2017-08-04 17:38:20 +08:00
JW Wang
4eb2d7a53b Bug 1388228. P1 - move some members to ChannelMediaDecoder. r=gerald
These members are used only by ChannelMediaDecoder.

MozReview-Commit-ID: 10CHV1sjY9k

--HG--
extra : rebase_source : 2a9817a433cd098d818399e718a5c08d6b88df4c
extra : source : 5d606d67b79543adde8580d96f5aa7055fe0286c
2017-08-04 16:02:40 +08:00
Blake Kaplan
3e5081b1b0 Bug 1374460 - Remove mochitests using showModalDialog. r=smaug
MozReview-Commit-ID: 5vLjdti5oW8

--HG--
extra : rebase_source : a731afcacc8ea35e9120cce4fb47d444fbdf4efa
2017-06-08 11:44:24 -07:00
Wes Kocher
623f36f0f8 Merge m-c to autoland, a=merge
MozReview-Commit-ID: CxCNV7W0utC
2017-08-07 15:26:40 -07:00
Wes Kocher
cf8f3268a1 Merge inbound to central, a=merge
MozReview-Commit-ID: 5tBON9YUdAO
2017-08-07 15:23:46 -07:00
Carsten "Tomcat" Book
a24b9505f9 Merge mozilla-central to autoland 2017-08-07 13:16:54 +02:00
Carsten "Tomcat" Book
e54b14cf9a merge mozilla-inbound to mozilla-central a=merge 2017-08-07 12:56:05 +02:00
Nicholas Nethercote
f941156987 Bug 1386600 - Change nsIStringBundle methods to return |AString| instead of |wstring|. r=emk,sr=dbaron.
This removes about 2/3 of the occurrences of nsXPIDLString in the tree. The
places where nsXPIDLStrings are null-checked are replaced with |rv| checks.

The patch also removes a couple of unused declarations from
nsIStringBundle.idl.

Note that nsStringBundle::GetStringFromNameHelper() was merged into
GetStringFromName(), because they both would have had the same signature.

--HG--
extra : rebase_source : ac40bc31c2a4997f2db0bd5069cc008757a2df6d
2017-08-04 14:40:52 +10:00
JW Wang
b2d75fa057 Bug 1383628. P5 - move CanClone() from MediaResource to BaseMediaResource. r=gerald
1. we move clone related methods to BaseMediaResource which is the only cloneable sub-class of MediaResource.
2. add CanClone() to ChannelMediaDecoder to reduce the dependency on MediaResource for HTMLMediaElement.
   MediaResource should be internal details to MediaDecoder.

MozReview-Commit-ID: Hl2nAiuyTO0

--HG--
extra : rebase_source : 43dd9ee33ef2ef2e9093eb6b264dc174379d61d2
extra : source : 978ded48a90f2c407c4545486243acabf492736a
2017-08-04 15:29:55 +08:00
JW Wang
163c6a8c8b Bug 1383628. P4 - move CloneData() and Create() from MediaResource to BaseMediaResource. r=gerald
Now we can store a more specific resource type in ChannelMediaDecoder.

MozReview-Commit-ID: EzXC547O7aR

--HG--
extra : rebase_source : eea1872eeeee9b5964fcc767c79b0315bf277602
extra : source : 84011bf4847bbed26e89af0b831aded93522f7ac
2017-08-04 14:52:22 +08:00
JW Wang
da1e4aeb7b Bug 1383628. P3 - devirtualize Load() which has no overrides. r=gerald
MozReview-Commit-ID: EZ9jcHiWGZb

--HG--
extra : rebase_source : 6e1547598a5ac1a797ce09d79dc7f2935678570c
extra : source : c7362776a480758a9c12ed69cc155b19872bd238
2017-08-03 17:48:26 +08:00
JW Wang
a8a917b8bb Bug 1383628. P2 - move the call to Load() into Clone(). r=gerald
MozReview-Commit-ID: 9k8BXLwAepI

--HG--
extra : rebase_source : 52d3fb871bad53691585e774c2745f328592eb3f
extra : source : cdc492f87aa634eaaae0809aacb261ad25be7b08
2017-08-03 17:47:23 +08:00
JW Wang
09bd1a691e Bug 1383628. P1 - divide Clone() into 2 functions. r=gerald
Now we have a non-virtual Clone() and a virtual CloneImpl().
We will call Load() inside Clone().

MozReview-Commit-ID: Hd6p206Brhq

--HG--
extra : rebase_source : fe30611f6524234d98494cd55453140e3b78c7d6
extra : source : 517cd32514e65cf5f6cd7fe46acecd7f9aea6310
2017-08-03 17:39:55 +08:00
Alastor Wu
c3e56a33cd Bug 1367983 - correct comment. r=jwwang
We still need to keep the resource on Android, otherwise the frame we render would be wrong.

MozReview-Commit-ID: 2d6sfIuhfWY

--HG--
extra : rebase_source : f509027bd8d225de2d65c59510650a178038a2ff
2017-08-07 15:48:49 +08:00
Jean-Yves Avenard
8682fd60e2 Bug 1387801 - Reject invalid H264 content. r=gerald
MozReview-Commit-ID: 9m42TIYgis4

--HG--
extra : rebase_source : b6b7d167c40219b8af97dd3f05e079d4b8db4239
2017-08-06 17:39:03 +02:00
James Cheng
238e3be549 Bug 1387314-Remove NS_DispatchToMainThread and use nsIEventTarget to dispatch instead. r=cpearce
MozReview-Commit-ID: EcEQlLLhU5z

--HG--
extra : rebase_source : bc44b7815a80bb1c63a0a32c82936eac3a311108
2017-08-04 11:31:15 +08:00
Carsten "Tomcat" Book
0c5d14bebd Merge mozilla-central to mozilla-inbound 2017-08-07 13:07:13 +02:00
JerryShih
061742e951 Bug 1357299 - P11: Update layers, dxva and vr module to use SyncObjectChild. v3. r=mattwoodrow,dvander
MozReview-Commit-ID: 4HTPz0YcYHq
2017-08-07 18:15:24 +08:00
JerryShih
384661a8d6 Bug 1357299 - P8: Add some function result checkings for DXVA2 video decoding. r=mattwoodrow
Check the buffer appending status for the video sample object.
Check for the IMFTransform output status.

MozReview-Commit-ID: J0bn6NB7gi0
2017-08-07 18:15:23 +08:00
JerryShih
0556445e64 Bug 1357299 - P6: Turn on DXVA with LAYERS_WR and ANGLE backend. v2. r=mattwoodrow
MozReview-Commit-ID: EOOp0Dzenub
2017-08-07 18:15:23 +08:00
JerryShih
6528324a47 Bug 1357299 - P5: Pass KnowsCompositor instead of ShadowForwarder to media decoder. v2. r=nical
If we use WebRender, there is no ShadowForwarder with this configuration.
So, use the AsKnowsCompositor() instead.

MozReview-Commit-ID: KMcfdwySKDL
2017-08-07 18:15:22 +08:00
Masatoshi Kimura
06311d2e3a Bug 1375125 - Remove nsILocalFile. r=froydnj
MozReview-Commit-ID: 6oU6Ya5UXtC

--HG--
extra : rebase_source : 55b6e30aa348c1b939326698b0da7d72c26b479c
2017-08-05 09:43:49 +09:00
Masatoshi Kimura
8b713b2b0f Bug 1375125 - Stop using nsILocalFile in the tree. r=froydnj
This mechanically replaces nsILocalFile with nsIFile in
*.js, *.jsm, *.sjs, *.html, *.xul, *.xml, and *.py.

MozReview-Commit-ID: 4ecl3RZhOwC

--HG--
extra : rebase_source : 412880ea27766118c38498d021331a3df6bccc70
2017-08-04 17:49:22 +09:00
Ryan VanderMeulen
e0883c892e Bug 1364821 - Fix merge bustage. a=RyanVM
A line was accidentally dropped when resolving merge conflicts between inbound and autoland. CI wasn't amused. This just adds it back.
2017-08-04 15:33:53 -04:00
Sebastian Hengst
765cc1b925 merge mozilla-inbound to mozilla-central. r=merge a=merge
MozReview-Commit-ID: JhesEg4Bxjy
2017-08-04 19:28:27 +02:00
Bill McCloskey
2273c53b75 Bug 1364821 - Introduce AbstractThread::AutoEnter and remove main thread's AbstractThread::GetCurrent() (r=jwwang)
MozReview-Commit-ID: FSLVn7xe3sq
2017-08-03 14:19:02 -07:00
Sebastian Hengst
5cfce14aba merge mozilla-central to mozilla-inbound. r=merge a=merge 2017-08-03 12:17:50 +02:00
Jan Varga
fdb1375046 Bug 1283609 - Part 2: Rename BackgroundChild::SynchronouslyCreateForCurrentThread to BackgroundChild::GetOrCreateForCurrentThread; r=billm 2017-08-03 11:21:53 +02:00
Masatoshi Kimura
f143125cc2 Bug 1326520 - Rename nsIURI.path to pathQueryRef. r=valentin.gosu
MozReview-Commit-ID: DqJdTGopR9G

--HG--
extra : rebase_source : e8c9eb03468c075b79013b6e0bd8b367229c24cd
2017-07-29 20:50:21 +09:00
Chun-Min Chang
080eae8651 Bug 1387058 - part2: Early return in AudioNotificationReceiver::NotifyDefaultDeviceChanged if there is no AudioStream; r=jwwang
MozReview-Commit-ID: HLByqFWqCdn

--HG--
extra : rebase_source : 47d5c95dd9ce8fb801ed935919fff50e47967c5d
2017-08-04 15:01:39 +08:00
Chun-Min Chang
bb2563e5f9 Bug 1387058 - part1: Clear the static pointer when no more AudioStreams; r=jwwang
--HG--
extra : rebase_source : 24afc6aa73cdba9340d9678ea45a9aa9265daa75
2017-08-04 14:20:48 +08:00
Gerald Squelart
63070aab2f Bug 1384243 - Sanitize offset inputs in MediaResourceIndex - r=cpearce
Also check that the offset doesn't overflow during reads.

MozReview-Commit-ID: DT5neeZuMZu

--HG--
extra : rebase_source : 1f0de82916ebf770a0ea2570161d607216232dfa
2017-08-01 14:07:55 +12:00
JW Wang
0a70fd0b47 Bug 1387702 - be sure to enter the AbstractThread context for state-mirroring to be usable. r=billm
MozReview-Commit-ID: 3kML9KVr01g

--HG--
extra : rebase_source : 252a0c3a6febb5720929ab94e496d120ab967293
2017-08-07 10:54:17 +08:00
JW Wang
108a5c3b92 Bug 1386478 - don't cap the return value of GetEndTime(). r=jya
A chained ogg file contains multiple streams and timestamps will not
monolithically increase. The current code will cap AudioEndTime()
to the end time of the 1st stream and currentTime won't be updated
correctly when playback position reaches the 2nd stream or later ones.

http://searchfox.org/mozilla-central/rev/bbc1c59e460a27b20929b56489e2e55438de81fa/dom/media/MediaDecoderStateMachine.cpp#3636-3637

MozReview-Commit-ID: DbIspYmEjVv

--HG--
extra : rebase_source : 20004ae6c6d4e15dc8aeebf646efc62342514d24
2017-08-02 10:45:48 +08:00
JW Wang
be3df48dc5 Bug 1384831. P5 - remove unused arguments from HLSDecoder::Load(). r=gerald
MozReview-Commit-ID: JsULuDcMiNa

--HG--
extra : rebase_source : c9c78f57a4fb2278143c8c69343d5e8a97765bbb
extra : source : e019f6fc241c8f35d58a8aa27854159b09dd21f9
2017-07-27 02:54:53 +08:00
JW Wang
ddec7cb574 Bug 1384831. P4 - let HLSDecoder inherit MediaDecoder. r=kikuo
MozReview-Commit-ID: B9XvfbjjMxX

--HG--
extra : rebase_source : eb3212aca6f4c93bffc56bb5e8d75177cb64a28e
extra : source : 7753fca48c5f229ae14aa2e9c08e4d3d86bea39e
2017-07-27 02:52:07 +08:00
JW Wang
e72f601403 Bug 1384831. P3 - let HLSResource notify HLSDecoder directly without going through MediaResourceCallback. r=kikuo
We can't use MediaResourceCallback since HLSDecoder will not inherit ChannelMediaDecoder.

MozReview-Commit-ID: BzKatvYU90Y

--HG--
extra : rebase_source : a3fea763ef5f484fd1e455add4e6e6c91277aff1
extra : source : a9332539c0bc1ef81286b0e119250c3fce84101b
2017-07-26 23:26:17 +08:00
JW Wang
197591cec8 Bug 1384831. P2 - rewrite HTMLMediaElement::InitializeDecoderForChannel() and move HLSDecoder creation code to it. r=gerald
Since we will remove ChannelMediaDecoder from HLSDecoder's base class, we can't
create HLSDecoder in InstantiateDecoder which returns a ChannelMediaDecoder.

MozReview-Commit-ID: 9wcrIVIOZFp

--HG--
extra : rebase_source : cf0e55a6a0eafeb4e34ff1eed5bb7e1d97d73e80
extra : source : edefbf5d7179c5390bd2a25fbbcd025095d39555
2017-07-26 15:49:03 +08:00
Chun-Min Chang
261bda646c Bug 1384944 - Replace NS_ConvertASCIItoUTF16 by NS_ConvertUTF8toUTF16; r=padenot
--HG--
extra : rebase_source : e717dd2c4a0e96edb225443d157b4a761b1ec524
2017-07-28 15:41:20 +08:00
Chun-Min Chang
030729930f Bug 1361336 - part5: Register the AudioStream into AudioNotificationReceiver when it's created; r=cpearce
--HG--
extra : rebase_source : bec94f3f8a710b8b8d21912f0feb5a752e92c7de
2017-07-26 14:50:48 +08:00
Chun-Min Chang
fcac71b722 Bug 1361336 - part4: Create AudioNotificationSender/Receiver to pass the device-changed notification; r=cpearce
--HG--
extra : rebase_source : 698c735d3fe7fc6b47b47416a205dc51e77c9358
2017-07-26 17:00:44 +08:00
Chun-Min Chang
7d076c3ac2 Bug 1361336 - part2: Prevent AudioStream::ResetDefaultDevice() from being called before stream is started; r=cpearce,kinetik
--HG--
extra : rebase_source : 95030be6e9ce493b6d42e837f9a7e652907836a8
2017-07-21 17:45:45 +08:00
Chun-Min Chang
bfe0bce52c Bug 1361336 - part1: A new API for AudioStream that it can reset stream to the default device; r=kinetik
MozReview-Commit-ID: ErUYXK9fUvE

--HG--
extra : rebase_source : ced74fba605b6892674a58611d7eb33616c81ce6
2017-07-12 14:51:07 +08:00
Jan Beich
5c4a94b509 Bug 1385115 - Unbreak build on Tier3 after bug 1382883. r=cpearce
MozReview-Commit-ID: ISTOw1qfxiy

--HG--
extra : rebase_source : 4444849c190f7128d67c53483866ac59c73b2eb9
2017-07-28 11:48:56 +00:00
Sebastian Hengst
915c63c332 merge mozilla-central to mozilla-inbound. r=merge a=merge 2017-07-31 11:28:37 +02:00
Nicholas Nethercote
72c884bf74 Bug 1384835 (part 3, attempt 2) - Remove the Preferences::Get*CString() variants that return nsAdoptingCString. r=froydnj.
--HG--
extra : rebase_source : d317b25be2ec21d1a60d25da3689e46cdce0b649
2017-07-31 14:28:48 +10:00
Nicholas Nethercote
d4f9aa5530 Bug 1384835 (part 2, attempt 2) - Remove the Preferences::Get*String() variants that return nsAdoptingString. r=froydnj.
--HG--
extra : rebase_source : 6c24fbacb03d4adebe5f22b5e7fc60b069913f20
2017-07-31 14:23:50 +10:00