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

am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev

Browse Source 
* commit '98ba8409876087f32114d889435b7f1bd7a73ffb':
  AudioRecord: filter attributes
This commit is contained in:
Jean-Michel Trivi
2014-12-26 20:30:04 +00:00
committed by Android Git Automerger
parent 38cba11ba9 98ba840987
commit 6fa5d8dab0
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/java/android/media/AudioRecord.java
View File

@@ -273,18 +273,23 @@ public class AudioRecord
mInitializationLooper = Looper.getMainLooper(); mInitializationLooper = Looper.getMainLooper();
} }
mAudioAttributes = attributes;
// is this AudioRecord using REMOTE_SUBMIX at full volume? // is this AudioRecord using REMOTE_SUBMIX at full volume?
if (mAudioAttributes.getCapturePreset() == MediaRecorder.AudioSource.REMOTE_SUBMIX) { if (attributes.getCapturePreset() == MediaRecorder.AudioSource.REMOTE_SUBMIX) {
final Iterator<String> tagsIter = mAudioAttributes.getTags().iterator(); final AudioAttributes.Builder filteredAttr = new AudioAttributes.Builder();
final Iterator<String> tagsIter = attributes.getTags().iterator();
while (tagsIter.hasNext()) { while (tagsIter.hasNext()) {
if (tagsIter.next().equalsIgnoreCase(SUBMIX_FIXED_VOLUME)) { final String tag = tagsIter.next();
if (tag.equalsIgnoreCase(SUBMIX_FIXED_VOLUME)) {
mIsSubmixFullVolume = true; mIsSubmixFullVolume = true;
Log.v(TAG, "Will record from REMOTE_SUBMIX at full fixed volume"); Log.v(TAG, "Will record from REMOTE_SUBMIX at full fixed volume");
break; } else { // SUBMIX_FIXED_VOLUME: is not to be propagated to the native layers
filteredAttr.addTag(tag);
} }
} }
filteredAttr.setInternalCapturePreset(attributes.getCapturePreset());
mAudioAttributes = filteredAttr.build();
} else {
mAudioAttributes = attributes;
} }
int rate = 0; int rate = 0;