зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1448627 - Update cubeb to 7712aaab. r=jya
MozReview-Commit-ID: HbYayQvtQQc --HG-- extra : rebase_source : b214c693b7f1c7914d39dfd363d85db7eebb0e6c
This commit is contained in:
Родитель
4a85b2542a
Коммит
7eac0326f6
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче