Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 842176 - Partial revert of bug 839319; use WAVE_FORMATEX when channels <= 2. r=doublec

Browse Source
This commit is contained in:
Matthew Gregan 2013-02-18 15:06:30 +13:00
parent 256a511da6
commit 488cbf6168
2 changed files with 11 additions and 3 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 e945dbd052793a7faba3e9064d03bd6781b02692.
The git commit ID used was 49f2565ff54192821b9b717988399a875d3b1c61.

12
media/libcubeb/src/cubeb_winmm.c
View File

@ -331,8 +331,16 @@ cubeb_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n
}
memset(&wfx, 0, sizeof(wfx));
wfx.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
wfx.Format.cbSize = sizeof(wfx) - sizeof(wfx.Format);
if (stream_params.channels > 2) {
wfx.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
wfx.Format.cbSize = sizeof(wfx) - sizeof(wfx.Format);
} else {
wfx.Format.wFormatTag = WAVE_FORMAT_PCM;
if (stream_params.format == CUBEB_SAMPLE_FLOAT32LE) {
wfx.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
}
wfx.Format.cbSize = 0;
}
wfx.Format.nChannels = stream_params.channels;
wfx.Format.nSamplesPerSec = stream_params.rate;