mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
ebda1f73c4
- Bug 1208341 - Make NativeObject::goodElementsAllocationAmount fallible. r=Waldo (64eac96aa2) - minor reformat (95d27e5332) - Bug 1214049 - Use ReportOutOfMemory in NativeObject::goodElementsAllocationAmount. r=Waldo (6779dd81c6) - Bug 1206700 - Fix an bug in property assignment, recently exposed by Reflect.set. r=waldo (0a7484ab70) - Bug 1186810 (part 1) - Replace nsBaseHashtable::EnumerateRead() calls in dom/workers/ with iterators. r=nsm. (05a550c94f) - Bug 1186810 (part 2) - Replace nsBaseHashtable::EnumerateRead() calls in dom/workers/ with iterators. r=nsm. (f1659abf38) - Bug 1186810 (part 3) - Replace nsBaseHashtable::EnumerateRead() calls in dom/workers/ with iterators. r=nsm. (cda73950f3) - Bug 1186810 (part 4) - Replace nsBaseHashtable::EnumerateRead() calls in dom/workers/ with iterators. r=nsm. (555e83bacb) - Bug 1186810 (part 5) - Replace nsBaseHashtable::EnumerateRead() calls in dom/workers/ with iterators. r=nsm. (c9520dbc5f) - Bug 1186810 (part 6) - Replace nsBaseHashtable::EnumerateRead() calls in dom/workers/ with iterators. r=khuey. (24fcdfd772) - Bug 1186810 (part 7) - Replace nsBaseHashtable::EnumerateRead() calls in dom/workers/ with iterators. r=khuey. (657cd575fb) - Bug 1186810 (part 8) - Replace nsBaseHashtable::Enumerate() calls in dom/workers/ with iterators. r=khuey. (0ff6a5e5ff) - Bug 1205020 - Disable optimizations in TestTuple.cpp since it breaks the build on VS2013 Windows 10. r=froydnj (1c98d8485c) - Bug 1199068 - Soothe a unused variable warning in TestSplayTree.cpp. r=nfroyd (d4d4ab56fe) - Bug 1209751 - Make sync decoding more reliable when nsImageRenderer is used with -moz-element. r=roc (95c99bb907) - Bug 1209731 - Return DrawResult::NOT_READY from PaintBackgroundWithSC if we couldn't prepare the nsImageRenderer. r=tn (8bd98872cb) - Bug 1209715 - Add operator overloads for combining DrawResults. r=tn (f3a9806d03) - Bug 1209725 - Use DrawResult combining operators in nsCSSRendering::PaintBackgroundWithSC. r=tn (420cfde63e) - Bug 1211363. Calculate min inset blur with max border radius. r=mstange (5e408bc67f) - Bug 1213545. Carry x,y offsets with inset box shadows. r=mstange (52c20715bc) - Bug 1209739 - Make nsImageRenderer::PrepareImage() fail unless an image has STATUS_LOAD_COMPLETE. r=tn (c1cc4d79d8) - Bug 1209765 (Part 1) - Support sync decoding of border-image in nsCSSRendering. r=tn (3a54b7d117) - Bug 1209765 (Part 2) - Support sync decoding and track draw results in nsDisplayBorder. r=tn (03abe63e67) - Bug 1209765 (Part 3) - Support sync decoding and track draw results when drawing borders in nsButtonFrameRenderer. r=tn (107b9bb851) - Bug 1209765 (Part 4) - Support sync decoding and track draw results when drawing borders in nsFieldSetFrame. r=tn (16fd30aba3) - Bug 1209765 (Part 5) - Support sync decoding and track draw results when drawing borders in nsRangeFrame. r=tn (289de3c17e) - Bug 1209765 (Part 6) - Support sync decoding and track draw results when drawing borders in nsColumnSetFrame. r=tn (0317d6a914) - Bug 1143267 - Make nsDisplayAltFeedback use nsGenericImageGeometry. r=tn (8fc6372d48) - Bug 1176081. Add a pref to control drawing of the image loading place holder icon and border, and disable it. r=seth (792e8ec9b3) - Bug 1209765 (Part 7) - Support sync decoding and track draw results when drawing borders in nsImageFrame. r=tn (70d9af60a3) - Bug 1209765 (Part 8) - Support sync decoding and track draw results when drawing borders in MathML code. r=tn (555bff2635) - Bug 1209765 (Part 9) - Support sync decoding and track draw results when drawing borders in nsTableFrame. r=tn (d242dc5c79) - Bug 1209765 (Part 10) - Support sync decoding and track draw results when drawing borders in nsGroupBoxFrame. r=tn (a7187cfa5d) - Bug 1209765 (Part 11) - Support sync decoding and track draw results when drawing borders in nsTreeBodyFrame. r=tn (21bd2b3285) - Bug 1209765 (Followup) - Add very minor fuzz to underline-button-2.html on OS X 10.10. r=me (04cff3c2ff) - Bug 1209765 (Followup) - Add very minor fuzz to underline-button-1.html on OS X 10.10. r=me DONTBUILD (187fdb4106) - Bug 1217069 - Don't attempt to mis-optimize JSON.stringify's filter-list creation for replacer arrays with trailing holes. r=arai (04fb907d42) - Bug 1156463 - Add a preference option to disable the scale transform applied to MathML operators. r=karl (415a041117) - Bug 1174143 - Remove private tables for Standard Symbols L and MathJax fonts. r=karlt (1f58d14229) - Bug 1222297 - Use channel->Open2() in netwerk/base/nsNetUtil.cpp (r=sicking) (cbd12ebb0a) - Bug 1139709. Remove unused parameters from nsMathMLChar::GetMaxWidth. r=mats (6ea90a0a02) - Bug 1160635 patch 1 - Add reftests. r=dholbert (b58f8fd7fa) - Bug 1160635 patch 2 - Stop making image resizing optimization when image has percent width or height. r=dholbert (9ae3621baf) - Bug 1156097 - Make nsImageFrame::mImageMap an nsRefPtr; r=roc (b49157e424) - Bug 1176156. Make sure images are asked to decode if we are drawing the alt feedback instead of the image. r=seth (8d7a09622e) - Bug 1207355 (Part 2) - Stop requesting decodes in nsImageLoadingContent. r=tn (c781285098) - Bug 1207355 (Part 3) - Request decodes intelligently in nsImageFrame. r=tn (c61b7591fb) - Bug 1156028 - Teach clang-analyzer about XPCOM assertion macros; r=froydnj (4d8b7ecf03) - Bug 1207355 (Part 4) - Request decodes intelligently in nsBulletFrame. r=tn (2d7ced9c0f) - Bug 1207355 (Part 5) - Request decodes intelligently in MultipartImage. r=tn (c0cb580838) - Bug 1207355 (Part 6) - Only respect StartDecoding() in imgRequest/imgRequestProxy. r=tn (0e108cda4c) - Bug 1207355 (Part 7) - Only trigger intrinsic size decode in FinalizeDecoder() if StartDecoding() was called. r=tn (a71fc0d1b7) - Bug 1207355 (Part 8) - Remove imgIContainer::RequestDecode() and imgIRequest::RequestDecode(). r=tn (fbce1ccbe1) - Bug 1215596 - outline: auto; will render as outline: solid; when disabled. r=roc (b8ea369628) - Bug 1180966. Remove code that made no sense. r=mstange (eac62913ef) - Bug 1217905. Don't transform dest rects if destination context has a rotation with inset box shadows. r=mstange (53cf4d6f86) - Bug 1189010. In ScrollFrameHelper::BuildDisplayList decide if we are building a scrollable layer before we call AppendScrollPartsTo because it needs this information. r=mstange (a008c7e34d) - Bug 1204535 - Flatten conditional structure one level. r=tn (152ff398a0) - Bug 1204535 - Remove no-op code. r=tn (95d17e64c3) - Bug 1204535 - Collapse redundant conditional block. r=tn (d0e90b8d80) - Bug 1204535 - Rename usingDisplayport to usingDisplayPort for consistency. r=tn (516757a933) - Bug 1204535 - Relocate comment to go with the line of code it's commenting. r=tn (70ae0c5e71) - Bug 1204535 - Hoist out the code to initially compute usingDisplayPort. r=tn (4a5336a480) - Bug 1210578. Part 1. Rename mShouldBuildScrollableLayer to mWillBuildScrollableLayer to better capture the meaning of the variable. r=mstange (d13bb100f4) - Bug 1210578. Part 2. Rename shouldBuildLayer to couldBuildLayer to better reflect it's actual meaning. r=mstange (ae21c687c2) - Bug 1151663 - Only call GetOrMaybeCreateDisplayPort() in nsLayoutUtils::PaintFrame() if we are using containers for root scroll frames. r=tn (2bef3f9457) - Bug 1195431 - Small refactoring to use conditionals consistently. r=tn (897eb0f42a) - Bug 1167069 - Initialize nsPluginFrame::mInstanceOwner to null. r=jmathies (6ce1fcb8c2) - Bug 1137944 - Add support for hiding plugin windows during async dom scroll operations managed in the content process. r=roc (730a0ed004) - Bug 1210578. Part 3. Create DecideScrollableLayer that encapsulates all logic to create display ports and build scrollable layers. r=mstange (994ac6ec5e) - Bug 376679 part.1 Change the result of EventStateManager::ComputeScrollTarget() from nsIScrollableFrame* to nsIFrame* r=smaug (914878edbd) - Bug 376679 part.2 EventStateManager should treat plugin frame as scrollable frame if the plugin wants to handle wheel events as default action r=smaug (58c146b7ba) - Bug 376679 part.3 Compute default action target frame for wheel event before deciding the action because plugin should decide what is the default action when the target is a plugin frame r=smaug (334cbfcf53) - Bug 376679 part.4 Manage wheel transaction at sending a wheel event to target plugin r=smaug (d76062a429) - Bug 376679 part.5 nsPluginInstanceOwner::ProcessEvent() should create WM_MOUSE*WHEEL message from WidgetWheelEvent data r=smaug+jimm (56ee6bdf90) - Bug 376679 part.6 nsPluginInstanceOwner::ProcessEvent() should refer both deltaMode and system scroll amount settings when it generates WM_MOSUE*WHEEL messages r=jimm (927cb10a3b) - Bug 1145546 - Add missing nsBidiPresUtils.h include to nsGfxScrollFrame.cpp to fix non-unified bustage. r=jfkthame (af4043c024) - Bug 1137944 - Add plugin window handling for apz related notifications received by the content process. r=mstange (798e9676fd) - Bug 1208819 - Fix irregexp overrecursion check to ignore interrupts. r=bhackett (c845e65a2e) - Bug 1218640 - IonMonkey: MIPS64: Add support into irregexp. r=arai (613ddd95ef) - Bug 1211964 - Fix a couple of OOM handling issues in regexp code r=terrence (bb269eef3e) - Bug 1200734 - Use stable hashing for LiveScopesMap; r=shu (1d717c8f53) - Bug 1223853 - Use stable hashing for ObjectValueMap; r=jonco (c91f3b1b21) - Bug 1223863 - Use stable hashing for WeakGlobalObjectSet; r=jonco (eb29e841f1) - Bug 1223918 - Use stable hashing for WatchPointMap; r=jonco (7a69630c83) - Bug 1212011 - Replace more uses of CrashAtUnhandlableOOM() with AutoEnterOOMUnsafeRegion r=terrence (0079439d90) - Bug 1224347 - Use stable hashing for DebuggerWeakMaps; r=jonco (d2a627e077) - Bug 1219418 - Always access minEmptyChunkCount under the GC lock; r=jonco (f67f74ca57) - Bug 1202923 - Encapsulate GC begin and end notification callbacks in an RAII guard; r=jonco (46f63fd090) - Bug 1212624 - Tests for LinkedList, r=Waldo (3d48b12918) - Bug 1215752 - Weakmap refactoring, r=terrence (90cbf4d294) - Bug 1216744 - Move weakKeys to the zone, r=terrence (5fdb1d57bf) - Bug 1215336 - Measure unmark gray time, r=terrence (278e0ee562) - Bug 1211939 - Don't call JSRuntime::onOutOfMemory from helper threads. r=jonco (86c6906421) - Bug 1218638 - IonMonkey: MIPS64: Add support into jit/shared. r=lth (e4f2904c53) - Bug 1216277 - Don't assert properties of the buffer location if the assembler is out of memory r=jandem (65556e83ce) - Bug 1211962 - addNativeToBytecodeEntry: Check that the masm.currentOffset() returns a valid result. r=djvj (3c5723c65a) - Bug 1090957 - IonMonkey: Add temp registers for mips atomics. r=lth (00f23fe2e9) - Bug 1218967 - Do not stop executing autospider.sh on test failure. r=sfink (75f912efbb) - Bug 1213881 - Run jsapi-tests in the arm64-sim autospider. r=sfink (2e731f14e7) - Bug 1216607 - Fix assertion failure ARM assembler on OOM r=jandem (0bc2dcb5db) - Bug 1209515 part 1 - IonBuilder: Attach hit counts on the MIRGraph. r=bhackett (f5448d9596) - Bug 1209515 part 2 - Ensure that MPhi removal considers removed uses. r=bhackett (95de413c50) - Bug 1209515 part 3 - IonMonkey: Add branch pruning based on code coverage counters. r=bhackett (fb71022658) - Bug 1209515 part 0 - Move callerResumePoint field next to other resume points of basic blocks. r=bbouvier (394b52860d) - Bug 1209515 part 4 - Increment code coverage counters on bailouts. r=bhackett (22edac5c24) - Bug 1209515 part 5 - Ensure that we recompile when we have frequent bailouts caused by the first execution. r=jandem (bca0fa4118) - Bug 1209515 part 7 - IonBuilder: pushLoop should not infer the continuepc from the entry block. r=jandem (025d10fd57) - Bug 1209515 part 8 - IonBuilder: newOsrPreheader should not use the hit-count of the loop. r=jandem (5db05ef17f) - Bug 1209515 part 9 - IonBuilder: Loop header should use the hit count of the loop, instead of before the loop. r=jandem (b259b490bf) - Bug 1209515 part 10 - Prevent PruneUnusedBranches from being greedy while removing branches which have only be visited a few times. r=bhackett (4a1a7b34b6) - Bug 1209515 part 11 - Increase JitSpewer mask size to avoid overflow. r=bbouvier (28546de94e) - Bug 1219401 - Don't call script->hasIonScript() off-thread, fixes a TSan race. r=h4writer (8f31724484) - Bug 1172076 - Assert that SnapshotIterator::initInstructionResults always match the recover instructions data. r=jandem (6ed0eebc65) - Bug 1209260 - Don't use sincos on iOS r=npb (eaa3cacac7) - Bug 1222499 - "JitSpew/IonSpew: warmupCounter should use PRIu32 instead of PRIuSIZE". r=nbp (50b80b985a) - Bug 1216182: Rename MODE_MASK to MODE_BITS_MASK, r=hv1989 (f28e461d94) - Bug 1137944 - Add a pref to control plugin window hiding. r=roc (691dc99b94) - Bug 1214878 - When async scrolling with e10s hide windowed plugins in sub documents. r=roc (79c0eac459) - Bug 1215434 part.1 If scroll target is a plugin frame, EventStateManager::PostHandleEvent() should send the wheel event to the plugin frame even if APZC already handled it r=smaug (f2e8e33d7f) - Bug 1215434 part.2 Add plugin frame rect to dispatch-to-content region if it wants to handle wheel event as default action r=mstange (dbecb1e256) - Fix inactive scroll frames sometimes creating very large, incorrect hit regions. (bug 1190112, r=tn) (2056d8d63e) - Fix scrollbars on subframes not directing APZ events to the correct scrollframe. (bug 1213324, r=tn) (0594923ab2) - Bug 1182017. Call Send__delete__ immediately rather than through an event. r=nical (90714b065b) - Bug 1212656 - ARM64: Fix automation build failures. (r=efaust) (5695518dd1) - Bug 1137944 - Simplify the api associated with hiding e10s plugin widgets. r=roc (dfbfda4d31) - Bug 1137944 - Fire before and after composite events. r=matt.woodrow (0048aeb8cb) - Bug 1201660 - When layer tree updates get dropped, hide plugins associated with the tree. Fixes a bug where we were hiding all plugins associated with the window. r=matt.woodrow (9352150c73) - Bug 1137944 - Backout compositor bits (cset b4711fa5f734) which caused a telemetry metric regression. r=backout (241659d6a8) - Bug 1127270: Only acquire a hold on the compositor thread once the channel for a parent actor has been succesfully connected. r=nical (1d1b077d68) - Bug 1207270 - Ensure that the TaskThrottler objects are created on the main thread. r=botond (b43af025f1) - Bug 1194876 - Add test. r=botond (440c72ec81) - Bug 1152051 - Gtest. r=Cwiiis,kats (011f066f37) - Bug 1144112 - Update the FlingStop tests to check if events are flowing properly after the fast-motion blocks are done. r=botond (25f71629d7) - Bug 1092128 - Ensure that when touch-action is enabled the gtests always provide default touch behaviours where expected. r=botond (3f0d1229f3) - Bug 1144112 - Only set the default allowed touch behaviour if the event is not consumed, to have the tests better reflect reality. r=botond (1548bd14bb) - Bug 1163845 - Unify handling of time in APZ gtests. r=kats (b73a16ef5e) - Bug 1159398 - Set the controller thread when running APZ gtests. r=dvander (96b551036e) - Bug 1159985 - Gtest. r=kats (23d7d86492) - Bug 1159985 - In APZ gtests, allow panning in both directions. r=kats (14f4b1156a) - Bug 1169695 - Make the test timestamp privately held by the MockContentControllerDelayed. r=botond (ffe04249c1) - Bug 1198900 - Add a gtest to ensure we don't crash when prevent-defaulting a wheel event. r=botond, a=topcrash (c9e5993f18) - Bug 1169690 - Gtests. r=kats (7e825b34ac) - Bug 1207270 - Update tests to ensure that TaskThrottlers are created as appropriate. r=botond (7bb6f1f406) - Bug 1169695 - Ensure timed tasks are dispatched appropriately when advancing the time. r=botond (af1fbe0a85) - Bug 1204837, Part 1: Make ClosingService thread Nuwa-friedly. r=khuey (eb790b5215) - Bug 1204837, Part 2: Cloned ImageBridgeParent and CompositorParent should hold a reference to the compositor thread. r=nical (cd742df2e2) - Bug 1205016: double ClosingService thread stack size to avoid stack overflow r=glandium (cb9acc828f) - Bug 1163570 - Ignore pending plugin updates and hide plugin windows when a remote layer tree associated with a tab is no longer in use. r=roc (ae852ad442) - Bug 1196539 - Apply plugin config using AutoResolveRefLayers during composition. r=matt.woodrow (12dbdb6222) - Bug 1137944 - Cache compositor plugin update data to avoid sending updates to the main thread when the data doesn't change. r=roc (63c503d2f6) - Bug 1137944 - On Windows defer composition until we receive confirmation plugin window metrics have been updated. r=roc (39d5786519) - Bug 1137944 - Move plugin window metrics updates to a point during comososition where we know the remote layer tree is hooked up to the chrome layer tree. r=matt.woodrow (a32f77ffb1) - Bug 1213671 - CompositorParent::UpdatePluginWindowState should always return an accurate result indicating when an ipc request for plugin geometry updates was sent. r=roc (311e65a8ce) - Bug 1214267 - Send the side to which fixed-pos items are attached so that we can move them in the compositor more correctly when the viewport size is changing. r=mattwoodrow (fa2de207cd) - Bug 1209964 - In AlignFixedAndStickyLayers(), properly handle the case where a fixed or sticky layer is its own subtree root and has a local transform. r=kats (1a6922699a) - Bug 1213762 - Clear AsyncCompositionManager::mIsFirstPaint on non-Android platforms, too. r=mstange (c4cf2b722a) - Bug 1223436 - Fix AsyncCompositionManager so that mLayersUpdated is only set to false after SyncFrameMetrics has been called. r=kats (f3fa84325b) - bits of 1073545 (3bc7d76081) - Bug 1213795, Part 1: Don't fire timers in the Nuwa process to fix test case test_NuwaProcessDeadlock.html. r=khuey (5ebca946e5) - Bug 1213795, Part 2: Fix protocol cloning of actor CrossProcessCompositorParent. r=khuey (92969e2b06) - spacing (f4857ed898) - Bug 1213758 - Aquire the inderect layer trees data lock during plugin window update calculations. r=matt.woodrow (ae70d955ec) - Bug 1208502 - Use more smart pointers in XULDocument. r=smaug (20a92d72e8) - Bug 1193086 - Remove some null checks of infallible new code in XUL. r=baku (2f463c5a3d) - Bug 1217190 - Make PrintingParent return an nsresult when attempting to show print progress. r=bobowen (addf31f3a7) - Bug 1217190 - Make sure to initialize outparam in PrintingParent::RecvShowProgress. r=bobowen (f6c11a0181) - Bug 1152921 - Don't send an uninitialized PrintData over IPC when cancelling print dialog (or failing ShowPrintDialog for other reasons). r=mconley (4ea146ccf1) - Bug 1178233 - [non-e10s] The update process doesn't work within about:serviceworkers in non-e10s mode. r=baku (7a08441bec) - Bug 929846 - Considering key size when calculating quota usage. r=jdm (a97ddc7906) - Bug 1194049 - Part 3: support device update; r=fabrice (6ba600a03d) - Bug 1194049 - Part 1: add thread assertion; r=schien (68c4658ae0) - Bug 1194049 - Part 2: add discovery timeout support; r=schien (14f5f537d5) - Bug 1194049 - Part 4: clear discovered devices when re-discover; r=schien (e2ecdb573f) - Bug 1136565 - report session request from device provider. r=xeonchen,junior,seanlin. (19daa67751) - Bug 1216398 - support non-discoverable controlling device. r=junior,xeonchen. (7383401dbc) - Bug 1200132 - Use adderss to create socketTransport, r=schien, junior (263d253562) - Bug 1200132 - Part1: Get address info after service resolved, r=mcmanus (9bcc344d20) - Bug 1200132 - Part2: Get IP address by calling InetAddress.getHostAddress(), r=mcmanus, rnewman (502c243314) - Bug 1173334: Open nfcd connections with socket type SOCK_SEQPACKET, allstars.chh (03a11dc077) - Bug 1173802: Move NFC socket and messaging code into |NfcConsumer|, r=allstars.chh (f92946b40e) - Bug 1173802: Run |NfcConsumer| on NFC thread, r=allstars.chh (87989483a7) - Bug 1173802: Clean up |NfcEventDispatcher|, r=allstars.chh (87f58b7310) - Bug 1173802: Replace |assertIsNfcServiceThread| with thread-safe checks, r=allstars.chh (1a6a76ae05) - Bug 1173802: Store global NFC service in ref-counted variable, r=allstars.chh (a33c025976) - Bug 1188639 - Fix typo in BrowserElement.webidl and add tests for it. r=yoshi,bz (7b657a335d) - Bug 1175387 - close file descriptor after detached from STS. r=mcmanus (377943bad5) - Bug 1190069 - Fix uninitialized variable in MDNSResponderOperator.cpp. r=xeonchen (ebf47b613e) - Bug 1217807 - Part 1: use ServiceWatcher to extend life cycle of mDNS operators; r=schien (70201259d2) - missing namespace (c6bccda1e5) - Bug 1209843 - Stop checking for UNKNOWN_APP_ID in all places except those where AppId() is explicitly queried. r=sicking (e364223906) - Bug 1168337: Kill the processes on startup of the Nuwa test case fix the abort in the preallocated process. r=khuey (501a30cb9b) - Bug 1202424 - Free shared memory when IPC system shuts down, not after. r=mrbkap (f718cbf801) - Bug 1209987 - webrtc.org Engine creation and destruction should happen on the WebRTC threads. r=jesup (4bbab795cf) - Bug 1214675 - Factor out cleanup functions to avoid deadlock/dispatch-without-IPC. r=jesup (bd466c85e4) - Bug 1210560 - Part 2: Convert some simple users to use PushGroupForBlendBack. r=jrmuizel (158b532f9f) - Bug 1174785 - Part 0: Use mozilla/StaticPtr.h in signaling. r=jesup (c98ec23ee0) - Bug 1174785 - Part 1: Add LogModule, LogModuleManager, and LazyLogModule. r=froydnj (e797bca424) - Bug 1195867 - Hoist StateWatching and StateMirroring into XPCOM. r=froydnj (a62fbbf749) - Bug 1194631 - Make firefox build with --disable-logging. r=jrmuizel (ba8238dc42) - Bug 1174785 - Part 2: Convert xpcom over to LogModule. r=froydnj (ccb119d496) - Bug 1205237 - Part 2: add PresentationNetworkHelper; r=schien (be47702ffe) - Bug 1205237 - Part 3: get self Wi-Fi IP address; r=seanlin (f31163e895) - Bug 1217683 - Add sendIceCandidate and implement |close(aReason)| in TCPControlChannel. r=fabrice (0004ea93f1) - Bug 1217807 - Part 2: Handle network online/offline event in TCPPresentationServer; r=junior (48c9236adb) - Bug 1217807 - disable MDNS discovery. r=xeonchen. (ee3cb0ddb6)
1651 lines
42 KiB
C++
1651 lines
42 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "MediaDecoder.h"
|
|
#include "mozilla/FloatingPoint.h"
|
|
#include "mozilla/MathAlgorithms.h"
|
|
#include <limits>
|
|
#include "nsIObserver.h"
|
|
#include "nsTArray.h"
|
|
#include "VideoUtils.h"
|
|
#include "MediaDecoderStateMachine.h"
|
|
#include "ImageContainer.h"
|
|
#include "MediaResource.h"
|
|
#include "nsError.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "mozilla/StaticPtr.h"
|
|
#include "nsIMemoryReporter.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include <algorithm>
|
|
#include "MediaShutdownManager.h"
|
|
#include "AudioChannelService.h"
|
|
#include "mozilla/dom/AudioTrack.h"
|
|
#include "mozilla/dom/AudioTrackList.h"
|
|
#include "mozilla/dom/HTMLMediaElement.h"
|
|
#include "mozilla/dom/VideoTrack.h"
|
|
#include "mozilla/dom/VideoTrackList.h"
|
|
|
|
using namespace mozilla::dom;
|
|
using namespace mozilla::layers;
|
|
using namespace mozilla::media;
|
|
|
|
// Default timeout msecs until try to enter dormant state by heuristic.
|
|
static const int DEFAULT_HEURISTIC_DORMANT_TIMEOUT_MSECS = 60000;
|
|
|
|
namespace mozilla {
|
|
|
|
// The amount of instability we tollerate in calls to
|
|
// MediaDecoder::UpdateEstimatedMediaDuration(); changes of duration
|
|
// less than this are ignored, as they're assumed to be the result of
|
|
// instability in the duration estimation.
|
|
static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
|
|
|
|
// avoid redefined macro in unified build
|
|
#undef DECODER_LOG
|
|
|
|
PRLogModuleInfo* gMediaDecoderLog;
|
|
#define DECODER_LOG(x, ...) \
|
|
MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("Decoder=%p " x, this, ##__VA_ARGS__))
|
|
|
|
static const char*
|
|
ToPlayStateStr(MediaDecoder::PlayState aState)
|
|
{
|
|
switch (aState) {
|
|
case MediaDecoder::PLAY_STATE_START: return "START";
|
|
case MediaDecoder::PLAY_STATE_LOADING: return "LOADING";
|
|
case MediaDecoder::PLAY_STATE_PAUSED: return "PAUSED";
|
|
case MediaDecoder::PLAY_STATE_PLAYING: return "PLAYING";
|
|
case MediaDecoder::PLAY_STATE_ENDED: return "ENDED";
|
|
case MediaDecoder::PLAY_STATE_SHUTDOWN: return "SHUTDOWN";
|
|
default: MOZ_ASSERT_UNREACHABLE("Invalid playState.");
|
|
}
|
|
return "UNKNOWN";
|
|
}
|
|
|
|
class MediaMemoryTracker : public nsIMemoryReporter
|
|
{
|
|
virtual ~MediaMemoryTracker();
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIMEMORYREPORTER
|
|
|
|
MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf);
|
|
|
|
MediaMemoryTracker();
|
|
void InitMemoryReporter();
|
|
|
|
static StaticRefPtr<MediaMemoryTracker> sUniqueInstance;
|
|
|
|
static MediaMemoryTracker* UniqueInstance() {
|
|
if (!sUniqueInstance) {
|
|
sUniqueInstance = new MediaMemoryTracker();
|
|
sUniqueInstance->InitMemoryReporter();
|
|
}
|
|
return sUniqueInstance;
|
|
}
|
|
|
|
typedef nsTArray<MediaDecoder*> DecodersArray;
|
|
static DecodersArray& Decoders() {
|
|
return UniqueInstance()->mDecoders;
|
|
}
|
|
|
|
DecodersArray mDecoders;
|
|
|
|
public:
|
|
static void AddMediaDecoder(MediaDecoder* aDecoder)
|
|
{
|
|
Decoders().AppendElement(aDecoder);
|
|
}
|
|
|
|
static void RemoveMediaDecoder(MediaDecoder* aDecoder)
|
|
{
|
|
DecodersArray& decoders = Decoders();
|
|
decoders.RemoveElement(aDecoder);
|
|
if (decoders.IsEmpty()) {
|
|
sUniqueInstance = nullptr;
|
|
}
|
|
}
|
|
};
|
|
|
|
StaticRefPtr<MediaMemoryTracker> MediaMemoryTracker::sUniqueInstance;
|
|
|
|
#if defined(PR_LOGGING)
|
|
PRLogModuleInfo* gMediaTimerLog;
|
|
PRLogModuleInfo* gMediaSampleLog;
|
|
#endif
|
|
|
|
void
|
|
MediaDecoder::InitStatics()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
#if defined(PR_LOGGING)
|
|
// Log modules.
|
|
gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
|
|
gMediaTimerLog = PR_NewLogModule("MediaTimer");
|
|
gMediaSampleLog = PR_NewLogModule("MediaSample");
|
|
#endif
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(MediaMemoryTracker, nsIMemoryReporter)
|
|
|
|
NS_IMPL_ISUPPORTS0(MediaDecoder)
|
|
|
|
void
|
|
MediaDecoder::NotifyOwnerActivityChanged()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
|
|
|
|
if (!mOwner) {
|
|
NS_WARNING("MediaDecoder without a decoder owner, can't update dormant");
|
|
return;
|
|
}
|
|
|
|
UpdateDormantState(false /* aDormantTimeout */, false /* aActivity */);
|
|
// Start dormant timer if necessary
|
|
StartDormantTimer();
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsHeuristicDormantSupported() const
|
|
{
|
|
return
|
|
#if defined(MOZ_EME)
|
|
// We disallow dormant for encrypted media until bug 1181864 is fixed.
|
|
mInfo &&
|
|
!mInfo->IsEncrypted() &&
|
|
#endif
|
|
mIsHeuristicDormantSupported;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::UpdateDormantState(bool aDormantTimeout, bool aActivity)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (!mDecoderStateMachine ||
|
|
mPlayState == PLAY_STATE_SHUTDOWN ||
|
|
!mOwner->GetVideoFrameContainer() ||
|
|
(mOwner->GetMediaElement() && mOwner->GetMediaElement()->IsBeingDestroyed()) ||
|
|
!mDormantSupported)
|
|
{
|
|
return;
|
|
}
|
|
|
|
DECODER_LOG("UpdateDormantState aTimeout=%d aActivity=%d mIsDormant=%d "
|
|
"ownerActive=%d ownerHidden=%d mIsHeuristicDormant=%d "
|
|
"mPlayState=%s encrypted=%s",
|
|
aDormantTimeout, aActivity, mIsDormant, mOwner->IsActive(),
|
|
mOwner->IsHidden(), mIsHeuristicDormant, PlayStateStr(),
|
|
(!mInfo ? "Unknown" : (mInfo->IsEncrypted() ? "1" : "0")));
|
|
|
|
bool prevDormant = mIsDormant;
|
|
mIsDormant = false;
|
|
if (!mOwner->IsActive()) {
|
|
mIsDormant = true;
|
|
}
|
|
#ifdef MOZ_WIDGET_GONK
|
|
if (mOwner->IsHidden()) {
|
|
mIsDormant = true;
|
|
}
|
|
#endif
|
|
|
|
// Try to enable dormant by idle heuristic, when the owner is hidden.
|
|
bool prevHeuristicDormant = mIsHeuristicDormant;
|
|
mIsHeuristicDormant = false;
|
|
if (IsHeuristicDormantSupported() && mOwner->IsHidden()) {
|
|
if (aDormantTimeout && !aActivity &&
|
|
(mPlayState == PLAY_STATE_PAUSED || IsEnded())) {
|
|
// Enable heuristic dormant
|
|
mIsHeuristicDormant = true;
|
|
} else if(prevHeuristicDormant && !aActivity) {
|
|
// Continue heuristic dormant
|
|
mIsHeuristicDormant = true;
|
|
}
|
|
|
|
if (mIsHeuristicDormant) {
|
|
mIsDormant = true;
|
|
}
|
|
}
|
|
|
|
if (prevDormant == mIsDormant) {
|
|
// No update to dormant state
|
|
return;
|
|
}
|
|
|
|
if (mIsDormant) {
|
|
DECODER_LOG("UpdateDormantState() entering DORMANT state");
|
|
// enter dormant state
|
|
mDecoderStateMachine->DispatchSetDormant(true);
|
|
if (IsEnded()) {
|
|
mWasEndedWhenEnteredDormant = true;
|
|
}
|
|
mNextState = mPlayState;
|
|
ChangeState(PLAY_STATE_LOADING);
|
|
} else {
|
|
DECODER_LOG("UpdateDormantState() leaving DORMANT state");
|
|
// exit dormant state
|
|
mDecoderStateMachine->DispatchSetDormant(false);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::DormantTimerExpired(nsITimer* aTimer, void* aClosure)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(aClosure);
|
|
MediaDecoder* decoder = static_cast<MediaDecoder*>(aClosure);
|
|
decoder->UpdateDormantState(true /* aDormantTimeout */,
|
|
false /* aActivity */);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::StartDormantTimer()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (!IsHeuristicDormantSupported()) {
|
|
return;
|
|
}
|
|
|
|
if (mIsHeuristicDormant ||
|
|
mShuttingDown ||
|
|
!mOwner ||
|
|
!mOwner->IsHidden() ||
|
|
(mPlayState != PLAY_STATE_PAUSED &&
|
|
!IsEnded()))
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (!mDormantTimer) {
|
|
mDormantTimer = do_CreateInstance("@mozilla.org/timer;1");
|
|
}
|
|
mDormantTimer->InitWithFuncCallback(&MediaDecoder::DormantTimerExpired,
|
|
this,
|
|
mHeuristicDormantTimeout,
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::CancelDormantTimer()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mDormantTimer) {
|
|
mDormantTimer->Cancel();
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::Pause()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mPlayState == PLAY_STATE_LOADING ||
|
|
IsEnded()) {
|
|
mNextState = PLAY_STATE_PAUSED;
|
|
return;
|
|
}
|
|
|
|
ChangeState(PLAY_STATE_PAUSED);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetVolume(double aVolume)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mVolume = aVolume;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::AddOutputStream(ProcessedMediaStream* aStream,
|
|
bool aFinishWhenEnded)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mDecoderStateMachine, "Must be called after Load().");
|
|
mDecoderStateMachine->AddOutputStream(aStream, aFinishWhenEnded);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::RemoveOutputStream(MediaStream* aStream)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mDecoderStateMachine, "Must be called after Load().");
|
|
mDecoderStateMachine->RemoveOutputStream(aStream);
|
|
}
|
|
|
|
double
|
|
MediaDecoder::GetDuration()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mDuration;
|
|
}
|
|
|
|
AbstractCanonical<media::NullableTimeUnit>*
|
|
MediaDecoder::CanonicalDurationOrNull()
|
|
{
|
|
MOZ_ASSERT(mDecoderStateMachine);
|
|
return mDecoderStateMachine->CanonicalDuration();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetInfinite(bool aInfinite)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mInfiniteStream = aInfinite;
|
|
DurationChanged();
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsInfinite()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mInfiniteStream;
|
|
}
|
|
|
|
MediaDecoder::MediaDecoder() :
|
|
mWatchManager(this, AbstractThread::MainThread()),
|
|
mDormantSupported(false),
|
|
mLogicalPosition(0.0),
|
|
mDuration(std::numeric_limits<double>::quiet_NaN()),
|
|
mReentrantMonitor("media.decoder"),
|
|
mIgnoreProgressData(false),
|
|
mInfiniteStream(false),
|
|
mOwner(nullptr),
|
|
mPlaybackStatistics(new MediaChannelStatistics()),
|
|
mPinnedForSeek(false),
|
|
mShuttingDown(false),
|
|
mPausedForPlaybackRateNull(false),
|
|
mMinimizePreroll(false),
|
|
mMediaTracksConstructed(false),
|
|
mFiredMetadataLoaded(false),
|
|
mIsDormant(false),
|
|
mWasEndedWhenEnteredDormant(false),
|
|
mIsHeuristicDormantSupported(
|
|
Preferences::GetBool("media.decoder.heuristic.dormant.enabled", false)),
|
|
mHeuristicDormantTimeout(
|
|
Preferences::GetInt("media.decoder.heuristic.dormant.timeout",
|
|
DEFAULT_HEURISTIC_DORMANT_TIMEOUT_MSECS)),
|
|
mIsHeuristicDormant(false),
|
|
mStateMachineIsShutdown(AbstractThread::MainThread(), true,
|
|
"MediaDecoder::mStateMachineIsShutdown (Mirror)"),
|
|
mBuffered(AbstractThread::MainThread(), TimeIntervals(),
|
|
"MediaDecoder::mBuffered (Mirror)"),
|
|
mNextFrameStatus(AbstractThread::MainThread(),
|
|
MediaDecoderOwner::NEXT_FRAME_UNINITIALIZED,
|
|
"MediaDecoder::mNextFrameStatus (Mirror)"),
|
|
mCurrentPosition(AbstractThread::MainThread(), 0,
|
|
"MediaDecoder::mCurrentPosition (Mirror)"),
|
|
mStateMachineDuration(AbstractThread::MainThread(), NullableTimeUnit(),
|
|
"MediaDecoder::mStateMachineDuration (Mirror)"),
|
|
mPlaybackPosition(AbstractThread::MainThread(), 0,
|
|
"MediaDecoder::mPlaybackPosition (Mirror)"),
|
|
mVolume(AbstractThread::MainThread(), 0.0,
|
|
"MediaDecoder::mVolume (Canonical)"),
|
|
mPlaybackRate(AbstractThread::MainThread(), 1.0,
|
|
"MediaDecoder::mPlaybackRate (Canonical)"),
|
|
mPreservesPitch(AbstractThread::MainThread(), true,
|
|
"MediaDecoder::mPreservesPitch (Canonical)"),
|
|
mEstimatedDuration(AbstractThread::MainThread(), NullableTimeUnit(),
|
|
"MediaDecoder::mEstimatedDuration (Canonical)"),
|
|
mExplicitDuration(AbstractThread::MainThread(), Maybe<double>(),
|
|
"MediaDecoder::mExplicitDuration (Canonical)"),
|
|
mPlayState(AbstractThread::MainThread(), PLAY_STATE_LOADING,
|
|
"MediaDecoder::mPlayState (Canonical)"),
|
|
mNextState(AbstractThread::MainThread(), PLAY_STATE_PAUSED,
|
|
"MediaDecoder::mNextState (Canonical)"),
|
|
mLogicallySeeking(AbstractThread::MainThread(), false,
|
|
"MediaDecoder::mLogicallySeeking (Canonical)"),
|
|
mSameOriginMedia(AbstractThread::MainThread(), false,
|
|
"MediaDecoder::mSameOriginMedia (Canonical)"),
|
|
mPlaybackBytesPerSecond(AbstractThread::MainThread(), 0.0,
|
|
"MediaDecoder::mPlaybackBytesPerSecond (Canonical)"),
|
|
mPlaybackRateReliable(AbstractThread::MainThread(), true,
|
|
"MediaDecoder::mPlaybackRateReliable (Canonical)"),
|
|
mDecoderPosition(AbstractThread::MainThread(), 0,
|
|
"MediaDecoder::mDecoderPosition (Canonical)"),
|
|
mMediaSeekable(AbstractThread::MainThread(), true,
|
|
"MediaDecoder::mMediaSeekable (Canonical)")
|
|
{
|
|
MOZ_COUNT_CTOR(MediaDecoder);
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MediaMemoryTracker::AddMediaDecoder(this);
|
|
|
|
mAudioChannel = AudioChannelService::GetDefaultAudioChannel();
|
|
|
|
//
|
|
// Initialize watchers.
|
|
//
|
|
|
|
// mDuration
|
|
mWatchManager.Watch(mStateMachineDuration, &MediaDecoder::DurationChanged);
|
|
|
|
// mStateMachineIsShutdown
|
|
mWatchManager.Watch(mStateMachineIsShutdown, &MediaDecoder::ShutdownBitChanged);
|
|
|
|
// readyState
|
|
mWatchManager.Watch(mPlayState, &MediaDecoder::UpdateReadyState);
|
|
mWatchManager.Watch(mNextFrameStatus, &MediaDecoder::UpdateReadyState);
|
|
|
|
// mLogicalPosition
|
|
mWatchManager.Watch(mCurrentPosition, &MediaDecoder::UpdateLogicalPosition);
|
|
mWatchManager.Watch(mPlayState, &MediaDecoder::UpdateLogicalPosition);
|
|
mWatchManager.Watch(mLogicallySeeking, &MediaDecoder::UpdateLogicalPosition);
|
|
|
|
// mIgnoreProgressData
|
|
mWatchManager.Watch(mLogicallySeeking, &MediaDecoder::SeekingChanged);
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::Init(MediaDecoderOwner* aOwner)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mOwner = aOwner;
|
|
mVideoFrameContainer = aOwner->GetVideoFrameContainer();
|
|
MediaShutdownManager::Instance().Register(this);
|
|
return true;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::Shutdown()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mShuttingDown)
|
|
return;
|
|
|
|
mShuttingDown = true;
|
|
|
|
// This changes the decoder state to SHUTDOWN and does other things
|
|
// necessary to unblock the state machine thread if it's blocked, so
|
|
// the asynchronous shutdown in nsDestroyStateMachine won't deadlock.
|
|
if (mDecoderStateMachine) {
|
|
mDecoderStateMachine->DispatchShutdown();
|
|
mTimedMetadataListener.Disconnect();
|
|
}
|
|
|
|
// Force any outstanding seek and byterange requests to complete
|
|
// to prevent shutdown from deadlocking.
|
|
if (mResource) {
|
|
mResource->Close();
|
|
}
|
|
|
|
CancelDormantTimer();
|
|
|
|
ChangeState(PLAY_STATE_SHUTDOWN);
|
|
|
|
mOwner = nullptr;
|
|
|
|
MediaShutdownManager::Instance().Unregister(this);
|
|
}
|
|
|
|
MediaDecoder::~MediaDecoder()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MediaMemoryTracker::RemoveMediaDecoder(this);
|
|
UnpinForSeek();
|
|
MOZ_COUNT_DTOR(MediaDecoder);
|
|
}
|
|
|
|
nsresult
|
|
MediaDecoder::OpenResource(nsIStreamListener** aStreamListener)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (aStreamListener) {
|
|
*aStreamListener = nullptr;
|
|
}
|
|
return mResource->Open(aStreamListener);
|
|
}
|
|
|
|
nsresult
|
|
MediaDecoder::Load(nsIStreamListener** aStreamListener,
|
|
MediaDecoder* aCloneDonor)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mResource, "Can't load without a MediaResource");
|
|
|
|
nsresult rv = OpenResource(aStreamListener);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
SetStateMachine(CreateStateMachine());
|
|
NS_ENSURE_TRUE(GetStateMachine(), NS_ERROR_FAILURE);
|
|
|
|
return InitializeStateMachine(aCloneDonor);
|
|
}
|
|
|
|
nsresult
|
|
MediaDecoder::InitializeStateMachine(MediaDecoder* aCloneDonor)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
NS_ASSERTION(mDecoderStateMachine, "Cannot initialize null state machine!");
|
|
|
|
MediaDecoder* cloneDonor = static_cast<MediaDecoder*>(aCloneDonor);
|
|
nsresult rv = mDecoderStateMachine->Init(
|
|
cloneDonor ? cloneDonor->mDecoderStateMachine.get() : nullptr);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// If some parameters got set before the state machine got created,
|
|
// set them now
|
|
SetStateMachineParameters();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetStateMachineParameters()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mMinimizePreroll) {
|
|
mDecoderStateMachine->DispatchMinimizePrerollUntilPlaybackStarts();
|
|
}
|
|
mTimedMetadataListener = mDecoderStateMachine->TimedMetadataEvent().Connect(
|
|
AbstractThread::MainThread(), this, &MediaDecoder::OnMetadataUpdate);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetMinimizePrerollUntilPlaybackStarts()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
DECODER_LOG("SetMinimizePrerollUntilPlaybackStarts()");
|
|
mMinimizePreroll = true;
|
|
|
|
// This needs to be called before we init the state machine, otherwise it will
|
|
// have no effect.
|
|
MOZ_DIAGNOSTIC_ASSERT(!mDecoderStateMachine);
|
|
}
|
|
|
|
nsresult
|
|
MediaDecoder::Play()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
UpdateDormantState(false /* aDormantTimeout */, true /* aActivity */);
|
|
|
|
NS_ASSERTION(mDecoderStateMachine != nullptr, "Should have state machine.");
|
|
if (mPausedForPlaybackRateNull) {
|
|
return NS_OK;
|
|
}
|
|
|
|
if (IsEnded()) {
|
|
return Seek(0, SeekTarget::PrevSyncPoint);
|
|
} else if (mPlayState == PLAY_STATE_LOADING) {
|
|
mNextState = PLAY_STATE_PLAYING;
|
|
return NS_OK;
|
|
}
|
|
|
|
ChangeState(PLAY_STATE_PLAYING);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
MediaDecoder::Seek(double aTime, SeekTarget::Type aSeekType)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
NS_ENSURE_TRUE(!mShuttingDown, NS_ERROR_FAILURE);
|
|
|
|
UpdateDormantState(false /* aDormantTimeout */, true /* aActivity */);
|
|
|
|
MOZ_ASSERT(aTime >= 0.0, "Cannot seek to a negative value.");
|
|
|
|
int64_t timeUsecs = 0;
|
|
nsresult rv = SecondsToUsecs(aTime, timeUsecs);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
mLogicalPosition = aTime;
|
|
mWasEndedWhenEnteredDormant = false;
|
|
|
|
mLogicallySeeking = true;
|
|
SeekTarget target = SeekTarget(timeUsecs, aSeekType);
|
|
CallSeek(target);
|
|
|
|
if (mPlayState == PLAY_STATE_ENDED) {
|
|
bool paused = false;
|
|
if (mOwner) {
|
|
paused = mOwner->GetPaused();
|
|
}
|
|
PinForSeek();
|
|
ChangeState(paused ? PLAY_STATE_PAUSED : PLAY_STATE_PLAYING);
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::CallSeek(const SeekTarget& aTarget)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mSeekRequest.DisconnectIfExists();
|
|
mSeekRequest.Begin(
|
|
mDecoderStateMachine->InvokeSeek(aTarget)
|
|
->Then(AbstractThread::MainThread(), __func__, this,
|
|
&MediaDecoder::OnSeekResolved, &MediaDecoder::OnSeekRejected));
|
|
}
|
|
|
|
double
|
|
MediaDecoder::GetCurrentTime()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mLogicalPosition;
|
|
}
|
|
|
|
already_AddRefed<nsIPrincipal>
|
|
MediaDecoder::GetCurrentPrincipal()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mResource ? mResource->GetCurrentPrincipal() : nullptr;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::OnMetadataUpdate(TimedMetadata&& aMetadata)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
RemoveMediaTracks();
|
|
MetadataLoaded(nsAutoPtr<MediaInfo>(new MediaInfo(*aMetadata.mInfo)),
|
|
Move(aMetadata.mTags),
|
|
MediaDecoderEventVisibility::Observable);
|
|
FirstFrameLoaded(Move(aMetadata.mInfo),
|
|
MediaDecoderEventVisibility::Observable);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::MetadataLoaded(nsAutoPtr<MediaInfo> aInfo,
|
|
nsAutoPtr<MetadataTags> aTags,
|
|
MediaDecoderEventVisibility aEventVisibility)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mShuttingDown) {
|
|
return;
|
|
}
|
|
|
|
DECODER_LOG("MetadataLoaded, channels=%u rate=%u hasAudio=%d hasVideo=%d",
|
|
aInfo->mAudio.mChannels, aInfo->mAudio.mRate,
|
|
aInfo->HasAudio(), aInfo->HasVideo());
|
|
|
|
mInfo = aInfo.forget();
|
|
ConstructMediaTracks();
|
|
|
|
if (mOwner) {
|
|
// Make sure the element and the frame (if any) are told about
|
|
// our new size.
|
|
Invalidate();
|
|
if (aEventVisibility != MediaDecoderEventVisibility::Suppressed) {
|
|
mFiredMetadataLoaded = true;
|
|
mOwner->MetadataLoaded(mInfo, nsAutoPtr<const MetadataTags>(aTags.forget()));
|
|
}
|
|
}
|
|
}
|
|
|
|
const char*
|
|
MediaDecoder::PlayStateStr()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
switch (mPlayState) {
|
|
case PLAY_STATE_START: return "PLAY_STATE_START";
|
|
case PLAY_STATE_LOADING: return "PLAY_STATE_LOADING";
|
|
case PLAY_STATE_PAUSED: return "PLAY_STATE_PAUSED";
|
|
case PLAY_STATE_PLAYING: return "PLAY_STATE_PLAYING";
|
|
case PLAY_STATE_ENDED: return "PLAY_STATE_ENDED";
|
|
case PLAY_STATE_SHUTDOWN: return "PLAY_STATE_SHUTDOWN";
|
|
default: return "INVALID_PLAY_STATE";
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::FirstFrameLoaded(nsAutoPtr<MediaInfo> aInfo,
|
|
MediaDecoderEventVisibility aEventVisibility)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mShuttingDown) {
|
|
return;
|
|
}
|
|
|
|
DECODER_LOG("FirstFrameLoaded, channels=%u rate=%u hasAudio=%d hasVideo=%d mPlayState=%s mIsDormant=%d",
|
|
aInfo->mAudio.mChannels, aInfo->mAudio.mRate,
|
|
aInfo->HasAudio(), aInfo->HasVideo(), PlayStateStr(), mIsDormant);
|
|
|
|
mInfo = aInfo.forget();
|
|
|
|
if (mOwner) {
|
|
Invalidate();
|
|
if (aEventVisibility != MediaDecoderEventVisibility::Suppressed) {
|
|
mOwner->FirstFrameLoaded();
|
|
}
|
|
}
|
|
|
|
// This can run cache callbacks.
|
|
mResource->EnsureCacheUpToDate();
|
|
|
|
// The element can run javascript via events
|
|
// before reaching here, so only change the
|
|
// state if we're still set to the original
|
|
// loading state.
|
|
if (mPlayState == PLAY_STATE_LOADING && !mIsDormant) {
|
|
ChangeState(mNextState);
|
|
}
|
|
|
|
// Run NotifySuspendedStatusChanged now to give us a chance to notice
|
|
// that autoplay should run.
|
|
NotifySuspendedStatusChanged();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::ResetConnectionState()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mShuttingDown)
|
|
return;
|
|
|
|
if (mOwner) {
|
|
// Notify the media element that connection gets lost.
|
|
mOwner->ResetConnectionState();
|
|
}
|
|
|
|
// Since we have notified the media element the connection
|
|
// lost event, the decoder will be reloaded when user tries
|
|
// to play the Rtsp streaming next time.
|
|
Shutdown();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::NetworkError()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mShuttingDown)
|
|
return;
|
|
|
|
if (mOwner)
|
|
mOwner->NetworkError();
|
|
|
|
Shutdown();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::DecodeError()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mShuttingDown)
|
|
return;
|
|
|
|
if (mOwner)
|
|
mOwner->DecodeError();
|
|
|
|
Shutdown();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::UpdateSameOriginStatus(bool aSameOrigin)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mSameOriginMedia = aSameOrigin;
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsSeeking() const
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mLogicallySeeking;
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsEndedOrShutdown() const
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return IsEnded() || mPlayState == PLAY_STATE_SHUTDOWN;
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsEnded() const
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mPlayState == PLAY_STATE_ENDED ||
|
|
(mWasEndedWhenEnteredDormant && (mPlayState != PLAY_STATE_SHUTDOWN));
|
|
}
|
|
|
|
void
|
|
MediaDecoder::PlaybackEnded()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mShuttingDown ||
|
|
mLogicallySeeking ||
|
|
mPlayState == PLAY_STATE_LOADING) {
|
|
return;
|
|
}
|
|
|
|
ChangeState(PLAY_STATE_ENDED);
|
|
InvalidateWithFlags(VideoFrameContainer::INVALIDATE_FORCE);
|
|
|
|
if (mOwner) {
|
|
mOwner->PlaybackEnded();
|
|
}
|
|
|
|
// This must be called after |mOwner->PlaybackEnded()| call above, in order
|
|
// to fire the required durationchange.
|
|
if (IsInfinite()) {
|
|
SetInfinite(false);
|
|
}
|
|
}
|
|
|
|
MediaStatistics
|
|
MediaDecoder::GetStatistics()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mResource);
|
|
|
|
MediaStatistics result;
|
|
result.mDownloadRate = mResource->GetDownloadRate(&result.mDownloadRateReliable);
|
|
result.mDownloadPosition = mResource->GetCachedDataEnd(mDecoderPosition);
|
|
result.mTotalBytes = mResource->GetLength();
|
|
result.mPlaybackRate = mPlaybackBytesPerSecond;
|
|
result.mPlaybackRateReliable = mPlaybackRateReliable;
|
|
result.mDecoderPosition = mDecoderPosition;
|
|
result.mPlaybackPosition = mPlaybackPosition;
|
|
return result;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::ComputePlaybackRate()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mResource);
|
|
|
|
int64_t length = mResource->GetLength();
|
|
if (!IsNaN(mDuration) && !mozilla::IsInfinite<double>(mDuration) && length >= 0) {
|
|
mPlaybackRateReliable = true;
|
|
mPlaybackBytesPerSecond = length / mDuration;
|
|
return;
|
|
}
|
|
|
|
bool reliable = false;
|
|
mPlaybackBytesPerSecond = mPlaybackStatistics->GetRateAtLastStop(&reliable);
|
|
mPlaybackRateReliable = reliable;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::UpdatePlaybackRate()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mResource);
|
|
|
|
ComputePlaybackRate();
|
|
uint32_t rate = mPlaybackBytesPerSecond;
|
|
|
|
if (mPlaybackRateReliable) {
|
|
// Avoid passing a zero rate
|
|
rate = std::max(rate, 1u);
|
|
} else {
|
|
// Set a minimum rate of 10,000 bytes per second ... sometimes we just
|
|
// don't have good data
|
|
rate = std::max(rate, 10000u);
|
|
}
|
|
|
|
mResource->SetPlaybackRate(rate);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::NotifySuspendedStatusChanged()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mResource && mOwner) {
|
|
bool suspended = mResource->IsSuspendedByCache();
|
|
mOwner->NotifySuspendedByCache(suspended);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::NotifyBytesDownloaded()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
UpdatePlaybackRate();
|
|
if (mOwner) {
|
|
mOwner->DownloadProgressed();
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::NotifyDownloadEnded(nsresult aStatus)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
DECODER_LOG("NotifyDownloadEnded, status=%x", aStatus);
|
|
|
|
if (aStatus == NS_BINDING_ABORTED) {
|
|
// Download has been cancelled by user.
|
|
if (mOwner) {
|
|
mOwner->LoadAborted();
|
|
}
|
|
return;
|
|
}
|
|
|
|
UpdatePlaybackRate();
|
|
|
|
if (NS_SUCCEEDED(aStatus)) {
|
|
// A final progress event will be fired by the MediaResource calling
|
|
// DownloadSuspended on the element.
|
|
// Also NotifySuspendedStatusChanged() will be called to update readyState
|
|
// if download ended with success.
|
|
} else if (aStatus != NS_BASE_STREAM_CLOSED) {
|
|
NetworkError();
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::NotifyPrincipalChanged()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mOwner) {
|
|
mOwner->NotifyDecoderPrincipalChanged();
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::NotifyBytesConsumed(int64_t aBytes, int64_t aOffset)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mShuttingDown || mIgnoreProgressData) {
|
|
return;
|
|
}
|
|
|
|
MOZ_ASSERT(mDecoderStateMachine);
|
|
if (aOffset >= mDecoderPosition) {
|
|
mPlaybackStatistics->AddBytes(aBytes);
|
|
}
|
|
mDecoderPosition = aOffset + aBytes;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::OnSeekResolved(SeekResolveValue aVal)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mSeekRequest.Complete();
|
|
|
|
if (mShuttingDown)
|
|
return;
|
|
|
|
bool fireEnded = false;
|
|
bool seekWasAborted = false;
|
|
{
|
|
ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
|
|
|
|
// An additional seek was requested while the current seek was
|
|
// in operation.
|
|
UnpinForSeek();
|
|
fireEnded = aVal.mAtEnd;
|
|
if (aVal.mAtEnd) {
|
|
ChangeState(PLAY_STATE_ENDED);
|
|
}
|
|
mLogicallySeeking = false;
|
|
}
|
|
|
|
UpdateLogicalPosition(aVal.mEventVisibility);
|
|
|
|
if (mOwner) {
|
|
if (aVal.mEventVisibility != MediaDecoderEventVisibility::Suppressed) {
|
|
mOwner->SeekCompleted();
|
|
if (fireEnded) {
|
|
mOwner->PlaybackEnded();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SeekingStarted(MediaDecoderEventVisibility aEventVisibility)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mShuttingDown)
|
|
return;
|
|
|
|
if (mOwner) {
|
|
if (aEventVisibility != MediaDecoderEventVisibility::Suppressed) {
|
|
mOwner->SeekStarted();
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::ChangeState(PlayState aState)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mNextState == aState) {
|
|
mNextState = PLAY_STATE_PAUSED;
|
|
}
|
|
|
|
if (mPlayState == PLAY_STATE_SHUTDOWN) {
|
|
return;
|
|
}
|
|
|
|
DECODER_LOG("ChangeState %s => %s",
|
|
ToPlayStateStr(mPlayState), ToPlayStateStr(aState));
|
|
mPlayState = aState;
|
|
|
|
if (mPlayState == PLAY_STATE_PLAYING) {
|
|
ConstructMediaTracks();
|
|
} else if (IsEnded()) {
|
|
RemoveMediaTracks();
|
|
}
|
|
|
|
CancelDormantTimer();
|
|
// Start dormant timer if necessary
|
|
StartDormantTimer();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::UpdateLogicalPosition(MediaDecoderEventVisibility aEventVisibility)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mShuttingDown)
|
|
return;
|
|
|
|
// Per spec, offical position remains stable during pause and seek.
|
|
if (mPlayState == PLAY_STATE_PAUSED || IsSeeking()) {
|
|
return;
|
|
}
|
|
|
|
double currentPosition = static_cast<double>(CurrentPosition()) / static_cast<double>(USECS_PER_S);
|
|
bool logicalPositionChanged = mLogicalPosition != currentPosition;
|
|
mLogicalPosition = currentPosition;
|
|
|
|
// Invalidate the frame so any video data is displayed.
|
|
// Do this before the timeupdate event so that if that
|
|
// event runs JavaScript that queries the media size, the
|
|
// frame has reflowed and the size updated beforehand.
|
|
Invalidate();
|
|
|
|
if (mOwner && logicalPositionChanged &&
|
|
aEventVisibility != MediaDecoderEventVisibility::Suppressed) {
|
|
FireTimeUpdate();
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::DurationChanged()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
double oldDuration = mDuration;
|
|
if (IsInfinite()) {
|
|
mDuration = std::numeric_limits<double>::infinity();
|
|
} else if (mExplicitDuration.Ref().isSome()) {
|
|
mDuration = mExplicitDuration.Ref().ref();
|
|
} else if (mStateMachineDuration.Ref().isSome()) {
|
|
mDuration = mStateMachineDuration.Ref().ref().ToSeconds();
|
|
}
|
|
|
|
if (mDuration == oldDuration || IsNaN(mDuration)) {
|
|
return;
|
|
}
|
|
|
|
DECODER_LOG("Duration changed to %f", mDuration);
|
|
|
|
// Duration has changed so we should recompute playback rate
|
|
UpdatePlaybackRate();
|
|
|
|
// See https://www.w3.org/Bugs/Public/show_bug.cgi?id=28822 for a discussion
|
|
// of whether we should fire durationchange on explicit infinity.
|
|
if (mOwner && mFiredMetadataLoaded &&
|
|
(!mozilla::IsInfinite<double>(mDuration) || mExplicitDuration.Ref().isSome())) {
|
|
mOwner->DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
|
|
}
|
|
|
|
if (CurrentPosition() > TimeUnit::FromSeconds(mDuration).ToMicroseconds()) {
|
|
Seek(mDuration, SeekTarget::Accurate);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::UpdateEstimatedMediaDuration(int64_t aDuration)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mPlayState <= PLAY_STATE_LOADING) {
|
|
return;
|
|
}
|
|
|
|
// The duration is only changed if its significantly different than the
|
|
// the current estimate, as the incoming duration is an estimate and so
|
|
// often is unstable as more data is read and the estimate is updated.
|
|
// Can result in a durationchangeevent. aDuration is in microseconds.
|
|
if (mEstimatedDuration.Ref().isSome() &&
|
|
mozilla::Abs(mEstimatedDuration.Ref().ref().ToMicroseconds() - aDuration) < ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
|
|
return;
|
|
}
|
|
|
|
mEstimatedDuration = Some(TimeUnit::FromMicroseconds(aDuration));
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetMediaSeekable(bool aMediaSeekable) {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mMediaSeekable = aMediaSeekable;
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsTransportSeekable()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return GetResource()->IsTransportSeekable();
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsMediaSeekable()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
NS_ENSURE_TRUE(GetStateMachine(), false);
|
|
return mMediaSeekable;
|
|
}
|
|
|
|
media::TimeIntervals
|
|
MediaDecoder::GetSeekable()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
// We can seek in buffered range if the media is seekable. Also, we can seek
|
|
// in unbuffered ranges if the transport level is seekable (local file or the
|
|
// server supports range requests, etc.)
|
|
if (!IsMediaSeekable()) {
|
|
return media::TimeIntervals();
|
|
} else if (!IsTransportSeekable()) {
|
|
return GetBuffered();
|
|
} else {
|
|
return media::TimeIntervals(
|
|
media::TimeInterval(media::TimeUnit::FromMicroseconds(0),
|
|
IsInfinite() ?
|
|
media::TimeUnit::FromInfinity() :
|
|
media::TimeUnit::FromSeconds(GetDuration())));
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetFragmentEndTime(double aTime)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mDecoderStateMachine) {
|
|
mDecoderStateMachine->DispatchSetFragmentEndTime(static_cast<int64_t>(aTime * USECS_PER_S));
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::Suspend()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mResource) {
|
|
mResource->Suspend(true);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::Resume(bool aForceBuffering)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mResource) {
|
|
mResource->Resume();
|
|
}
|
|
if (aForceBuffering) {
|
|
if (mDecoderStateMachine) {
|
|
mDecoderStateMachine->DispatchStartBuffering();
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetLoadInBackground(bool aLoadInBackground)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mResource) {
|
|
mResource->SetLoadInBackground(aLoadInBackground);
|
|
}
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::OnStateMachineTaskQueue() const
|
|
{
|
|
return mDecoderStateMachine->OnTaskQueue();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetPlaybackRate(double aPlaybackRate)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mPlaybackRate = aPlaybackRate;
|
|
if (mPlaybackRate == 0.0) {
|
|
mPausedForPlaybackRateNull = true;
|
|
Pause();
|
|
} else if (mPausedForPlaybackRateNull) {
|
|
// Play() uses mPausedForPlaybackRateNull value, so must reset it first
|
|
mPausedForPlaybackRateNull = false;
|
|
// If the playbackRate is no longer null, restart the playback, iff the
|
|
// media was playing.
|
|
if (mOwner && !mOwner->GetPaused()) {
|
|
Play();
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetPreservesPitch(bool aPreservesPitch)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
mPreservesPitch = aPreservesPitch;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::SetStateMachine(MediaDecoderStateMachine* aStateMachine)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT_IF(aStateMachine, !mDecoderStateMachine);
|
|
mDecoderStateMachine = aStateMachine;
|
|
|
|
if (mDecoderStateMachine) {
|
|
mStateMachineDuration.Connect(mDecoderStateMachine->CanonicalDuration());
|
|
mBuffered.Connect(mDecoderStateMachine->CanonicalBuffered());
|
|
mStateMachineIsShutdown.Connect(mDecoderStateMachine->CanonicalIsShutdown());
|
|
mNextFrameStatus.Connect(mDecoderStateMachine->CanonicalNextFrameStatus());
|
|
mCurrentPosition.Connect(mDecoderStateMachine->CanonicalCurrentPosition());
|
|
mPlaybackPosition.Connect(mDecoderStateMachine->CanonicalPlaybackOffset());
|
|
} else {
|
|
mStateMachineDuration.DisconnectIfConnected();
|
|
mBuffered.DisconnectIfConnected();
|
|
mStateMachineIsShutdown.DisconnectIfConnected();
|
|
mNextFrameStatus.DisconnectIfConnected();
|
|
mCurrentPosition.DisconnectIfConnected();
|
|
mPlaybackPosition.DisconnectIfConnected();
|
|
}
|
|
}
|
|
|
|
ReentrantMonitor&
|
|
MediaDecoder::GetReentrantMonitor() {
|
|
return mReentrantMonitor;
|
|
}
|
|
|
|
ImageContainer*
|
|
MediaDecoder::GetImageContainer()
|
|
{
|
|
return mVideoFrameContainer ? mVideoFrameContainer->GetImageContainer() : nullptr;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::InvalidateWithFlags(uint32_t aFlags)
|
|
{
|
|
if (mVideoFrameContainer) {
|
|
mVideoFrameContainer->InvalidateWithFlags(aFlags);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::Invalidate()
|
|
{
|
|
if (mVideoFrameContainer) {
|
|
mVideoFrameContainer->Invalidate();
|
|
}
|
|
}
|
|
|
|
// Constructs the time ranges representing what segments of the media
|
|
// are buffered and playable.
|
|
media::TimeIntervals
|
|
MediaDecoder::GetBuffered() {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mBuffered.Ref();
|
|
}
|
|
|
|
size_t
|
|
MediaDecoder::SizeOfVideoQueue() {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mDecoderStateMachine) {
|
|
return mDecoderStateMachine->SizeOfVideoQueue();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
size_t
|
|
MediaDecoder::SizeOfAudioQueue() {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mDecoderStateMachine) {
|
|
return mDecoderStateMachine->SizeOfAudioQueue();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void MediaDecoder::AddSizeOfResources(ResourceSizes* aSizes) {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (GetResource()) {
|
|
aSizes->mByteSize += GetResource()->SizeOfIncludingThis(aSizes->mMallocSizeOf);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::NotifyDataArrived(uint32_t aLength,
|
|
int64_t aOffset,
|
|
bool aThrottleUpdates) {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mDecoderStateMachine) {
|
|
mDecoderStateMachine->DispatchNotifyDataArrived(aLength, aOffset, aThrottleUpdates);
|
|
}
|
|
|
|
// ReadyState computation depends on MediaDecoder::CanPlayThrough, which
|
|
// depends on the download rate.
|
|
UpdateReadyState();
|
|
}
|
|
|
|
// Provide access to the state machine object
|
|
MediaDecoderStateMachine*
|
|
MediaDecoder::GetStateMachine() const {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mDecoderStateMachine;
|
|
}
|
|
|
|
// Drop reference to state machine. Only called during shutdown dance.
|
|
void
|
|
MediaDecoder::BreakCycles() {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
SetStateMachine(nullptr);
|
|
}
|
|
|
|
MediaDecoderOwner*
|
|
MediaDecoder::GetMediaOwner() const
|
|
{
|
|
return mOwner;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::FireTimeUpdate()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (!mOwner)
|
|
return;
|
|
mOwner->FireTimeUpdate(true);
|
|
}
|
|
|
|
void
|
|
MediaDecoder::PinForSeek()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MediaResource* resource = GetResource();
|
|
if (!resource || mPinnedForSeek) {
|
|
return;
|
|
}
|
|
mPinnedForSeek = true;
|
|
resource->Pin();
|
|
}
|
|
|
|
void
|
|
MediaDecoder::UnpinForSeek()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MediaResource* resource = GetResource();
|
|
if (!resource || !mPinnedForSeek) {
|
|
return;
|
|
}
|
|
mPinnedForSeek = false;
|
|
resource->Unpin();
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::CanPlayThrough()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
NS_ENSURE_TRUE(mDecoderStateMachine, false);
|
|
return mDecoderStateMachine->IsRealTime() || GetStatistics().CanPlayThrough();
|
|
}
|
|
|
|
#ifdef MOZ_RAW
|
|
bool
|
|
MediaDecoder::IsRawEnabled()
|
|
{
|
|
return Preferences::GetBool("media.raw.enabled");
|
|
}
|
|
#endif
|
|
|
|
bool
|
|
MediaDecoder::IsOpusEnabled()
|
|
{
|
|
return Preferences::GetBool("media.opus.enabled");
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsOggEnabled()
|
|
{
|
|
return Preferences::GetBool("media.ogg.enabled");
|
|
}
|
|
|
|
#ifdef MOZ_WAVE
|
|
bool
|
|
MediaDecoder::IsWaveEnabled()
|
|
{
|
|
return Preferences::GetBool("media.wave.enabled");
|
|
}
|
|
#endif
|
|
|
|
#ifdef MOZ_WEBM
|
|
bool
|
|
MediaDecoder::IsWebMEnabled()
|
|
{
|
|
return Preferences::GetBool("media.webm.enabled");
|
|
}
|
|
#endif
|
|
|
|
#ifdef NECKO_PROTOCOL_rtsp
|
|
bool
|
|
MediaDecoder::IsRtspEnabled()
|
|
{
|
|
//Currently the Rtsp decoded by omx.
|
|
return (Preferences::GetBool("media.rtsp.enabled", false) && IsOmxEnabled());
|
|
}
|
|
#endif
|
|
|
|
#ifdef MOZ_GSTREAMER
|
|
bool
|
|
MediaDecoder::IsGStreamerEnabled()
|
|
{
|
|
return Preferences::GetBool("media.gstreamer.enabled");
|
|
}
|
|
#endif
|
|
|
|
#ifdef MOZ_OMX_DECODER
|
|
bool
|
|
MediaDecoder::IsOmxEnabled()
|
|
{
|
|
return Preferences::GetBool("media.omx.enabled", false);
|
|
}
|
|
|
|
bool
|
|
MediaDecoder::IsOmxAsyncEnabled()
|
|
{
|
|
#if ANDROID_VERSION >= 16
|
|
return Preferences::GetBool("media.omx.async.enabled", false);
|
|
#else
|
|
return false;
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
#ifdef MOZ_ANDROID_OMX
|
|
bool
|
|
MediaDecoder::IsAndroidMediaEnabled()
|
|
{
|
|
return Preferences::GetBool("media.plugins.enabled");
|
|
}
|
|
#endif
|
|
|
|
#ifdef MOZ_APPLEMEDIA
|
|
bool
|
|
MediaDecoder::IsAppleMP3Enabled()
|
|
{
|
|
return Preferences::GetBool("media.apple.mp3.enabled");
|
|
}
|
|
#endif
|
|
|
|
NS_IMETHODIMP
|
|
MediaMemoryTracker::CollectReports(nsIHandleReportCallback* aHandleReport,
|
|
nsISupports* aData, bool aAnonymize)
|
|
{
|
|
int64_t video = 0, audio = 0;
|
|
|
|
// NB: When resourceSizes' ref count goes to 0 the promise will report the
|
|
// resources memory and finish the asynchronous memory report.
|
|
RefPtr<MediaDecoder::ResourceSizes> resourceSizes =
|
|
new MediaDecoder::ResourceSizes(MediaMemoryTracker::MallocSizeOf);
|
|
|
|
nsCOMPtr<nsIHandleReportCallback> handleReport = aHandleReport;
|
|
nsCOMPtr<nsISupports> data = aData;
|
|
|
|
resourceSizes->Promise()->Then(
|
|
AbstractThread::MainThread(), __func__,
|
|
[handleReport, data] (size_t size) {
|
|
handleReport->Callback(
|
|
EmptyCString(), NS_LITERAL_CSTRING("explicit/media/resources"),
|
|
KIND_HEAP, UNITS_BYTES, size,
|
|
NS_LITERAL_CSTRING("Memory used by media resources including "
|
|
"streaming buffers, caches, etc."),
|
|
data);
|
|
|
|
nsCOMPtr<nsIMemoryReporterManager> imgr =
|
|
do_GetService("@mozilla.org/memory-reporter-manager;1");
|
|
|
|
if (imgr) {
|
|
imgr->EndReport();
|
|
}
|
|
},
|
|
[] (size_t) { /* unused reject function */ });
|
|
|
|
DecodersArray& decoders = Decoders();
|
|
for (size_t i = 0; i < decoders.Length(); ++i) {
|
|
MediaDecoder* decoder = decoders[i];
|
|
video += decoder->SizeOfVideoQueue();
|
|
audio += decoder->SizeOfAudioQueue();
|
|
decoder->AddSizeOfResources(resourceSizes);
|
|
}
|
|
|
|
#define REPORT(_path, _amount, _desc) \
|
|
do { \
|
|
nsresult rv; \
|
|
rv = aHandleReport->Callback(EmptyCString(), NS_LITERAL_CSTRING(_path), \
|
|
KIND_HEAP, UNITS_BYTES, _amount, \
|
|
NS_LITERAL_CSTRING(_desc), aData); \
|
|
NS_ENSURE_SUCCESS(rv, rv); \
|
|
} while (0)
|
|
|
|
REPORT("explicit/media/decoded/video", video,
|
|
"Memory used by decoded video frames.");
|
|
|
|
REPORT("explicit/media/decoded/audio", audio,
|
|
"Memory used by decoded audio chunks.");
|
|
|
|
#undef REPORT
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
MediaDecoderOwner*
|
|
MediaDecoder::GetOwner()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mOwner;
|
|
}
|
|
|
|
void
|
|
MediaDecoder::ConstructMediaTracks()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (mMediaTracksConstructed) {
|
|
return;
|
|
}
|
|
|
|
if (!mOwner || !mInfo) {
|
|
return;
|
|
}
|
|
|
|
HTMLMediaElement* element = mOwner->GetMediaElement();
|
|
if (!element) {
|
|
return;
|
|
}
|
|
|
|
mMediaTracksConstructed = true;
|
|
|
|
AudioTrackList* audioList = element->AudioTracks();
|
|
if (audioList && mInfo->HasAudio()) {
|
|
const TrackInfo& info = mInfo->mAudio;
|
|
RefPtr<AudioTrack> track = MediaTrackList::CreateAudioTrack(
|
|
info.mId, info.mKind, info.mLabel, info.mLanguage, info.mEnabled);
|
|
|
|
audioList->AddTrack(track);
|
|
}
|
|
|
|
VideoTrackList* videoList = element->VideoTracks();
|
|
if (videoList && mInfo->HasVideo()) {
|
|
const TrackInfo& info = mInfo->mVideo;
|
|
RefPtr<VideoTrack> track = MediaTrackList::CreateVideoTrack(
|
|
info.mId, info.mKind, info.mLabel, info.mLanguage);
|
|
|
|
videoList->AddTrack(track);
|
|
track->SetEnabledInternal(info.mEnabled, MediaTrack::FIRE_NO_EVENTS);
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoder::RemoveMediaTracks()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (!mOwner) {
|
|
return;
|
|
}
|
|
|
|
HTMLMediaElement* element = mOwner->GetMediaElement();
|
|
if (!element) {
|
|
return;
|
|
}
|
|
|
|
AudioTrackList* audioList = element->AudioTracks();
|
|
if (audioList) {
|
|
audioList->RemoveTracks();
|
|
}
|
|
|
|
VideoTrackList* videoList = element->VideoTracks();
|
|
if (videoList) {
|
|
videoList->RemoveTracks();
|
|
}
|
|
|
|
mMediaTracksConstructed = false;
|
|
}
|
|
|
|
MediaDecoderOwner::NextFrameStatus
|
|
MediaDecoder::NextFrameBufferedStatus()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
// Next frame hasn't been decoded yet.
|
|
// Use the buffered range to consider if we have the next frame available.
|
|
media::TimeUnit currentPosition =
|
|
media::TimeUnit::FromMicroseconds(CurrentPosition());
|
|
media::TimeInterval interval(currentPosition,
|
|
currentPosition + media::TimeUnit::FromMicroseconds(DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED));
|
|
return GetBuffered().Contains(interval)
|
|
? MediaDecoderOwner::NEXT_FRAME_AVAILABLE
|
|
: MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
|
|
}
|
|
|
|
MediaMemoryTracker::MediaMemoryTracker()
|
|
{
|
|
}
|
|
|
|
void
|
|
MediaMemoryTracker::InitMemoryReporter()
|
|
{
|
|
RegisterWeakAsyncMemoryReporter(this);
|
|
}
|
|
|
|
MediaMemoryTracker::~MediaMemoryTracker()
|
|
{
|
|
UnregisterWeakMemoryReporter(this);
|
|
}
|
|
|
|
} // namespace mozilla
|
|
|
|
// avoid redefined macro in unified build
|
|
#undef DECODER_LOG
|