Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1421267 - Update cubeb from upstream to e17ba01. r=padenot

Browse Source 
MozReview-Commit-ID: 8s9ZPsZkxD4

--HG--
extra : rebase_source : 540d20626dbe01a317c36ce77f7c2e856996d2e0
This commit is contained in:
Alex Chronopoulos 2017-11-28 16:27:34 +02:00
parent c3d79c4968
commit 2e3d7ac97e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 8a0a30091cd7a7c71042f9dd25ba851ac3964466 (2017-11-15 14:03:13 +1300)
The git commit ID used was e17ba01b210b00fc15a33cad242286acb15a3492 (2017-11-28 16:18:38 +0200)

14
media/libcubeb/include/cubeb.h
View File

@ -55,9 +55,9 @@ extern "C" {
output_params.channels = 2;
cubeb_stream_params input_params;
output_params.format = CUBEB_SAMPLE_FLOAT32NE;
output_params.rate = rate;
output_params.channels = 1;
input_params.format = CUBEB_SAMPLE_FLOAT32NE;
input_params.rate = rate;
input_params.channels = 1;
cubeb_stream * stm;
rv = cubeb_stream_init(app_ctx, &stm, "Example Stream 1",
@ -164,10 +164,10 @@ typedef enum {
* STEREO-LFE L R LFE
* 3F L R C
* 3F-LFE L R C LFE
* 2F1 L R S
* 2F1-LFE L R LFE S
* 3F1 L R C S
* 3F1-LFE L R C LFE S
* 2F1 L R RC
* 2F1-LFE L R LFE RC
* 3F1 L R C RC
* 3F1-LFE L R C LFE RC
* 2F2 L R LS RS
* 2F2-LFE L R LFE LS RS
* 3F2 L R C LS RS

2
media/libcubeb/src/cubeb_audiounit.cpp
View File

@ -755,7 +755,7 @@ audiounit_property_listener_callback(AudioObjectID id, UInt32 address_count,
if (has_input(stm)) {
switch_side |= DEV_INPUT;
}
if (has_input(stm)) {
if (has_output(stm)) {
switch_side |= DEV_OUTPUT;
}