From patchwork Mon Oct 31 16:09:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martijn van Beurden X-Patchwork-Id: 39090 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp1009233pzj; Mon, 31 Oct 2022 09:09:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7oNHtkrq2qYzzgKC8wc3huV/bsO2YLLeCE1U4pIPC3ZHG7z436zI6HqAFRAIPVxi5eftaK X-Received: by 2002:a17:907:628f:b0:72f:57da:c33d with SMTP id nd15-20020a170907628f00b0072f57dac33dmr13416830ejc.374.1667232581013; Mon, 31 Oct 2022 09:09:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667232581; cv=none; d=google.com; s=arc-20160816; b=dLg9ERiz8G2N2Ue+PTrS3Sh6HidZz1+3e2d3a/9X1pyZkhqXtNprLfATCL5vC2Gox1 Bue1B2iq12xOYJxv3b1nDIfKXP5IKJyeNUpHfp7e+1kiOajOtpy5W+hAXDcf94vZLTyn OT8t6rAXUDZo4DT1G+qrhSU9PwHSbifPgQGg3NhpkN9sLByClvusonONAG2xr2IQ2yBg yHjVMqyWCLI4KGTOY/MWtZPolfgX03ulEu9XE/xiPQuUFEYsZ/xECIrjzmBfDe2V4/UT PCoYv9HktKSbVcLs12EvwxFSxWrTiuVQcT+b2EnBpdWIkzltIKUCwkQIC3f4dlzH52Xb DEDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=gcj1CqrWta3Ean/RwLNE5LKmhBFD+HbQS+WDCtL8B9k=; b=lGdt+WbHpCPMJdmnYefGbyWmgFVGiKXPbxv9SfS+r68HxwHopGzbZLbyxh5rAAM6Q+ mIkhU0mCA5Se1TV5YAUYS9ITGYtfKYcmKoLXRsHVygePpYr7DoTZ6AmV2Uel6ElK2PSU d+RShJOwUwKl60NpldBdH41gIjo2xrN4g0uHvS/SH1NdN65tytC7ICgcEPYKJYjRK6Kl Qi32twFEfaqzOdW1p1/8EZgumSH3JRbYF2Yp1YT45sIOxlCrs7TJcnqfEFZ5yL2RuZQw 64LWhRQPKBZ6/qnF072Spz+poL8bkm588c02hII6AU3JqZTCNjKp2bzUIdQgfp8GVw36 aNrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IPskow2z; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh14-20020a1709076e8e00b0078d288c1047si7857597ejc.841.2022.10.31.09.09.38; Mon, 31 Oct 2022 09:09:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IPskow2z; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9452868BE25; Mon, 31 Oct 2022 18:09:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC1DF68BAD8 for ; Mon, 31 Oct 2022 18:09:28 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id n12so30534867eja.11 for ; Mon, 31 Oct 2022 09:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BQRskMrALpl6/RhXVZNzpjZorCF2J2yvWSg61F6pQ3Y=; b=IPskow2zwqgib05Ql0paw6csdhlp7YlNpj2k/YHrjmgoE/j6Cb2hB971o/+fJEj12W U3XlhFp0a3ky0hA5Sl1Dl2zr5mP1Zm3TuJDKstVOZ7YFIW1v60qBseSdByRiNrSYBQNh D+fSbSJzm0HIjcLUgqAyiHN3AywKJvWiGX6/V01f2E0jPfcNqn6wTA6wGoPaatu0yF3R YLZCb/nL5dti9VbrtBSEvdaRkU5xYsq0iYqLXHXfg9co5dh6icOZWiBu/gUVM0a4thrM GLszvpilCuV+iBe+EONImIDTbS2KPEfQ3hl5QXcy96CBM6JCTqzj6ZFtb9VppDhKEmno GaJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BQRskMrALpl6/RhXVZNzpjZorCF2J2yvWSg61F6pQ3Y=; b=0DdpAQNo8m8Bazd/ZouduCpladAL30TNwah5Sclx03sZSJtNl5KuOJRaMZzoKfXohH bLLUMIZUUtin0FB/19oTZvOspnTsi1eoFbn+HvZ3v5cu9sxzsiXXQPIBJ1GgYzHuwwrk 2muQsx3Wu7CfDC3157kBaanVKMxUikIDlFMHNCisuP/VRDn9JtNn0JZT703f15YQTuOh A/qjdyalCcWtpXnV/xZhy9uYR7QZLNn3MiYFt/TnxbOspVSHjRkI6k7KtELZuTrCG17g 2UHwhg7difpLjkDciMtKNNOnWMZ6YrrSKqa5mLufN4ip4SRk0g9xVL+nVHFxcgNXCmB8 zOZw== X-Gm-Message-State: ACrzQf1tagmnW0d9fIXw7K4gOVvfGJAWywbu5OsQUczuaqJHQa3pyZmm 2auSOCqEdH8lPFnFV2vUeLQ3JF3oVZE= X-Received: by 2002:a17:907:72cf:b0:7ad:7e95:69d7 with SMTP id du15-20020a17090772cf00b007ad7e9569d7mr12992891ejc.97.1667232567432; Mon, 31 Oct 2022 09:09:27 -0700 (PDT) Received: from localhost.localdomain (92-64-99-37.biz.kpn.net. [92.64.99.37]) by smtp.googlemail.com with ESMTPSA id b26-20020aa7dc1a000000b00457b5ba968csm3349680edu.27.2022.10.31.09.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 09:09:27 -0700 (PDT) From: Martijn van Beurden To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2022 17:09:15 +0100 Message-Id: <20221031160915.673782-1-mvanb1@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/flacenc: Enable sample rates > 655350 Hz X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Martijn van Beurden Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: m1LOQtjG6+jt Also, make use of the full sample rate code table --- libavcodec/flacenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 5d8c3f82be..bca71b3780 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -299,7 +299,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) /* find samplerate in table */ if (freq < 1) return AVERROR(EINVAL); - for (i = 4; i < 12; i++) { + for (i = 1; i < 12; i++) { if (freq == ff_flac_sample_rate_table[i]) { s->samplerate = ff_flac_sample_rate_table[i]; s->sr_code[0] = i; @@ -318,6 +318,9 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) } else if (freq < 65535) { s->sr_code[0] = 13; s->sr_code[1] = freq; + } else if (freq < 1048576) { + s->sr_code[0] = 0; + s->sr_code[1] = 0; } else { av_log(avctx, AV_LOG_ERROR, "%d Hz not supported\n", freq); return AVERROR(EINVAL);