Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ao_wasapi: reorder channels and samplerates to speed up search

Browse Source 
This shouldn't affect which are chosen, but it should speed up the search by
putting more common configurations earlier so that a working sample format and
sample rates can be found sooner obviating the need to search them for each
iteration of the outer loops.
This commit is contained in:
Kevin Mitchell
2017-07-08 21:42:29 -07:00
parent 7568715563
commit 03abd704ec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
audio/out/ao_wasapi_utils.c
View File

@@ -372,9 +372,9 @@ static bool search_sample_formats(struct ao *ao, WAVEFORMATEXTENSIBLE *wformat,
static bool search_samplerates(struct ao *ao, WAVEFORMATEXTENSIBLE *wformat, static bool search_samplerates(struct ao *ao, WAVEFORMATEXTENSIBLE *wformat,
struct mp_chmap *channels) struct mp_chmap *channels)
{ {
// try list of typical sample rates (requests welcome) // put common samplerates first so that we find format early
int try[] = {8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200, 96000, int try[] = {48000, 44100, 96000, 88200, 192000, 176400,
176400, 192000, 352800, 384000, 0}; 32000, 22050, 11025, 8000, 16000, 352800, 384000, 0};
// get a list of supported rates // get a list of supported rates
int n = 0; int n = 0;
@@ -410,7 +410,7 @@ static bool search_channels(struct ao *ao, WAVEFORMATEXTENSIBLE *wformat)
struct mp_chmap entry; struct mp_chmap entry;
// put common layouts first so that we find sample rate/format early // put common layouts first so that we find sample rate/format early
char *channel_layouts[] = char *channel_layouts[] =
{"mono", "stereo", "2.1", "4.0", "5.0", "5.1", "6.1", "7.1", {"stereo", "5.1", "7.1", "6.1", "mono", "2.1", "4.0", "5.0",
"3.0", "3.0(back)", "3.0", "3.0(back)",
"quad", "quad(side)", "3.1", "quad", "quad(side)", "3.1",
"5.0(side)", "4.1", "5.0(side)", "4.1",