From 0682c79f1a65be0af818925f14d9c267fa7e0c8e Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 23 Apr 2019 10:22:14 -0700 Subject: [PATCH] Support arbitrary sampling rate in FLAC Bug: 122491377 Test: build Change-Id: Id7b92480312a8e5dbc214072b7f0e305e27670b0 --- media/extractors/flac/FLACExtractor.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/media/extractors/flac/FLACExtractor.cpp b/media/extractors/flac/FLACExtractor.cpp index 8854631332..5329bd112f 100644 --- a/media/extractors/flac/FLACExtractor.cpp +++ b/media/extractors/flac/FLACExtractor.cpp @@ -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; }