Cherry pick PR #1399: [android] Refine audio output device querying #1403
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`SbMediaGetAudioOutputCount()` was hard coded to return 1. This worked when `SbMediaGetAudioConfiguration()` was hard coded to return HDMI, and breaks 5.1 playbacks on some devices after `SbMediaGetAudioConfiguration()` is refined to return configurations for all audio outputs (including non-HDMI devices) in the system. For example, when the first output is non-HDMI stereo, and the second output is HDMI with 5.1 support, the second output won't be checked in `IsAudioOutputSupported()` because `SbMediaGetAudioOutputCount()` returns 1, and 5.1 streams will be incorrectly rejected. Now `SbMediaGetAudioOutputCount()` tentatively returns 16 on Android TV, and `IsAudioOutputSupported()` will break the loop when `SbMediaGetAudioConfiguration()` returns false. This minimizes the changes required while still allows 5.1 playbacks. Follow up changes should be made to remove `SbMediaGetAudioOutputCount()` completely once this is verified on all platforms. b/284140486 b/297426689 (cherry picked from commit f692f5e)
gbournou
approved these changes
Aug 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refer to the original PR: #1399
SbMediaGetAudioOutputCount()was hard coded to return 1. This worked whenSbMediaGetAudioConfiguration()was hard coded to return HDMI, and breaks 5.1 playbacks on some devices afterSbMediaGetAudioConfiguration()is refined to return configurations for all audio outputs (including non-HDMI devices) in the system.For example, when the first output is non-HDMI stereo, and the second output is HDMI with 5.1 support, the second output won't be checked in
IsAudioOutputSupported()becauseSbMediaGetAudioOutputCount()returns 1, and 5.1 streams will be incorrectly rejected.Now
SbMediaGetAudioOutputCount()tentatively returns 16 on Android TV, andIsAudioOutputSupported()will break the loop whenSbMediaGetAudioConfiguration()returns false. This minimizes the changes required while still allows 5.1 playbacks.Follow up changes should be made to remove
SbMediaGetAudioOutputCount()completely once this is verified on all platforms.b/284140486
b/297426689