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 1237842 - Unlock mMutex before calling CloseActive. r=cpearce (d0677f1981) - Bug 1230857 - Ensure GMPService has sufficient file permissions to delete GMPs. r=gerald (e7f0c4b2b6) - Bug 1236380 - GMPStorage::mShutdown=true until Init() succeeds - r=cpearce (fde2025f4f) - Bug 1254311: [mp4] Ignore empty raw sample. r=cpearce (216a9417c3) - Bug 1215115 - part1: Replace the vorbis by opus in MediaEncoder and also reomve the VorbisTrackEncoder files. r=rillian (760c559e3c) - Bug 1215115 - part2: Mux opus into webm, remove bitdepth. r=rillian (1c996f0aee) - Bug 1215115 - part3: Fix gtest. Remove TestVorbisTrackEncoder.cpp. r=rillian (5a68915a4a) - Bug 1215115 - part4: Enable MOZ_WEBM_ENCODER by default. r=ted (6638b7fffb) - Bug 1257318: Pass TRACK_EVENT_ENDED events through to the TrackEncoders r=padenot (b92b2dcc94) - Bug 1261007 - Part 3 - Remove the same/redundant code of checking the unique image. r=jolin (608e6477bc) - Bug 1243611 - When EOS, call vpx_codec_encode correctly. r=rillian (83887c89c8) - Bug 1260353 - Remove unnecessary method AnimValuesStyleRule::AddPropertiesToSet() r=hiro (36f5e7fcc9) - Bug 1213775: VP8 automatic resizing breaks ffmpeg-based players; turn it off in VP8TrackEncoder r=jya (23c2a27371) - Bug 1185171 - Modify gmp-test-output-protection.h to prevent failure on machines without a physical monitor attached. r=bobowen (8375c5075d) - Bug 1185171: Add 0xc02625e5 as a valid failure code for GMPOutputProtection test. r=cpearce (1d10a75aeb) - Bug 1151746 - Origin tuples in should include schemes. r=edwin (32610b0cfa) - Bug 1180101 - Test 0 length atom inside moov; r=jya (3fae8aee45) - Bug 1244523: [mp4] P4. Add gtest. r=kentuckyfriedtakahe (3f71b5060a) - Bug 1255626: [gtest] Properly shutdown task queue should error occurs. r=gerald (4ec1bf360e) - Bug 1224363 - Added vp8/ivf test case - r=rillian Bug 1224369 - p1: Test cases given as list - r=rillian Bug 1224369 - p2: Added vp8/ivf test case - r=rillian Bug 1224361 - Added vp8/ivf test case - r=rillian (595ebe09be) - Bug 1231075. Respect the timestamp of video frames and don't pop frames as fast as we can in real-time mode. r=roc. (b72329c0fa) - Bug 1237160: Do not count frames not composited as dropped. r=cpearce (e7e18d0700) - Bug 1233648 - Fix some insufficient includes. r=kinetik. (e36cdd3e05) - Bug 1216460 - [1.1] Refactor data types, fix logs and prevent harmful type promotions in SourceBuffer eviction handling. r=jya (047a7ca64f) - Bug 1259916: [MSE] P1. Fix eviction. r=gerald (13195f392b) - Bug 1216460 - [2.2] Refactor SourceBuffer frame eviction and threshold defaults. r=jya (105962c942) - Bug 1259274: [MSE] P1. Remove unnecessary abstraction layer. r=gerald (e7b7603f30) - Bug 1259274: [MSE] P2. Remove unused code path. r=gerald (dce9fa447c) - Bug 1259274: [MSE] P3. Refactor handling of tasks so they only ever run concurrently. r=gerald (9c3f40d9b8) - Bug 1259274: [MSE] P4. Add AutoTaskQueue convenience class. r=gerald Just like TaskQueue, but doesn't require to be shutdown. (0310ff2b7f) - Bug 1259274: [MSE] P5. Use new AutoTaskQueue with MSE objects. r=gerald (3f72558eb2) - Bug 1259916: [MSE] P2. Bump audio source buffer eviction threshold to 30MB. r=gerald (2ffe148c1a) - Bug 1259916: [MSE] P3. Simplify eviction calculation logic. r=gerald (11250c02bc) - Bug 1199879: [MSE] Use latest demux end time to detect discontinuities. r=gerald (f89bdd763f) - Bug 1239983 - Diags around TrackBuffersMgr promises - r=jya (57f3e58636) - Bug 1258410: [MSE] P1. Abort if mInputDemuxer has been reset. r=gerald (07ca58adb0) - Bug 1258410: [MSE] P2. Disconnect init promise if any pending. r=gerald (0627c5a174) - Bug 1259985 - Add missing return after null-check - r=jya (b6ee457b89) - bit of Bwqug 1259274: [MSE] P3 (200d743676) - Bug 1216560 - [3.1] Make eviction thresholds const. r=jya (b44c78f999) - Bug 1259473 - per comment 14, move actions involving |this| to Init() from the constructor. r=jya. (30c402aacb) - Bug 1258562: MSE] Abort if MediaSource has been shutdown. r=gerald (6fce6bc9db) - Bug 1246358: [MSE] Take pre-roll time into consideration when seeking. r=gerald (dacbcd7f36) - spaces (abbb56d413) - Bug 657791 - Update WebM demuxer to clamp cueless seeks instead of failing. r=kinetik (785ae83126) - Bug 1219178 - [9.1] Make SeekPosition available with tests disabled. a=me for fixing build problems (cd1bdef203) - minor format (4a718e47f2) - Bug 1265399 - Replace 0.7071 with sqrt(0.5) in downmixing equations; r=padenot (2243d331c5) - Bug 1265794: P1. Ensure we can always fit a complete audio frame in an audio buffer. r=rillian (37f575184c) - Bug 1256626. Workaround Microsoft macro silliness. r=me (18930fbccd) - Bug 1264898 - Remove unnecessary |FinishAddTracks| call in |DOMHwMediaStream::Init|. r=jesup, r=pehrsons (1b610cdb4f) - Bug 848994 - p5. Check Silverlight presence - r=cpearce (98b4521ae3) - Bug 848994 - p6. Analyze Windows issues - r=cpearce (9de769166a) - Bug 848994 - p7. Filter front-end notifications - r=cpearce (e3aab89a95) - Bug 1256533 - Use std::deque<int32_t> instead of nsDeque - r=cpearce (e21c02fcab)
This commit is contained in:
@@ -87,6 +87,14 @@ void FileBlockCache::Close()
|
||||
}
|
||||
}
|
||||
|
||||
template<typename Container, typename Value>
|
||||
bool
|
||||
ContainerContains(const Container& aContainer, const Value& value)
|
||||
{
|
||||
return std::find(aContainer.begin(), aContainer.end(), value)
|
||||
!= aContainer.end();
|
||||
}
|
||||
|
||||
nsresult FileBlockCache::WriteBlock(uint32_t aBlockIndex, const uint8_t* aData)
|
||||
{
|
||||
MonitorAutoLock mon(mDataMonitor);
|
||||
@@ -99,16 +107,16 @@ nsresult FileBlockCache::WriteBlock(uint32_t aBlockIndex, const uint8_t* aData)
|
||||
bool blockAlreadyHadPendingChange = mBlockChanges[aBlockIndex] != nullptr;
|
||||
mBlockChanges[aBlockIndex] = new BlockChange(aData);
|
||||
|
||||
if (!blockAlreadyHadPendingChange || !mChangeIndexList.Contains(aBlockIndex)) {
|
||||
if (!blockAlreadyHadPendingChange || !ContainerContains(mChangeIndexList, aBlockIndex)) {
|
||||
// We either didn't already have a pending change for this block, or we
|
||||
// did but we didn't have an entry for it in mChangeIndexList (we're in the process
|
||||
// of writing it and have removed the block's index out of mChangeIndexList
|
||||
// in Run() but not finished writing the block to file yet). Add the blocks
|
||||
// index to the end of mChangeIndexList to ensure the block is written as
|
||||
// as soon as possible.
|
||||
mChangeIndexList.PushBack(aBlockIndex);
|
||||
mChangeIndexList.push_back(aBlockIndex);
|
||||
}
|
||||
NS_ASSERTION(mChangeIndexList.Contains(aBlockIndex), "Must have entry for new block");
|
||||
NS_ASSERTION(ContainerContains(mChangeIndexList, aBlockIndex), "Must have entry for new block");
|
||||
|
||||
EnsureWriteScheduled();
|
||||
|
||||
@@ -196,10 +204,10 @@ nsresult FileBlockCache::Run()
|
||||
{
|
||||
MonitorAutoLock mon(mDataMonitor);
|
||||
NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
|
||||
NS_ASSERTION(!mChangeIndexList.IsEmpty(), "Only dispatch when there's work to do");
|
||||
NS_ASSERTION(!mChangeIndexList.empty(), "Only dispatch when there's work to do");
|
||||
NS_ASSERTION(mIsWriteScheduled, "Should report write running or scheduled.");
|
||||
|
||||
while (!mChangeIndexList.IsEmpty()) {
|
||||
while (!mChangeIndexList.empty()) {
|
||||
if (!mIsOpen) {
|
||||
// We've been closed, abort, discarding unwritten changes.
|
||||
mIsWriteScheduled = false;
|
||||
@@ -217,7 +225,8 @@ nsresult FileBlockCache::Run()
|
||||
// Hold a reference to the change, in case another change
|
||||
// overwrites the mBlockChanges entry for this block while we drop
|
||||
// mDataMonitor to take mFileMonitor.
|
||||
int32_t blockIndex = mChangeIndexList.PopFront();
|
||||
int32_t blockIndex = mChangeIndexList.front();
|
||||
mChangeIndexList.pop_front();
|
||||
RefPtr<BlockChange> change = mBlockChanges[blockIndex];
|
||||
MOZ_ASSERT(change,
|
||||
"Change index list should only contain entries for blocks "
|
||||
@@ -326,14 +335,14 @@ nsresult FileBlockCache::MoveBlock(int32_t aSourceBlockIndex, int32_t aDestBlock
|
||||
}
|
||||
|
||||
if (mBlockChanges[aDestBlockIndex] == nullptr ||
|
||||
!mChangeIndexList.Contains(aDestBlockIndex)) {
|
||||
!ContainerContains(mChangeIndexList, aDestBlockIndex)) {
|
||||
// Only add another entry to the change index list if we don't already
|
||||
// have one for this block. We won't have an entry when either there's
|
||||
// no pending change for this block, or if there is a pending change for
|
||||
// this block and we're in the process of writing it (we've popped the
|
||||
// block's index out of mChangeIndexList in Run() but not finished writing
|
||||
// the block to file yet.
|
||||
mChangeIndexList.PushBack(aDestBlockIndex);
|
||||
mChangeIndexList.push_back(aDestBlockIndex);
|
||||
}
|
||||
|
||||
// If the source block hasn't yet been written to file then the dest block
|
||||
@@ -346,7 +355,7 @@ nsresult FileBlockCache::MoveBlock(int32_t aSourceBlockIndex, int32_t aDestBlock
|
||||
|
||||
EnsureWriteScheduled();
|
||||
|
||||
NS_ASSERTION(mChangeIndexList.Contains(aDestBlockIndex),
|
||||
NS_ASSERTION(ContainerContains(mChangeIndexList, aDestBlockIndex),
|
||||
"Should have scheduled block for change");
|
||||
|
||||
return NS_OK;
|
||||
|
||||
Reference in New Issue
Block a user