Use AudioUnit instead of AudioDevice properties to get channel count.

Use AudioUnit instead of AudioDevice properties to get channel count.

On some devices kAudioDevicePropertyPreferredChannelLayout is not available
or lists the channel types as unknown. kAudioUnitProperty_AudioChannelLayout
instead seems to always be set and correct, so use it instead.

To do this, I've introduced a new helper class ScopedAudioUnit which helps
with the allocation and deallocation of AudioUnits. In a followup patch set
I'll convert the input and output streams to use this new mechanism.

BUG=671308, 675787
TEST=user verified success.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2771093002
Cr-Commit-Position: refs/heads/master@{#460250}
Committed: https://chromium.googlesource.com/chromium/src/+/5285d00f561827da882c8faaa7bda1d571c4fc60

[DaleCurtis, 2017-03-23 21:26:58]

Description was changed from

==========
Use AudioUnit instead of AudioDevice properties to get channel count.

On some devices kAudioDevicePropertyPreferredChannelLayout is not available
or lists the channel types as unknown. kAudioUnitProperty_AudioChannelLayout
instead seems to always be set and correct, so use it instead.

To do this, I've introduced a new helper class ScopedAudioUnit which helps
with the allocation and deallocation of AudioUnits. In a followup patch set
I'll convert the input and output streams to use this new mechanism.

BUG=671308
TEST=user verified success.
==========

to

==========
Use AudioUnit instead of AudioDevice properties to get channel count.

On some devices kAudioDevicePropertyPreferredChannelLayout is not available
or lists the channel types as unknown. kAudioUnitProperty_AudioChannelLayout
instead seems to always be set and correct, so use it instead.

To do this, I've introduced a new helper class ScopedAudioUnit which helps
with the allocation and deallocation of AudioUnits. In a followup patch set
I'll convert the input and output streams to use this new mechanism.

BUG=671308
TEST=user verified success.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
==========

[DaleCurtis, 2017-03-23 21:31:36]

Patchset #1 (id:1) has been deleted

[DaleCurtis, 2017-03-23 22:14:41]

dalecurtis@chromium.org changed reviewers:
+ hongchan@chromium.org, tommi@chromium.org

[DaleCurtis, 2017-03-23 22:14:42]

Hey Hongchan, have another multichannel change for you to test :p The bug
reporter verified this method correctly retrieves the channels for him, but I
still need to verify it works correctly with your 16 channel device in its
various modes. Can you confirm when you have time?

+tommi for review.

[DaleCurtis, 2017-03-23 22:15:04]

https://codereview.chromium.org/2771093002/diff/60001/media/audio/mac/audio_a...
File media/audio/mac/audio_auhal_mac.cc (left):

https://codereview.chromium.org/2771093002/diff/60001/media/audio/mac/audio_a...
media/audio/mac/audio_auhal_mac.cc:117: // Get the total number of output
channels that the
Deleted this since it's enforced by the AudioOutputResampler.

[tommi (sloooow) - chröme, 2017-03-24 04:52:23]

lgtm

[hongchan, 2017-03-24 16:38:36]

On 2017/03/24 04:52:23, tommi - chröme wrote:
> lgtm

This is what I got from the binary from the bug entry:

---

Note: Google Test filter = MacAudioInputTest.AudioOutputTest
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from MacAudioInputTest
[ RUN      ] MacAudioInputTest.AudioOutputTest
[13070:775:0324/093743.663041:587209686646331:ERROR:audio_manager_mac.cc(335)]
Output total channels: 16
[13070:775:0324/093743.663104:587209686687681:ERROR:audio_manager_mac.cc(456)]
Total count exceeds 8 channels, preferring total count.
[13070:775:0324/093743.663122:587209686704760:ERROR:audio_low_latency_input_mac_unittest.cc(292)]
Params: format: 1 channel_layout: 29 channels: 16 sample_rate: 48000
bits_per_sample: 16 frames_per_buffer: 256 effects: 0 mic_positions:
[13070:775:0324/093743.663329:587209686913551:ERROR:audio_manager_mac.cc(335)]
Output total channels: 16
[13070:775:0324/093743.663358:587209686940787:ERROR:audio_manager_mac.cc(456)]
Total count exceeds 8 channels, preferring total count.
[13070:775:0324/093743.663502:587209687086067:ERROR:audio_manager_mac.cc(335)]
Output total channels: 16
[13070:775:0324/093743.663527:587209687110304:ERROR:audio_manager_mac.cc(456)]
Total count exceeds 8 channels, preferring total count.
[       OK ] MacAudioInputTest.AudioOutputTest (5078 ms)
[----------] 1 test from MacAudioInputTest (5078 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (5078 ms total)
[  PASSED  ] 1 test.
[1/1] MacAudioInputTest.AudioOutputTest (5078 ms)
SUCCESS: all tests passed.
Tests took 5 seconds.

---

[DaleCurtis, 2017-03-24 21:38:42]

Thanks hongchan@, looks like we have to keep GetDeviceTotalChannelCount() after
all for 16 channel devices. I've reverted the deletion of this in the latest
patch set. PTAL.

[hongchan, 2017-03-28 19:33:24]

On 2017/03/24 21:38:42, DaleCurtis wrote:
> Thanks hongchan@, looks like we have to keep GetDeviceTotalChannelCount()
after
> all for 16 channel devices. I've reverted the deletion of this in the latest
> patch set. PTAL.

I can confirm that 16-channel audio device shows up correctly with PS4.

[DaleCurtis, 2017-03-28 21:30:11]

The CQ bit was checked by dalecurtis@chromium.org

[DaleCurtis, 2017-03-28 21:30:11]

hongchan@ defers to tommi@ for review, so submitting. Thanks for testing and
review!

[DaleCurtis, 2017-03-28 21:30:12]

The patchset sent to the CQ was uploaded after l-g-t-m from tommi@chromium.org
Link to the patchset: https://codereview.chromium.org/2771093002/#ps80001
(title: "Revert deletion of GetDeviceTotalChannelCount.")

[commit-bot: I haz the power, 2017-03-28 21:30:37]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[DaleCurtis, 2017-03-28 21:31:10]

Description was changed from

==========
Use AudioUnit instead of AudioDevice properties to get channel count.

On some devices kAudioDevicePropertyPreferredChannelLayout is not available
or lists the channel types as unknown. kAudioUnitProperty_AudioChannelLayout
instead seems to always be set and correct, so use it instead.

To do this, I've introduced a new helper class ScopedAudioUnit which helps
with the allocation and deallocation of AudioUnits. In a followup patch set
I'll convert the input and output streams to use this new mechanism.

BUG=671308
TEST=user verified success.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
==========

to

==========
Use AudioUnit instead of AudioDevice properties to get channel count.

On some devices kAudioDevicePropertyPreferredChannelLayout is not available
or lists the channel types as unknown. kAudioUnitProperty_AudioChannelLayout
instead seems to always be set and correct, so use it instead.

To do this, I've introduced a new helper class ScopedAudioUnit which helps
with the allocation and deallocation of AudioUnits. In a followup patch set
I'll convert the input and output streams to use this new mechanism.

BUG=671308, 675787
TEST=user verified success.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
==========

[commit-bot: I haz the power, 2017-03-28 21:50:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-28 21:50:59]

Exceeded global retry quota

[DaleCurtis, 2017-03-29 00:01:43]

The CQ bit was checked by dalecurtis@chromium.org

[commit-bot: I haz the power, 2017-03-29 00:02:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-29 00:27:41]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1490745703599960,
"parent_rev": "56b7a0680cfd690e899e0115a3a986d165c7c6fa", "commit_rev":
"5285d00f561827da882c8faaa7bda1d571c4fc60"}

[commit-bot: I haz the power, 2017-03-29 00:28:46]

Description was changed from

==========
Use AudioUnit instead of AudioDevice properties to get channel count.

On some devices kAudioDevicePropertyPreferredChannelLayout is not available
or lists the channel types as unknown. kAudioUnitProperty_AudioChannelLayout
instead seems to always be set and correct, so use it instead.

To do this, I've introduced a new helper class ScopedAudioUnit which helps
with the allocation and deallocation of AudioUnits. In a followup patch set
I'll convert the input and output streams to use this new mechanism.

BUG=671308, 675787
TEST=user verified success.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
==========

to

==========
Use AudioUnit instead of AudioDevice properties to get channel count.

On some devices kAudioDevicePropertyPreferredChannelLayout is not available
or lists the channel types as unknown. kAudioUnitProperty_AudioChannelLayout
instead seems to always be set and correct, so use it instead.

To do this, I've introduced a new helper class ScopedAudioUnit which helps
with the allocation and deallocation of AudioUnits. In a followup patch set
I'll convert the input and output streams to use this new mechanism.

BUG=671308, 675787
TEST=user verified success.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2771093002
Cr-Commit-Position: refs/heads/master@{#460250}
Committed:
https://chromium.googlesource.com/chromium/src/+/5285d00f561827da882c8faaa7bd...
==========

[commit-bot: I haz the power, 2017-03-29 00:28:48]

Committed patchset #4 (id:80001) as
https://chromium.googlesource.com/chromium/src/+/5285d00f561827da882c8faaa7bd...