Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to inbound. a=merge CLOSED TREE

Browse Source
This commit is contained in:
Margareta Eliza Balazs 2018-03-25 15:45:06 +03:00
commit f500f8be16
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/audiochannel/AudioChannelService.cpp
View File

@ -113,15 +113,15 @@ public:
}
private:
void GetActiveState(nsAString& astate)
void GetActiveState(nsAString& aState)
{
if (mActive) {
CopyASCIItoUTF16("active", astate);
aState.AssignLiteral("active");
} else {
if(mReason == AudioChannelService::AudibleChangedReasons::ePauseStateChanged) {
CopyASCIItoUTF16("inactive-pause", astate);
aState.AssignLiteral("inactive-pause");
} else {
CopyASCIItoUTF16("inactive-nonaudible", astate);
aState.AssignLiteral("inactive-nonaudible");
}
}
}

2
media/libcubeb/README_MOZILLA
View File

@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
The git commit ID used was 77cb1a9a37bb9fcc43743770727cb6a31b27ab74 (2018-03-23 14:38:34 +1000)
The git commit ID used was 7712aaabfa140e8c7fe890e3f5f65dfe3fe58632 (2018-03-25 11:30:38 +0200)

6
media/libcubeb/src/cubeb_mixer.cpp
View File

@ -14,9 +14,6 @@
#include <climits>
#include <cmath>
#include <cstdlib>
#ifdef _MSC_VER
#include <intrin.h>
#endif
#include <memory>
#include <type_traits>
#include "cubeb-internal.h"
@ -80,8 +77,6 @@ unsigned int cubeb_channel_layout_nb_channels(cubeb_channel_layout x)
{
#if __GNUC__ || __clang__
return __builtin_popcount (x);
#elif _MSC_VER
return __popcnt(x);
#else
x -= (x >> 1) & 0x55555555;
x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
@ -90,6 +85,7 @@ unsigned int cubeb_channel_layout_nb_channels(cubeb_channel_layout x)
return (x + (x >> 16)) & 0x3F;
#endif
}
struct MixerContext {
MixerContext(cubeb_sample_format f,
uint32_t in_channels,