drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair

Browse Source 
Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp

* commit '3d2d155a87cdd3038a2e6df8741181431cb250e1':
  Add new audio sources to support the A1026 recording configurations.
This commit is contained in:
Jean-Michel Trivi
2009-11-04 13:23:00 -08:00
committed by Android Git Automerger
parent 8495359382 3d2d155a87
commit bd38397bc4
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/media/mediarecorder.h
View File

@ -42,7 +42,8 @@ enum audio_source {
AUDIO_SOURCE_VOICE_DOWNLINK = 3, AUDIO_SOURCE_VOICE_DOWNLINK = 3,
AUDIO_SOURCE_VOICE_CALL = 4, AUDIO_SOURCE_VOICE_CALL = 4,
AUDIO_SOURCE_CAMCORDER = 5, AUDIO_SOURCE_CAMCORDER = 5,
AUDIO_SOURCE_MAX = AUDIO_SOURCE_CAMCORDER, AUDIO_SOURCE_VOICE_RECOGNITION = 6,
AUDIO_SOURCE_MAX = AUDIO_SOURCE_VOICE_RECOGNITION,
AUDIO_SOURCE_LIST_END // must be last - used to validate audio source type AUDIO_SOURCE_LIST_END // must be last - used to validate audio source type
}; };

8
media/java/android/media/MediaRecorder.java
View File

@ -135,6 +135,12 @@ public class MediaRecorder
/** Voice call uplink + downlink audio source */ /** Voice call uplink + downlink audio source */
public static final int VOICE_CALL = 4; public static final int VOICE_CALL = 4;
/** @hide Microphone audio source with same orientation as camera */
public static final int CAMCORDER = 5;
/** @hide Microphone audio source tuned for voice recognition */
public static final int VOICE_RECOGNITION = 6;
} }
/** /**
@ -274,7 +280,7 @@ public class MediaRecorder
* Gets the maximum value for audio sources. * Gets the maximum value for audio sources.
* @see android.media.MediaRecorder.AudioSource * @see android.media.MediaRecorder.AudioSource
*/ */
public static final int getAudioSourceMax() { return AudioSource.VOICE_CALL; } public static final int getAudioSourceMax() { return AudioSource.VOICE_RECOGNITION; }
/** /**
* Sets the video source to be used for recording. If this method is not * Sets the video source to be used for recording. If this method is not