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

Commit 764568e6 authored by Shunkai Yao's avatar Shunkai Yao Committed by Gerrit Code Review
Browse files

Merge "remove the min/max sample rate definitions" into main

parents 09bd2678 dd91bbfb

media/libaaudio/src/core/AAudioStreamParameters.cpp

+4 −11
Original line number Diff line number Diff line
@@ -23,13 +23,6 @@ 


using namespace aaudio;



// TODO These defines should be moved to a central place in audio.

#define SAMPLES_PER_FRAME_MIN        1

#define SAMPLES_PER_FRAME_MAX        FCC_LIMIT

#define SAMPLE_RATE_HZ_MIN           8000

// HDMI supports up to 32 channels at 1536000 Hz.

#define SAMPLE_RATE_HZ_MAX           1600000



void AAudioStreamParameters::copyFrom(const AAudioStreamParameters &other) {

    mSamplesPerFrame      = other.mSamplesPerFrame;

    mSampleRate           = other.mSampleRate;
@@ -73,8 +66,8 @@ static aaudio_result_t isFormatValid(audio_format_t format) { 
}



aaudio_result_t AAudioStreamParameters::validate() const {

    if (mSamplesPerFrame != AAUDIO_UNSPECIFIED

        && (mSamplesPerFrame < SAMPLES_PER_FRAME_MIN || mSamplesPerFrame > SAMPLES_PER_FRAME_MAX)) {

    if (mSamplesPerFrame != AAUDIO_UNSPECIFIED && (mSamplesPerFrame < CHANNEL_COUNT_MIN_AAUDIO ||

                                                   mSamplesPerFrame > CHANNEL_COUNT_MAX_AAUDIO)) {

        ALOGD("channelCount out of range = %d", mSamplesPerFrame);

        return AAUDIO_ERROR_OUT_OF_RANGE;

    }
@@ -105,8 +98,8 @@ aaudio_result_t AAudioStreamParameters::validate() const { 
    aaudio_result_t result = isFormatValid (mAudioFormat);

    if (result != AAUDIO_OK) return result;



    if (mSampleRate != AAUDIO_UNSPECIFIED

        && (mSampleRate < SAMPLE_RATE_HZ_MIN || mSampleRate > SAMPLE_RATE_HZ_MAX)) {

    if (mSampleRate != AAUDIO_UNSPECIFIED &&

        (mSampleRate < SAMPLE_RATE_HZ_MIN_AAUDIO || mSampleRate > SAMPLE_RATE_HZ_MAX_IEC610937)) {

        ALOGD("sampleRate out of range = %d", mSampleRate);

        return AAUDIO_ERROR_INVALID_RATE;

    }

media/libaaudio/src/core/AudioStreamBuilder.cpp

+0 −9
Original line number Diff line number Diff line
@@ -46,15 +46,6 @@ using android::media::audio::common::AudioMMapPolicyType; 
#define AAUDIO_MMAP_POLICY_DEFAULT             AAUDIO_POLICY_NEVER

#define AAUDIO_MMAP_EXCLUSIVE_POLICY_DEFAULT   AAUDIO_POLICY_NEVER



// These values are for a pre-check before we ask the lower level service to open a stream.

// So they are just outside the maximum conceivable range of value,

// on the edge of being ridiculous.

// TODO These defines should be moved to a central place in audio.

#define SAMPLES_PER_FRAME_MIN        1

#define SAMPLES_PER_FRAME_MAX        FCC_LIMIT

#define SAMPLE_RATE_HZ_MIN           8000

// HDMI supports up to 32 channels at 1536000 Hz.

#define SAMPLE_RATE_HZ_MAX           1600000

#define FRAMES_PER_DATA_CALLBACK_MIN 1

#define FRAMES_PER_DATA_CALLBACK_MAX (1024 * 1024)

media/libmediaplayerservice/StagefrightRecorder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1334,10 +1334,10 @@ sp<MediaCodecSource> StagefrightRecorder::createAudioSource() { 
        // cause out-of-memory due to large input buffer size. And audio recording

        // probably doesn't make sense in the scenario, since the slow-down factor

        // is probably huge (eg. mSampleRate=48K, mCaptureFps=240, mFrameRate=1).

        const static int32_t SAMPLE_RATE_HZ_MAX = 192000;

        const static int32_t kSampleRateHzMax = 192000;

        sourceSampleRate =

                (mSampleRate * mCaptureFps + mFrameRate / 2) / mFrameRate;

        if (sourceSampleRate < mSampleRate || sourceSampleRate > SAMPLE_RATE_HZ_MAX) {

        if (sourceSampleRate < mSampleRate || sourceSampleRate > kSampleRateHzMax) {

            ALOGE("source sample rate out of range! "

                    "(mSampleRate %d, mCaptureFps %.2f, mFrameRate %d",

                    mSampleRate, mCaptureFps, mFrameRate);

services/audiopolicy/common/include/policy.h

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ static const audio_format_t gDynamicFormat = AUDIO_FORMAT_DEFAULT; 


static const uint32_t SONIFICATION_RESPECTFUL_AFTER_MUSIC_DELAY = 5000;



// For mixed output and inputs, the policy will use max mixer sampling rates.

// Do not limit sampling rate otherwise

#define SAMPLE_RATE_HZ_MAX 192000



// Used when a client opens a capture stream, without specifying a desired sample rate.

#define SAMPLE_RATE_HZ_DEFAULT 48000

services/audiopolicy/common/managerdefinitions/src/PolicyAudioPort.cpp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "PolicyAudioPort.h"

#include "HwModule.h"

#include <policy.h>

#include <system/audio.h>



#ifndef ARRAY_SIZE

#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))