From patchwork Thu Sep 15 16:21:42 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: 34814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp420701pzh; Thu, 15 Sep 2022 09:22:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7fF7jWUnXSLAH86vmoLXlE/P2c9hvMOYxd4B4Te+BGBWEl2GoiWIM6Y25yibnAeNj6KSkh X-Received: by 2002:a17:907:3e27:b0:774:3e36:f00e with SMTP id hp39-20020a1709073e2700b007743e36f00emr528277ejc.83.1663258928836; Thu, 15 Sep 2022 09:22:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663258928; cv=none; d=google.com; s=arc-20160816; b=Fl9l0TRgn0OHwTAMFgXM2KjrT5ccVVejoBwkAyuogwP8DjNvwBiMFEO4tN9d60ueee OHNEPaW6O0rBkTuc/kZqV8waYbgcnDZM7JLlox4D5gDOMS/85x78uZ21AAcF78vSru9c KW57SxuOXA+y/sa0HYLRIHNVxzvRI/bzBT9mDudg/R83cF4rdjDMURrbstQgaa6hiQUg oy4srg1IIlCiEWWV6IeJ7sZHnkMuBegqsnqY8Ctf9rNDvuiYPw70DjoGDzR9ssNeNxe5 hanpJpSOpadD0RVN5h1GsNfRaP6kh55eX6+8ERTDOQJ4GbXdEIObk5fJTRDqBdI8qC8Z QmRg== 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=Cl4mBQ0BKSyR3bgamA3wnaJF4a16vy2sme6PEqZ/1gE=; b=WVSUebeBEERpxcgq2uPOcfWWyFt5O3oJnD+pEpNDDWby7fXnYGCZPlMqkaWjpYuzKt Me0cBp+ekrM1cuXhYWqU54d0Rtijb2P5xHCzfKmi+kiR1tveLJMfmp6eh3NOOjjsoUkA yLarT4XFwpVOMsAAR4xEc1rPmB5gW9u2rUDmO7fv6j334f7ocHvcdly9boFWG2MUJWMI wpHQtJ/DkCsyHuLc8CTybO5W/IkIpPqpeyojs2SbLjDo48AMkVuoGMNH5KPZzxDEn8Ys ZiCF4RgCs+olCd8xtDEWB3mMzbFOVwettVfH5MX/SFfRWJ1uhs5s4LCQIiw8ElSnD4E/ bOow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=niybkSd0; 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 gl1-20020a1709073c8100b0077e9225816csi5886656ejc.837.2022.09.15.09.22.08; Thu, 15 Sep 2022 09:22:08 -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=niybkSd0; 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 DEC8368BBA6; Thu, 15 Sep 2022 19:22:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF16E68B8EC for ; Thu, 15 Sep 2022 19:21:56 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id a26so14607469ejc.4 for ; Thu, 15 Sep 2022 09:21:56 -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; bh=g4jA688uE/84wqFgvC5zIIxxyny6X2pGwmi3afLIdcw=; b=niybkSd0ibzRFjt46EXsL8i2PuftcQj648molQU7t1fBx9CVQUhlYNSrE4MwFGvNer z5pVR23eJW0L2465Iuc1c99UnBHOr/mKUears+K14fAHY2CrnC+sYN5JNLK1k9aN3OKn XNMWjwwQVyBMOVYLOrmw8XrcqHhq70JrTFynUdUSqOeE7vnGV71JRuVnQM3TpDJlwUnz yTZMhebR1mH1vX8/HBmp402BybsZQPy9U1irwZNDOrgRSi2/g0ZlYrSjYQB+pbBNVBRv ak44Qg6jJ3wNwXQ4qGit9I+sLc7nlVwzSOo5FxbU0obOC40HEtg1tbCfi1nNVYOK6qno lCkA== 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; bh=g4jA688uE/84wqFgvC5zIIxxyny6X2pGwmi3afLIdcw=; b=Fz7w7bEG6U6QWnlSXRF5vwV1eyu7jL4c3x8fwL3tbP7d5/hv3oXzG0YXS/w0Ju02OA tm1H7qkgwIMzvxMJXmLXL6Yf7aoVDcl9T98IjhwXIjqWV8o9Yqm0xzYb1MoxEoLtcCf8 H3zGaStX7JnRjtw04Z9WwrECddsH4ouCZLElAtSqixyHRdv45XLBPcKqpY0FDg8WeK1s gBn2d89JFo70ze+g3YN8kJcYGn/lDDR+1A4RvnYMOV60iSlpV7GwfhzYY0YYOLxq+CQ5 n4jAssrL4bGOynVaAYlx4IdNQbWDweEnTa55BqHGHNV/Fc6xakcUKidOM9T7lFUjQlin LgjQ== X-Gm-Message-State: ACrzQf0F0zqONQOCogq67SB4jKZyx9D6E3nPjR5HBKhpw/06whOn4Jia gVrbOA4R0Kxhhac/WLSrKOYiIafg19uHWA== X-Received: by 2002:a17:907:9620:b0:77d:4f86:2e66 with SMTP id gb32-20020a170907962000b0077d4f862e66mr482022ejc.751.1663258915029; Thu, 15 Sep 2022 09:21:55 -0700 (PDT) Received: from localhost.localdomain (92-64-99-37.biz.kpn.net. [92.64.99.37]) by smtp.googlemail.com with ESMTPSA id g11-20020a170906538b00b0073ddd36ba8csm9411542ejo.145.2022.09.15.09.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 09:21:54 -0700 (PDT) From: Martijn van Beurden To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Sep 2022 18:21:42 +0200 Message-Id: <20220915162145.2284957-1-mvanb1@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 0/3] 32bps FLAC patches 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: tyEEH1hQgkA6 Recently libFLAC gained the ability (first released in FLAC 1.4.0) to create FLAC files containing 32-bit int PCM samples. To keep complexity reasonable, the choice was made to limit residuals to 32-bit integers, which the encoder must make sure of. In case the encoder cannot find any predictor of which the residuals fit this limit, it must default to using a verbatim subframe. Tests have shown that this does not happen often (<0.1% of subframes on a music corpus of various styles). See also discussion here: https://github.com/ietf-wg-cellar/flac-specification/pull/148 These two patches implement decoding and encoding following this format. Changes since v1: fix copy-paste error in encoder, several invocations of lpc_encode_choose_datapath used wrong parameters, making FATE fail as compression was less than it should be Changes since v2: Rebased decoder part as it didn't apply anymore Changes since v3: Moved put_golomb part to flacenc.c (as it is now quite specific to FLAC) and renamed put_sbits64 to put_sbits63 (and changed assert accordingly) Changes since v4: Fix check of decoded_buffer_33bps malloc. Fix reading of wasted bits for 33bps subframe. Add fate test Martijn van Beurden (3): libavcodec/flacdec: Implement decoding of 32 bit-per-sample PCM libavcodec/flacenc: Implement encoding of 32 bit-per-sample PCM fate/flac: Add test of 32 bps encoding/decoding libavcodec/flac.c | 4 +- libavcodec/flacdec.c | 250 +++++++++++++++++-- libavcodec/flacenc.c | 519 ++++++++++++++++++++++++++++++++-------- libavcodec/get_bits.h | 12 + libavcodec/mathops.h | 9 + libavcodec/put_bits.h | 7 + libavcodec/put_golomb.h | 14 -- tests/fate/flac.mak | 9 + 8 files changed, 684 insertions(+), 140 deletions(-)