mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1163958 - Reduce the allocation in MediaStreamGraph - patch 1, r=padenot (e5242a01a) - bug 1194558 correct time conversion for video frame timestamps r=roc (c8f95228e) - bug 962719 provide video frames to the container as soon as available r=roc (f71a0c229) - bug 962719 ensure state computed time does not retreat r=padenot (fdb2d9821) - bug 962719 remove unnecessary OneIteration() parameter aStateFrom r=padenot (7ab9d17ea) - bug 962719 introduce mProcessedTime r=padenot (d0a23aba4) - bug 962719 update stream state to processed time after processing r=padenot (c0e89757b) - bug 962719 provide frame ID service to clients r=roc (769faed7d) - bug 962719 make FindChunkContaining() public r=roc (d59359bdc) - bug 962719 remove notified blocked warning of finished stream r=padenot (419e4a6cd) - bug 962719 remove unnecessary OneIteration() parameters aFrom/aTo r=padenot (7e040a1e3) - Bug 1185763 - Part 1: Always use mozilla::Move with nsTArray::MoveElementsFrom. r=froydnj (277053ec7) - Bug 1185763 - Part 2: Remove non-rvalue version of nsTArray::MoveElementsFrom. r=froydnj (71bb6534f) - Bug 1185763 - Part 3: Rename nsTArray::MoveElementsFrom to AppendElements. r=froydnj (af4f41910) - Bug 1185763 - Part 4: Swap elements if possible in r-value version of nsTArray::AppendElements. r=froydnj (56212e127) - Bug 1185763 - Part 5: Remove now unnecessary nsTArray::AppendElements optimizations in parser/html/. r=froydnj (01c93d978) - Bug 1185763 - Part 6: Add fallible variant of r-value nsTArray::AppendElements. r=froydnj (513a6ef72) - missing part of Bug 1185589 - Properly handle self-assignment in nsTArray::operator=. (e8fae4e80) - Bug 1185763 - Part 7: Add test for r-value nsTArray::AppendElements. r=froydnj (bd587e593) - Bug 1179484 - Pass in the right graph when created the DOMMediaStream. r=roc (d16fd213a) - Bug 1190676 - Part 1 - Use the right MediaStreamGraph when setting a MediaStream as mozSrcStream on an HTMLMediaElement. r=roc (27b3ade57) - Bug 1190676 - Part 2 - Force explicitely passing in a MediaStreamGraph when creating a DOMMediaStream. r=roc (d51c56b37) - Bug 1190676 - Part 3 - Make getting a MediaStreamGraph for a channel more explicit. r=roc (0e813061a) - Bug 1190676 - Part 4 - Fix consumers: CanvasCaptureMediaStream. r=pehrsons (ca7aa534e) - Bug 1190676 - Part 5 - Fix consumers: PeerConnection. r=jesup (270842446) - Bug 1190676 - Part 6 - Fix consumers: MediaManager. r=jesup (5a918f757) - Bug 1190676 - Part 7 - Fix consumers: InputPort and HWMediaStream. r=jacheng (0e2b6fbf5) - Bug 1190676 - Part 8 - Fix consumers: CameraPreviewMediaStream. r=sotaro (6d6eee481) - Bug 1190676 - Part 9 - Fix consumers: AudioCapture. r=roc (7e8ce4b26) - Bug 1190676 - Part 10 - Fix consumers: AudioDestinationNode. r=karlt (464a21db4) - Bug 1003457 - Implement Windows SAPI backend. Original patch is by yash.girhar@gmail.com. r=jmathies (885535ee3) - Bug 1187155 - Remove sphelper.h dependency to avoid ATL. r=jimm (e431679dd) - Bug 1188457 - Fixed SapiService.cpp compilation on mingw. r=jimm (a900be244) - Bug 1188099 - (Part 1) Enable/disable global queue depending on voices and pref. r=smaug r=kdavis (f843cb5ca) - Bug 1187105 - Pause speechsynthesis on empty queue. r=smaug (bf1e1256b) - Bug 1167538 - Part 1 of 1: Removes use of NS_LITERAL_STRING("") in dom/meida/webspeech/synth/*. r=smaug (c991b9729) - Bug 1188099 - (Part 2) Introduce global queue and track speaking state across windows. r=smaug r=kdavis (777c20962) - Bug 1190676 - Part 11 - Fix consumers: Web Speech. r=anatal,eitan (891c4e942) - Bug 1190676 - Part 12 - Fix mozCaptureStream. r=pehrsons (a9ab5ba2c) - Bug 752796 - longer timeout on slow platforms. r=cpearce. (ed0b8c0aa) - Bug 1164265 - larger timeout on slow platforms. r=cpearce. (bce896537) - Bug 1200099. Relax test assumptions to accommodate streams not blocking. r=jwwang (d8c26db41) - Bug 1200099. Stop using a distinct mPlaybackStream to play a media stream through an HTMLMediaElement. r=jwwang (384f36f34)
This commit is contained in:
@@ -285,6 +285,15 @@ ThreadedDriver::RunThread()
|
||||
GraphTime nextStateComputedTime =
|
||||
mGraphImpl->RoundUpToNextAudioBlock(
|
||||
mIterationEnd + mGraphImpl->MillisecondsToMediaTime(AUDIO_TARGET_MS));
|
||||
if (nextStateComputedTime < stateComputedTime) {
|
||||
// A previous driver may have been processing further ahead of
|
||||
// iterationEnd.
|
||||
STREAM_LOG(LogLevel::Warning,
|
||||
("Prevent state from going backwards. interval[%ld; %ld] state[%ld; %ld]",
|
||||
(long)mIterationStart, (long)mIterationEnd,
|
||||
(long)stateComputedTime, (long)nextStateComputedTime));
|
||||
nextStateComputedTime = stateComputedTime;
|
||||
}
|
||||
STREAM_LOG(LogLevel::Debug,
|
||||
("interval[%ld; %ld] state[%ld; %ld]",
|
||||
(long)mIterationStart, (long)mIterationEnd,
|
||||
@@ -292,10 +301,7 @@ ThreadedDriver::RunThread()
|
||||
|
||||
mGraphImpl->mFlushSourcesNow = mGraphImpl->mFlushSourcesOnNextIteration;
|
||||
mGraphImpl->mFlushSourcesOnNextIteration = false;
|
||||
stillProcessing = mGraphImpl->OneIteration(mIterationStart,
|
||||
mIterationEnd,
|
||||
stateComputedTime,
|
||||
nextStateComputedTime);
|
||||
stillProcessing = mGraphImpl->OneIteration(nextStateComputedTime);
|
||||
|
||||
if (mNextDriver && stillProcessing) {
|
||||
STREAM_LOG(LogLevel::Debug, ("Switching to AudioCallbackDriver"));
|
||||
@@ -838,10 +844,7 @@ AudioCallbackDriver::DataCallback(AudioDataValue* aBuffer, long aFrames)
|
||||
mIterationEnd = stateComputedTime;
|
||||
}
|
||||
|
||||
stillProcessing = mGraphImpl->OneIteration(mIterationStart,
|
||||
mIterationEnd,
|
||||
stateComputedTime,
|
||||
nextStateComputedTime);
|
||||
stillProcessing = mGraphImpl->OneIteration(nextStateComputedTime);
|
||||
} else {
|
||||
NS_WARNING("DataCallback buffer filled entirely from scratch buffer, skipping iteration.");
|
||||
stillProcessing = true;
|
||||
|
||||
Reference in New Issue
Block a user