Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ed0ceeb authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I6869df3a into eclair 

* changes:
  Add new audio sources to support the A1026 recording configurations.
parents 27c6dd7a 6869df3a

include/media/mediarecorder.h

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ enum audio_source { 
    AUDIO_SOURCE_VOICE_DOWNLINK = 3,

    AUDIO_SOURCE_VOICE_CALL = 4,

    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

};

media/java/android/media/MediaRecorder.java

+7 −1
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ public class MediaRecorder 


        /** Voice call uplink + downlink audio source */

        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.

     * @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