Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Tv source audio device adjust volume, and audio is breaks up intermittently."

Browse Source
This commit is contained in:
Treehugger Robot
2021-10-26 07:21:52 +00:00
committed by Gerrit Code Review
parent 1c4d67b35b fe52156ea3
commit 67dccd5e64
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -1075,19 +1075,24 @@ class TvInputHardwareManager implements TvInputHal.Callback {
} }
if (shouldRecreateAudioPatch) { if (shouldRecreateAudioPatch) {
mCommittedVolume = volume; mCommittedVolume = volume;
// only recreate if something was updated or audioPath is null
if (mAudioPatch == null || sinkUpdated ||sourceUpdated ) {
if (mAudioPatch != null) { if (mAudioPatch != null) {
mAudioManager.releaseAudioPatch(mAudioPatch); mAudioManager.releaseAudioPatch(mAudioPatch);
audioPatchArray[0] = null;
} }
mAudioManager.createAudioPatch( mAudioManager.createAudioPatch(
audioPatchArray, audioPatchArray,
new AudioPortConfig[] { sourceConfig }, new AudioPortConfig[] { sourceConfig },
sinkConfigs.toArray(new AudioPortConfig[sinkConfigs.size()])); sinkConfigs.toArray(new AudioPortConfig[sinkConfigs.size()]));
mAudioPatch = audioPatchArray[0]; mAudioPatch = audioPatchArray[0];
}
}
if (sourceGainConfig != null) { if (sourceGainConfig != null) {
mAudioManager.setAudioPortGain(mAudioSource, sourceGainConfig); mAudioManager.setAudioPortGain(mAudioSource, sourceGainConfig);
} }
} }
}
@Override @Override
public void setStreamVolume(float volume) throws RemoteException { public void setStreamVolume(float volume) throws RemoteException {