From patchwork Mon Dec 20 08:11:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martijn van Beurden X-Patchwork-Id: 32743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4114497iog; Mon, 20 Dec 2021 00:12:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhiSCwWDnuUop8ARct6wnLPDnKXCkPNKxni2PRJSxJZt03VlbZoWYkctau/xjlBLUTX5Nc X-Received: by 2002:a17:907:9721:: with SMTP id jg33mr5775394ejc.259.1639987939113; Mon, 20 Dec 2021 00:12:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639987939; cv=none; d=google.com; s=arc-20160816; b=zq/ZpkEMmFeduXOtPxmkYHmv4ntFN7bzuYA2Mu9x/W0GuOoByekK6xzUHt9wfhI7sP q8hwc9ly+L9WuhvoeOnVEwNEBlVEWzFu6zeRbLpIMSa8VnkAzeNAptOWyNVBOUqlAuSC ZMQ/7dhcuNz725J6Yq+jRcXJLwnRFdHQ1gy4n7oHnzYbcLCo0kLNdiOqrc7SxQvNAfUS B9K+g/rSAzTL/HCLm8ZeOYKmARbX46lhut6ILLRHGT2UUq+xx671Fgw8K/hoPUXkV9Tw 0PI56txXZpyY7jIuVhONwFoLjC8COqjcxBlsvUg40V0A3w2qyg4TtW4kc0kZcD3/NdaT lSSw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=JAyJ1T08rsTozZ0Z76BR0M1Jjl+awadExLpt0Px6d9I=; b=lMkgyOmIVQ8GgIVmEdQcBan/Rd7gnEHHmjE99aTkcvlcwwsAVj8Ymd7PwLVQMlF6fs OpZg9UL66ZYuDPK0l1+Suh+3wkSxu+E1ckSG+Lfth45S0RGacIOvN1BqZkFpqENa0mz9 TxnoiHkLDT3nGTD+kITEmjlY390uFflaHoTYtNQyOxSIp8PdMqmPYTSZeuFDKOYzxWQM o7s/cT49CYI+mGFR9lcp17IDT9aB4cOGOMbobrsNrsN0+RJGTbqbve15AvVvXKk/WSN9 9wP1r054Vatvu5V23rWzoqUe9QSfy8fNAV+dk+tmpq8KYYbI488Ub9NDwQurqAQfngBS t8Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=djBP6P9p; 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 l7si2727920edr.32.2021.12.20.00.12.18; Mon, 20 Dec 2021 00:12:19 -0800 (PST) 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=djBP6P9p; 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 4438A68AF50; Mon, 20 Dec 2021 10:12:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA5F068AE9B for ; Mon, 20 Dec 2021 10:12:09 +0200 (EET) Received: by mail-ed1-f42.google.com with SMTP id x15so34997482edv.1 for ; Mon, 20 Dec 2021 00:12:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qjzs8/5pOoBBZR5rkcK2pBRrcpYsVm0I1sSaCIEIth4=; b=djBP6P9pun6ufwaedTS55Kzy4eF7WH1jCtCgCJpMWnqXsYcjAVi1ioJFH2maDTRFGt G7HapmG+pryHMfHc9GtYOni2SBiUWo9TlIHnI5BY3c1Z+DskYwYgTgClqGOfjfWzkq1F DV1C0rPSt1+wh8C5ZA4A0//SnZK066Lnc4CRRYTvfpvsaa9RXhldzRx/mY9YpQImaZvs GjLtS9vaRieFccIe8RyN8rhkUCWYpZmJAvQ03P7zVQPAq79d+pR1bSP/XIdp/7bvrw0b swHGzckOh9qFYggUbNfgElb2LazwN8jdGVeeGTJAttB51TsiXhXR00XVSVjFaz5D9U/N /Shg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qjzs8/5pOoBBZR5rkcK2pBRrcpYsVm0I1sSaCIEIth4=; b=wtjDUKSY0OvYiWAj11ivPu9FoM3PLSYX6hyTFjR/jmTQdV8S94UjUgnz7S/+JbRjGF QnI6l7EdDFQTzeJJho6F/zXw3J7CYnMdxacJ8fx4/W8lttHZu9670flqUWhaklPuuNwo 0a8XWxC1Vojl7xqTZEbmog9FsseVxs1tAeQlxpotKIzXvBNRHlqSz9A/GuTK1doDcAI8 LY8VC2N2RkvYBxDNALZ/3IfFkRIFfXLvYPkieFfVqBsnVkqECOXKqjqRsXRAuf1bdRU6 YFJwsAPP8So7iR9L9wUnW5uAAZkyzODmmbPqx9dccwnmtbuX3e1yBs5bfDrkigGdprsw rvXQ== X-Gm-Message-State: AOAM531GwaA7Dkhb7qje0mxKInptYWsXwC9uZzdR2qytBk6p9FRNkRPM jLMiOl0YpNIjD1bjtN5OBbVYy79eJV7D2Q== X-Received: by 2002:a50:e0cc:: with SMTP id j12mr14347242edl.95.1639987928899; Mon, 20 Dec 2021 00:12:08 -0800 (PST) Received: from localhost.localdomain (92-64-99-37.biz.kpn.net. [92.64.99.37]) by smtp.googlemail.com with ESMTPSA id j21sm4909329ejj.133.2021.12.20.00.12.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 00:12:08 -0800 (PST) From: Martijn van Beurden To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Dec 2021 09:11:56 +0100 Message-Id: <20211220081156.12515-1-mvanb1@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavcodec/flacenc: add backward-compatible 32 bit-per-sample capability 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: NUNMBzGAGLhp Enables creation of FLAC files with up to 32 bits-per-sample, up from the previous limit of 24 bit. This is a feature requested for RAWcooked, the archiving community has a need for storing files with 32-bit integer audio samples. See https://github.com/MediaArea/RAWcooked/issues/356 Restrictions to the encoder are added so created files are compatible with existing decoders. Stereo decorrelation is disabled on 32 bit-per-sample, because a side channel would need 33 bit-per-sample, causing problems in existing 32 bit datapaths. Also only LPC encoding is enabled, because decoders capable of processing 24-bit files already use 64-bit processing for LPC, but not for fixed subframes. Furthermore, predictions and residuals are checked for causing integer overflow, reverting to a verbatim (store) subframe in case no LPC coeffs can be found that do not cause overflow. ffmpeg's FLAC decoder has been forward-compatible with this change since commit c720b9ce98 (May 2015). libFLAC is forward-compatible since release 1.2.1 (September 2007), the flac command line tool however blocks 32-bit files out of caution, it having been untested until now. --- libavcodec/flacdsp.c | 45 +++++++++++++++++++++ libavcodec/flacdsp.h | 3 ++ libavcodec/flacenc.c | 94 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 127 insertions(+), 15 deletions(-) diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c index bc9a5dbed9..b6c163981e 100644 --- a/libavcodec/flacdsp.c +++ b/libavcodec/flacdsp.c @@ -43,6 +43,51 @@ #define PLANAR 1 #include "flacdsp_template.c" +#define ZIGZAG_32BIT_MAX 0x3FFFFFFF +#define ZIGZAG_32BIT_MIN -0x3FFFFFFF + +int ff_flacdsp_lpc_encode_c_32_overflow_detect(int32_t *res, const int32_t *smp, int len, + int order, int32_t *coefs, int shift) +{ + /* This function checks for every prediction and every residual + * whether they cause integer overflow in existing decoders. In + * case the prediction exceeds int32_t limits, prediction + * coefficients are lowered accordingly. If the residual exceeds + * ZIGZAG_32BIT_MAX and _MIN or coefficients have been lowered + * twice but the prediction still overflows, give up */ + int lpc_reduction_tries = 0; + int64_t pmax; + for (int i = 0; i < order; i++) + res[i] = smp[i]; + do { + pmax = 0; + for (int i = order; i < len; i++) { + int64_t p = 0, tmp; + for (int j = 0; j < order; j++) + p += (int64_t)coefs[j]*smp[(i-1)-j]; + p >>= shift; + tmp = smp[i] - p; + if (p > INT32_MAX && p > pmax) + pmax = p; + else if (p < INT32_MIN && (p * -1) > pmax) + pmax = p * -1; + if (tmp > ZIGZAG_32BIT_MAX || tmp < ZIGZAG_32BIT_MIN) + return 0; + res[i] = tmp; + } + + if (pmax > 0) { + if (lpc_reduction_tries >= 2) + return 0; + lpc_reduction_tries++; + for (int i = 0; i < order; i++) + coefs[i] = ((int64_t)coefs[i] * INT32_MAX) / pmax; + } + } while (pmax > 0); + return 1; +} + + static void flac_lpc_16_c(int32_t *decoded, const int coeffs[32], int pred_order, int qlevel, int len) { diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h index 7bb0dd0e9a..5978a4722a 100644 --- a/libavcodec/flacdsp.h +++ b/libavcodec/flacdsp.h @@ -40,4 +40,7 @@ void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, i void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, int bps); void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, int bps); +int ff_flacdsp_lpc_encode_c_32_overflow_detect(int32_t *res, const int32_t *smp, int len, + int order, int32_t *coefs, int shift); + #endif /* AVCODEC_FLACDSP_H */ diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 595928927d..a9fd01730f 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -254,10 +254,30 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) s->bps_code = 4; break; case AV_SAMPLE_FMT_S32: - if (avctx->bits_per_raw_sample != 24) - av_log(avctx, AV_LOG_WARNING, "encoding as 24 bits-per-sample\n"); - avctx->bits_per_raw_sample = 24; - s->bps_code = 6; + if (avctx->bits_per_raw_sample > 0 && avctx->bits_per_raw_sample <= 24) { + if (avctx->bits_per_raw_sample < 24) + av_log(avctx, AV_LOG_WARNING, "encoding as 24 bits-per-sample\n"); + avctx->bits_per_raw_sample = 24; + s->bps_code = 6; + } else { + av_log(avctx, AV_LOG_WARNING, "non-streamable bits-per-sample\n"); + s->bps_code = 0; + if (avctx->bits_per_raw_sample == 0) + avctx->bits_per_raw_sample = 32; + if (s->options.lpc_type != FF_LPC_TYPE_LEVINSON && + s->options.lpc_type != FF_LPC_TYPE_CHOLESKY) { + av_log(avctx, AV_LOG_WARNING, "forcing lpc_type levinson, lpc_type fixed or none not supported with >24 bits-per-sample FLAC\n"); + s->options.lpc_type = FF_LPC_TYPE_LEVINSON; + } + if (avctx->bits_per_raw_sample == 32) { + /* Because stereo decorrelation can raise the bitdepth of + * a subframe to 33 bits, we disable it */ + if (s->options.ch_mode != FLAC_CHMODE_INDEPENDENT) { + av_log(avctx, AV_LOG_WARNING, "disabling stereo decorrelation, not supported with 32 bits-per-sample FLAC\n"); + s->options.ch_mode = FLAC_CHMODE_INDEPENDENT; + } + } + } break; } @@ -686,7 +706,7 @@ static uint64_t calc_rice_params(RiceContext *rc, tmp_rc.coding_mode = rc->coding_mode; - for (i = 0; i < n; i++) + for (i = pred_order; i < n; i++) udata[i] = (2 * data[i]) ^ (data[i] >> 31); calc_sum_top(pmax, exact ? kmax : 0, udata, n, pred_order, sums); @@ -868,7 +888,11 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) order = av_clip(order, min_order - 1, max_order - 1); if (order == last_order) continue; - if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(order) <= 32) { + if (s->avctx->bits_per_raw_sample > 24) { + if (!ff_flacdsp_lpc_encode_c_32_overflow_detect(res, smp, n, order+1, + coefs[order], shift[order])) + continue; + } else if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(order) <= 32) { s->flac_dsp.lpc16_encode(res, smp, n, order+1, coefs[order], shift[order]); } else { @@ -888,7 +912,11 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) opt_order = 0; bits[0] = UINT32_MAX; for (i = min_order-1; i < max_order; i++) { - if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(i) <= 32) { + if (s->avctx->bits_per_raw_sample > 24) { + if (!ff_flacdsp_lpc_encode_c_32_overflow_detect(res, smp, n, i+1, + coefs[i], shift[i])) + continue; + } else if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(i) <= 32) { s->flac_dsp.lpc16_encode(res, smp, n, i+1, coefs[i], shift[i]); } else { s->flac_dsp.lpc32_encode(res, smp, n, i+1, coefs[i], shift[i]); @@ -910,7 +938,11 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) for (i = last-step; i <= last+step; i += step) { if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX) continue; - if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(i) <= 32) { + if (s->avctx->bits_per_raw_sample > 24) { + if (!ff_flacdsp_lpc_encode_c_32_overflow_detect(res, smp, n, i+1, + coefs[i], shift[i])) + continue; + } else if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(i) <= 32) { s->flac_dsp.lpc32_encode(res, smp, n, i+1, coefs[i], shift[i]); } else { s->flac_dsp.lpc16_encode(res, smp, n, i+1, coefs[i], shift[i]); @@ -951,7 +983,11 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) if (diffsum >8) continue; - if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(opt_order - 1) <= 32) { + if (s->avctx->bits_per_raw_sample > 24) { + if (!ff_flacdsp_lpc_encode_c_32_overflow_detect(res, smp, n, opt_order, + lpc_try, shift[opt_order-1])) + continue; + } else if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(opt_order-1) <= 32) { s->flac_dsp.lpc16_encode(res, smp, n, opt_order, lpc_try, shift[opt_order-1]); } else { s->flac_dsp.lpc32_encode(res, smp, n, opt_order, lpc_try, shift[opt_order-1]); @@ -972,7 +1008,16 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) for (i = 0; i < sub->order; i++) sub->coefs[i] = coefs[sub->order-1][i]; - if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(opt_order) <= 32) { + if (s->avctx->bits_per_raw_sample > 24) { + if (!ff_flacdsp_lpc_encode_c_32_overflow_detect(res, smp, n, sub->order, + sub->coefs, sub->shift)) { + /* No coefs found that do not cause integer overflow, + * so return a verbatim subframe instead */ + sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM; + memcpy(res, smp, n * sizeof(int32_t)); + return subframe_count_exact(s, sub, 0); + } + } else if (s->bps_code * 4 + s->options.lpc_coeff_precision + av_log2(sub->order) <= 32) { s->flac_dsp.lpc16_encode(res, smp, n, sub->order, sub->coefs, sub->shift); } else { s->flac_dsp.lpc32_encode(res, smp, n, sub->order, sub->coefs, sub->shift); @@ -1227,12 +1272,22 @@ static void write_subframes(FlacEncodeContext *s) if (sub->type == FLAC_SUBFRAME_CONSTANT) { put_sbits(&s->pb, sub->obits, res[0]); } else if (sub->type == FLAC_SUBFRAME_VERBATIM) { - while (res < frame_end) - put_sbits(&s->pb, sub->obits, *res++); + if (sub->obits < 32) { + while (res < frame_end) + put_sbits(&s->pb, sub->obits, *res++); + } else { + while (res < frame_end) + put_bits32(&s->pb, *res++); + } } else { /* warm-up samples */ - for (i = 0; i < sub->order; i++) - put_sbits(&s->pb, sub->obits, *res++); + if (sub->obits < 32) { + for (i = 0; i < sub->order; i++) + put_sbits(&s->pb, sub->obits, *res++); + }else{ + for (i = 0; i < sub->order; i++) + put_bits32(&s->pb, *res++); + } /* LPC coefficients */ if (sub->type == FLAC_SUBFRAME_LPC) { @@ -1305,7 +1360,7 @@ static int update_md5_sum(FlacEncodeContext *s, const void *samples) (const uint16_t *) samples, buf_size / 2); buf = s->md5_buffer; #endif - } else { + } else if (s->avctx->bits_per_raw_sample <= 24) { int i; const int32_t *samples0 = samples; uint8_t *tmp = s->md5_buffer; @@ -1315,6 +1370,15 @@ static int update_md5_sum(FlacEncodeContext *s, const void *samples) AV_WL24(tmp + 3*i, v); } buf = s->md5_buffer; + } else { + /* s->avctx->bits_per_raw_sample <= 32 */ + int i; + const int32_t *samples0 = samples; + uint8_t *tmp = s->md5_buffer; + + for (i = 0; i < s->frame.blocksize * s->channels; i++) + AV_WL32(tmp + 4*i, samples0[i]); + buf = s->md5_buffer; } av_md5_update(s->md5ctx, buf, buf_size);