XBMC Community Forum
[Windows] AudioEngine testers - Windows platform only - Printable Version

+- XBMC Community Forum (http://forum.xbmc.org)
+-- Forum: Development (/forumdisplay.php?fid=32)
+--- Forum: Development (/forumdisplay.php?fid=93)
+--- Thread: [Windows] AudioEngine testers - Windows platform only (/showthread.php?tid=124600)

Pages: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84

RE: [Windows] AudioEngine testers - Windows platform only - DDDamian - 2012-05-17 17:06

@jpsdr - commited your patch with one change - it can be viewed here

Here's the diff output:
Code:
xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp |    9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
index 55c6be3..a70a5f0 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp
@@ -681,8 +681,17 @@ void CAESinkWASAPI::EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList)

       for (int k = AE_CH_LAYOUT_MAX; k > 0; k--)
       {
+        DWORD mask = 0;
+        for (int c = 0; c < WASAPI_SPEAKER_COUNT; c++)
+        {
+          if (uiChannelMask & WASAPIChannelOrder[c])
+            mask |= WASAPIChannelOrder[c];
+        }
+
+        wfxex.dwChannelMask             = mask;
         wfxex.Format.nChannels          = k;
         wfxex.Format.nBlockAlign        = wfxex.Format.nChannels * (wfxex.Format.wBitsPerSample >> 3);
+        wfxex.Format.nAvgBytesPerSec    = wfxex.Format.nSamplesPerSec * wfxex.Format.nBlockAlign;
         hr = pClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE, &wfxex.Format, NULL);
         if (SUCCEEDED(hr))
         {

Only change was to use c < WASAPI_SPEAKER_COUNT instead of c < k as the channel ordering in windows is not linear, i.e. 5.1 mask = 63 decimal = 111111 binary, whereas 7.1 = 1599 decimal = 11000111111 binary. Using the windows channel layouts we define in WASAPIChannelOrder[x] will work for the 21 channels defined by windows, so it's a little more correct and future-proof. Your code returned a channel mask of 111111 for 7.1 layouts which is incorrect. I'm still debating whether we use the windows speaker setting as set by the user for the enumeration code or the actual capabilites (currently used) reported by the driver, but that's a different question.

That said, nice catch and I've acknowledged your work there in the commit message.

RE: [Windows] AudioEngine testers - Windows platform only - jpsdr - 2012-05-18 13:04

I've reverted back to original file on my PC, update to Git, build and tested a new version : Things are fine.
Thanks.

Edit :
I think code can even be "cleaner".
Compute of mask was inside the k loop because it's value changed for each k.
Now, there is no need for it to be inside the loop, and something like this would be "cleaner" :
Code:
DWORD mask = 0;
     for (int c = 0; c < WASAPI_SPEAKER_COUNT; c++)
     {
       if (uiChannelMask & WASAPIChannelOrder[c])
         mask |= WASAPIChannelOrder[c];
     }
      /* Test format for channels iteration */
      wfxex.Format.cbSize               = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
      wfxex.dwChannelMask               = mask;
      wfxex.Format.wFormatTag           = WAVE_FORMAT_EXTENSIBLE;
      wfxex.SubFormat                   = KSDATAFORMAT_SUBTYPE_PCM;
      wfxex.Format.nSamplesPerSec       = 48000;
      wfxex.Format.wBitsPerSample       = 16;
      wfxex.Samples.wValidBitsPerSample = 16;
      wfxex.Format.nChannels            = 2;
      wfxex.Format.nBlockAlign          = wfxex.Format.nChannels * (wfxex.Format.wBitsPerSample >> 3);
      wfxex.Format.nAvgBytesPerSec      = wfxex.Format.nSamplesPerSec * wfxex.Format.nBlockAlign;

      //bool mpcmFlagged                  = false;

      for (int k = AE_CH_LAYOUT_MAX; k > 0; k--)
      {
        wfxex.Format.nChannels          = k;
        wfxex.Format.nBlockAlign        = wfxex.Format.nChannels * (wfxex.Format.wBitsPerSample >> 3);
        wfxex.Format.nAvgBytesPerSec    = wfxex.Format.nSamplesPerSec * wfxex.Format.nBlockAlign;
        hr = pClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE, &wfxex.Format, NULL);

Even beter, would be something like that :
Code:
wfxex.dwChannelMask               = SpeakerMaskFromAEChannels(deviceChannels);
without even to have to compute mask, and using deviceChannels computed previously in the function. Unfortunately, this last one can't be compiled because of something related to class declaration : It's too much C++ specific for my knowledge.

RE: [Windows] AudioEngine testers - Windows platform only - JHTom - 2012-05-22 19:13

I recently upgraded from Eden to the May 20 nightly build and previous issues I had with playing DTS have been solved. However, when I play a movie with TrueHD (I am playing the core Dolby Digital only as I output via optical into a pre/pro that doesn't support HD) the video stutters quite a bit and the av sync is off. If I switch to the Dolby Digital stream only, the video plays back smoothly, but the av sync is still off.

Here is a log using the TrueHD stream:
http://pastebin.com/663L42Y9

Here is a log using the dedicated Dolby Digital stream:
http://pastebin.com/1HhPWY6r

Let me know what other information may be helpful.

Tom

RE: [Windows] AudioEngine testers - Windows platform only - DDDamian - 2012-05-22 20:29

@JHTom - trying to play TrueHD as multichannel PCM thru optical won't work, optical can't send decoded TrueHD>pcm multichannel - you're better off to stick to the DD track. There are multiple errors from ffmpeg in reading the track - not sure if that might be causing the sync issues.

I'd also use WASAPI for both the passthrough and non-passthrough devices. Try reading the TrueHD track with WASAPI as the output device - it should extract the AC3 (DD) okay. You also need to make sure the setting "Receiver accepts multichannel lpcm" is off.

RE: [Windows] AudioEngine testers - Windows platform only - JHTom - 2012-05-22 21:18

@Damian. Thanks, I corrected the passthrough output device to wasapi (I don't have multichannel lpcm capable receiver checked-it is grayed out and can't be checked). Selecting the TrueHD track the DD is extracted and sounds good. However, the video still stutters a lot. No problems if I select the DD track.

http://pastebin.com/X1WarFqJ

RE: [Windows] AudioEngine testers - Windows platform only - DDDamian - 2012-05-22 21:47

@JHTom - do you have another TrueHD sample file? Just concerned by all the ffmpeg errors in the log - don't usually see those and they make me suspicious of the file.

EDIT: scratch that - just reproduced it here by disabling TrueHD and m/c pcm capable. Looks like the a/v sync clock repeatedly goes negative while transcoding to AC3, so that's a bug.

RE: [Windows] AudioEngine testers - Windows platform only - Senthil - 2012-05-25 03:55

(2012-05-10 03:48)DDDamian Wrote:  We've been working on a seperate branch for next month's merge window as this one closes tomorrow. Bug-fixes can be pushed to master any time though and will continue to be the first priority. Gnif has written a new class and methods for handling DSP's (digital signal processors) and I have written two so far - a headphones enhancement and a low-pass filter for subs when upmixing. Next is a DRC (dynamic range compression) feature for better voice clarity similar to a "night mode" on many receivers, making movies less "loud" while allowing you to hear speech better.

We also have a lot to do in terms of documentation (the Wiki for one) and a better GUI settings page, hopefully over the next month or so.

Thanks for all the testing work so far, and hope you enjoy our efforts as much as we do Smile

Great to see finally great guys hear working on DSP's, last time when i looked in the feature requests, ticket no-#65 (Equalizer and audio channel volume control) and #66(Configurable Audio Normalization Levels) these features are really good to have and specially for people using analog out (get rid of that dodgy AVR's) lol.

Hi DDDamian, just curious to know! do you have any idea of possible implementation of these DSP's! i mean #65 & #66. If we do a voting across the world for these DSP's in xbmc, you might be surprised how many people wanted this.

RE: [Windows] AudioEngine testers - Windows platform only - DDDamian - 2012-05-25 04:47

Hi Senthil - in the post you quoted of mine those are the first three: headphones HRTF (head-related transfer function), a low-pass filter to protect subs from higher frequencies, and DRC.

I think next up will be configurable downmix normalization and channel levels. An EQ is probably more of a GUI challange from my perspective - not much GUI experience here, but some other team members can help with that.

RE: [Windows] AudioEngine testers - Windows platform only - Senthil - 2012-05-25 05:46

(2012-05-25 04:47)DDDamian Wrote:  Hi Senthil - in the post you quoted of mine those are the first three: headphones HRTF (head-related transfer function), a low-pass filter to protect subs from higher frequencies, and DRC.

I think next up will be configurable downmix normalization and channel levels. An EQ is probably more of a GUI challange from my perspective - not much GUI experience here, but some other team members can help with that.

Great thanks rep +1..Laugh

RE: [Windows] AudioEngine testers - Windows platform only - DDDamian - 2012-05-25 08:06

(2012-05-25 05:46)Senthil Wrote:  
(2012-05-25 04:47)DDDamian Wrote:  Hi Senthil - in the post you quoted of mine those are the first three: headphones HRTF (head-related transfer function), a low-pass filter to protect subs from higher frequencies, and DRC.

I think next up will be configurable downmix normalization and channel levels. An EQ is probably more of a GUI challange from my perspective - not much GUI experience here, but some other team members can help with that.

Great thanks rep +1..Laugh

Heh - thx - thank me twice when they're done Tongue