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

Commit 856a48a0 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use size_t for frame count"

parents c3c427d2 fd1e3dfd

core/jni/android_media_AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static jint android_media_AudioRecord_get_min_buff_size(JNIEnv *env, jobject th 
    ALOGV(">> android_media_AudioRecord_get_min_buff_size(%d, %d, %d)",

          sampleRateInHertz, nbChannels, audioFormat);



    int frameCount = 0;

    size_t frameCount = 0;

    status_t result = AudioRecord::getMinFrameCount(&frameCount,

            sampleRateInHertz,

            (audioFormat == javaAudioRecordFields.PCM16 ?

core/jni/android_media_AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th 
    ALOGV("sampleRate=%d, audioFormat(from Java)=%d, channel mask=%x, buffSize=%d",

        sampleRateInHertz, audioFormat, javaChannelMask, buffSizeInBytes);

    uint32_t afSampleRate;

    int afFrameCount;

    size_t afFrameCount;



    if (AudioSystem::getOutputFrameCount(&afFrameCount, (audio_stream_type_t) streamType) != NO_ERROR) {

        ALOGE("Error creating AudioTrack: Could not get AudioSystem frame count.");
@@ -786,7 +786,7 @@ static jint android_media_AudioTrack_get_output_sample_rate(JNIEnv *env, jobjec 
static jint android_media_AudioTrack_get_min_buff_size(JNIEnv *env,  jobject thiz,

    jint sampleRateInHertz, jint nbChannels, jint audioFormat) {



    int frameCount = 0;

    size_t frameCount = 0;

    if (AudioTrack::getMinFrameCount(&frameCount, AUDIO_STREAM_DEFAULT,

            sampleRateInHertz) != NO_ERROR) {

        return -1;

voip/jni/rtp/AudioGroup.cpp

+2 −2
Original line number Diff line number Diff line
@@ -785,8 +785,8 @@ bool AudioGroup::DeviceThread::threadLoop() 
    int deviceSocket = mGroup->mDeviceSocket;



    // Find out the frame count for AudioTrack and AudioRecord.

    int output = 0;

    int input = 0;

    size_t output = 0;

    size_t input = 0;

    if (AudioTrack::getMinFrameCount(&output, AUDIO_STREAM_VOICE_CALL,

        sampleRate) != NO_ERROR || output <= 0 ||

        AudioRecord::getMinFrameCount(&input, sampleRate,