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

Commit 266e56b6 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Support arbitrary sampling rate in FLAC" into qt-dev

am: c947f8f3

Change-Id: If09d6a314ae3117bbab1d2bc3d2db9f6bee43f88
parents b5a4f58e c947f8f3
Loading
Loading
Loading
Loading
+3 −17
Original line number Diff line number Diff line
@@ -531,23 +531,9 @@ status_t FLACParser::init()
            return NO_INIT;
        }
        // check sample rate
        switch (getSampleRate()) {
        case  8000:
        case 11025:
        case 12000:
        case 16000:
        case 22050:
        case 24000:
        case 32000:
        case 44100:
        case 48000:
        case 88200:
        case 96000:
        case 176400:
        case 192000:
            break;
        default:
            // Note: internally we support arbitrary sample rates from 8kHz to 192kHz.
        // Note: flac supports arbitrary sample rates up to 655350 Hz, but Android
        // supports sample rates from 8kHz to 192kHz, so use that as the limit.
        if (getSampleRate() < 8000 || getSampleRate() > 192000) {
            ALOGE("unsupported sample rate %u", getSampleRate());
            return NO_INIT;
        }