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

Commit 1cbf9b37 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Allow sample rate UNSPECIFIED to mean a route-dependent value 

Bug: 25641253
Bug: 21019153
Change-Id: I3b8e01b6ea09f42c813ab1a0f3f625dc3803cc0b
parent 16ad43c0

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19772,6 +19772,7 @@ package android.media { 
    field public static final int ENCODING_PCM_16BIT = 2; // 0x2

    field public static final int ENCODING_PCM_8BIT = 3; // 0x3

    field public static final int ENCODING_PCM_FLOAT = 4; // 0x4

    field public static final int SAMPLE_RATE_UNSPECIFIED = 0; // 0x0

  }















  public static class AudioFormat.Builder {

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -21268,6 +21268,7 @@ package android.media {













    field public static final int ENCODING_PCM_16BIT = 2; // 0x2















    field public static final int ENCODING_PCM_8BIT = 3; // 0x3















    field public static final int ENCODING_PCM_FLOAT = 4; // 0x4













    field public static final int SAMPLE_RATE_UNSPECIFIED = 0; // 0x0















  }





























  public static class AudioFormat.Builder {

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -19781,6 +19781,7 @@ package android.media {













    field public static final int ENCODING_PCM_16BIT = 2; // 0x2















    field public static final int ENCODING_PCM_8BIT = 3; // 0x3















    field public static final int ENCODING_PCM_FLOAT = 4; // 0x4













    field public static final int SAMPLE_RATE_UNSPECIFIED = 0; // 0x0















  }





























  public static class AudioFormat.Builder {

























core/jni/android_media_AudioRecord.cpp



+11
−2




























Original line number
Diff line number
Diff line








@@ -180,9 +180,13 @@ static sp<AudioRecord> setAudioRecord(JNIEnv* env, jobject thiz, const sp<AudioR













// ----------------------------------------------------------------------------















static jint















android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this,













        jobject jaa, jint sampleRateInHertz, jint channelMask, jint channelIndexMask,













        jobject jaa, jintArray jSampleRate, jint channelMask, jint channelIndexMask,















        jint audioFormat, jint buffSizeInBytes, jintArray jSession, jstring opPackageName)















{













    jint elements[1];













    env->GetIntArrayRegion(jSampleRate, 0, 1, elements);













    int sampleRateInHertz = elements[0];





























    //ALOGV(">> Entering android_media_AudioRecord_setup");















    //ALOGV("sampleRate=%d, audioFormat=%d, channel mask=%x, buffSizeInBytes=%d",















    //     sampleRateInHertz, audioFormat, channelMask, buffSizeInBytes);










@@ -304,6 +308,11 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this,













    env->ReleasePrimitiveArrayCritical(jSession, nSession, 0);















    nSession = NULL;





























    {













        const jint elements[1] = { (jint) lpRecorder->getSampleRate() };













        env->SetIntArrayRegion(jSampleRate, 0, 1, elements);













    }





























    {   // scope for the lock















        Mutex::Autolock l(sLock);















        sAudioRecordCallBackCookies.add(lpCallbackData);










@@ -717,7 +726,7 @@ static const JNINativeMethod gMethods[] = {













    // name,               signature,  funcPtr















    {"native_start",         "(II)I",    (void *)android_media_AudioRecord_start},















    {"native_stop",          "()V",    (void *)android_media_AudioRecord_stop},













    {"native_setup",         "(Ljava/lang/Object;Ljava/lang/Object;IIIII[ILjava/lang/String;)I",













    {"native_setup",         "(Ljava/lang/Object;Ljava/lang/Object;[IIIII[ILjava/lang/String;)I",















                                       (void *)android_media_AudioRecord_setup},















    {"native_finalize",      "()V",    (void *)android_media_AudioRecord_finalize},















    {"native_release",       "()V",    (void *)android_media_AudioRecord_release},

































core/jni/android_media_AudioTrack.cpp



+11
−2




























Original line number
Diff line number
Diff line








@@ -215,9 +215,13 @@ static inline audio_channel_mask_t nativeChannelMaskFromJavaChannelMasks(













static jint















android_media_AudioTrack_setup(JNIEnv *env, jobject thiz, jobject weak_this,















        jobject jaa,













        jint sampleRateInHertz, jint channelPositionMask, jint channelIndexMask,













        jintArray jSampleRate, jint channelPositionMask, jint channelIndexMask,















        jint audioFormat, jint buffSizeInBytes, jint memoryMode, jintArray jSession) {





























    jint elements[1];













    env->GetIntArrayRegion(jSampleRate, 0, 1, elements);













    int sampleRateInHertz = elements[0];





























    ALOGV("sampleRate=%d, channel mask=%x, index mask=%x, audioFormat(Java)=%d, buffSize=%d",















        sampleRateInHertz, channelPositionMask, channelIndexMask, audioFormat, buffSizeInBytes);


























@@ -370,6 +374,11 @@ android_media_AudioTrack_setup(JNIEnv *env, jobject thiz, jobject weak_this,













    env->ReleasePrimitiveArrayCritical(jSession, nSession, 0);















    nSession = NULL;





























    {













        const jint elements[1] = { (jint) lpTrack->getSampleRate() };













        env->SetIntArrayRegion(jSampleRate, 0, 1, elements);













    }





























    {   // scope for the lock















        Mutex::Autolock l(sLock);















        sAudioTrackCallBackCookies.add(&lpJniStorage->mCallbackData);










@@ -1114,7 +1123,7 @@ static const JNINativeMethod gMethods[] = {













    {"native_stop",          "()V",      (void *)android_media_AudioTrack_stop},















    {"native_pause",         "()V",      (void *)android_media_AudioTrack_pause},















    {"native_flush",         "()V",      (void *)android_media_AudioTrack_flush},













    {"native_setup",     "(Ljava/lang/Object;Ljava/lang/Object;IIIIII[I)I",













    {"native_setup",     "(Ljava/lang/Object;Ljava/lang/Object;[IIIIII[I)I",















                                         (void *)android_media_AudioTrack_setup},















    {"native_finalize",      "()V",      (void *)android_media_AudioTrack_finalize},















    {"native_release",       "()V",      (void *)android_media_AudioTrack_release},