From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 456B44451E for ; Wed, 14 Sep 2022 13:03:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7209068BAF2; Wed, 14 Sep 2022 16:03:14 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2018.outbound.protection.outlook.com [40.92.89.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB1F868B7D2 for ; Wed, 14 Sep 2022 16:03:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q/8spk97rWZoVwIffOeREBeO/iusnQ0n53rXvj0rSJgXoHXQ07Sz82iSaeJ0ssq8KmYKgHfHoeLgtyIeG51eM3CU5PuBFKAGOfyJfiUY6IV2/8G9LCCOdn8Z4/HrcY2dcDTe4MsuY+I3waiRptjtWASzVm8m0nORNu9nIyoGDspoz8Xj+mgPBHtW+GjC7bm2gCybxYI08okPigPkCWfTGUvpnTY3Qes43XEwQzqyoh7QKCnOQb7o4vXwN3c0QIaDWr66g5O5Ew0jZd+dgo/9QF052iNkWnszKGpeKWxvdGIhaNCIAu1Rzu/jY/yyBUMNXftOUFjbfK91/DDojhwOsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kStR8NrNpDnMfw+re8XQblNwwTDfmD5ZzOi3kjJ/ulI=; b=X06dWTrbms13SSe1Dk9BBnj9pkgEXCgy1SjpeuJ863aMDF0eFPG2YWmNP93wl32o+BR2oB9Nm3pEB2vI7bHQNxysmJ2m5RXIwzX82h4n4509f12BWHsQotFvB9z/t1WkJjKb8eWrqBkx3yub/huP7DfrXK1cDGKQMS+SOLDoi59kFAK4bH0xuvNSCRRI051EZ1tSQxJ3LQwQyIXTJGzhA/gO4yptCUXGcHBgKlaw922+NUD/kWo1xfZHUvIxLA+FxOwVr7GAhTQsdgILAjIaPO07yHE9FycknSUVmsRZ5ItRo7O4jo2I0eswsZ3V3Rty8H+TLFLw9b5GQEzw7uNUKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kStR8NrNpDnMfw+re8XQblNwwTDfmD5ZzOi3kjJ/ulI=; b=c61p5VtIe+R4Mhksm635HiuR9lThgWkYCALFlLXJpldPuPCk14W9ptAg7ve2vjv/A//jKJ0wgv4vzSsX94IAP4jLYHBZShx05asUpCEDieEuQU1qKCbj6ibSZNhiAGUo/onO5LMd/7ar3HwUl7Hu8ibBSmueoPiTugXnaaZkWFRJJE1Cc9Z6u1isuoJUQChlvPFQNlXhKYbDLbSSqpHxuCkxbW+y5rZ/94nceKb/B1Bvz5awTQNDILaQQxai0bmk0RuDk0a1XKIoIpP43rs6SLUr6lXdi43aB3QX9i+fCMrtE+YE65svbQEPANVM+bH8/noOT4RN/uYyCiMisJXL9g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0172.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:323::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Wed, 14 Sep 2022 13:03:05 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Wed, 14 Sep 2022 13:03:05 +0000 Message-ID: Date: Wed, 14 Sep 2022 15:03:08 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220903092144.569716-1-mvanb1@gmail.com> <20220903092144.569716-2-mvanb1@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20220903092144.569716-2-mvanb1@gmail.com> X-TMN: [UQtx563wRU42CpDyg/hVztQ/v+f+xwzrp+HD7qhKnqw=] X-ClientProxiedBy: ZR0P278CA0123.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <3c4efa24-5141-348b-a0f8-29999b7b68dd@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0172:EE_ X-MS-Office365-Filtering-Correlation-Id: 4033adbb-884f-4c49-bdfe-08da965176cd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ghYACj2X3xeQtoD33TsoABftAXLM+zUSh9J656/QejIGZwHJehPp/frk3k2ODs3/P3rd/LQbjzwxTiKpIXZmz/s+pFjdoSLhWZg1JmzBKnMNiPp6zUhStWDF/2atEBvzZ4Nj/a0fNINDfu3C7tG1h44/+LyciHKTMbzg4uQGcDeHb7jsW3UDwEHv4XGWgwTfgu4DqOgabozkA8Cnrs13fril2iILq4lQEKqVpnZLlkpt/q5iWTs3z7eJUfAcp3QbTZYwIgWU/eOP5Jh3HJxCq9GIrUPjJEwaWlXihno/wQ8HWMh8s2kfgYXGa5fHp298KbxJGusngoZwUvsdhcI8tC/2YXVrPB8nZKz77fZiskvXzIDiV4kc7Ug2Axyh06GMEu5Ylexsi8aRpo9b4c0qcDES+bFpb37sKdoLu3WdzhcSQzMckKkJy7zAucS4ccnPPknrlv9reTiCtPLnJnPzEiWhrs/x6rLVHQnhphMCSSc6Q6Aa4X6CAAfPhq6kvHX6aVywpbXi/MBrtlwb/Qch1kaWoAxWjTb1g/ya9793EcRn19r7AlXTmhCWcAIQfvFR4m5dbqWKeVJ2vjgMDM0tgPruzIaF77kbvpr190/Q6vtfcZyLPCKlpAihXrUdpgIYgrHNPNNDyMvs+skU0aMxYYSqdwBLz7QXWuaXl/UgIGkULBG4CnWXeZHyTeT7z3Ir X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NFUwSlhwbHNSdjJDV0IvK1JoVzJqUXpucXZTcGNGTVlvNnpJZXdYU1hEUUp3?= =?utf-8?B?WUVPQ2I4ZG5lVit3dUI3UjJHTUprcHZyOE1hdXJGVE9LbS9Pb1kxZ0l6Skdk?= =?utf-8?B?YlB6eVU2YmN1U0ZKZ25zM0M2Z1l1Ykt5cTRmRklqR2xGUm9PNHhkaWZJWGFJ?= =?utf-8?B?ZFRkMUw3RDlOTlFuOHVBQ1p0MmxMN3F3UDIvMjI4NTVEMDZMREVuNkZ2M2Mw?= =?utf-8?B?MVoyMzdpTUdTcUExZjVvK0tJb3lpSzVaUzR2OTVNS1JYeVhKTXI0ZTlmRHlt?= =?utf-8?B?QjY2Mkk4NmhYeEYyZm8yWStMVE9iQXJGSXdVMlBaaFZiWTQ2NlBDcjFWYm9O?= =?utf-8?B?VVZSSXV0SzUwN0d5UjhoMmlhWlEyZW9oV3hGU29sYjFiWW0xTGdQWXNldlJW?= =?utf-8?B?OG9rN1Q1d25TQlZtMjJxc1RzVzQxbXc5U3RYdyszS1J0UTgvaHU2cmxiSC9z?= =?utf-8?B?TmI1Qk5xRmdsRytYUGdHYy82SHVEcDVFTnI2Y2VkMUtPb1pPZkMydHdpN1lJ?= =?utf-8?B?dkNNcGVNSDQ2UThIVkpjN3R3ajRkbVpQdWNQczhCN2lTWVowNW56M0VLSEto?= =?utf-8?B?UG9ZYlFndTZuWElrRm9RS2pxMGpnTDlMQjhMMmFUTlFsaU12YVlwTGQ5QU1F?= =?utf-8?B?OEtVV3pHa1pCcEZWZ2YxNjJNUGE3dDZpMit6WEZGVERnN2ZxdTJMMHJsaVVy?= =?utf-8?B?QUpXWVJ6U1dHeDhPd29IUkxKeUdOU1dSTFd3ZHhjWkZmaFBMYUh2ZENiQzhJ?= =?utf-8?B?MkpLeWkzcCswNU5ZRjU1SWhXN3F3elFDS1lsTWRmZ1NTZGJrb0xPN3lDRURJ?= =?utf-8?B?NkZERjZWYTV0R2xmYVhsTk5JSEFHRENyUHEyWGpGSTNRckhnbXpwcVdFdzdr?= =?utf-8?B?TGg4Mkp4UEFrN0gzd0Zka25jK3h0M1hpVWcxaHRvRzV1TU9uMlduNEtjS0V1?= =?utf-8?B?a1E5OHhMaE5wMXpZVmppU3N0aTQ1TkluVEp5TEhHMTh2V0pMcWVZaTRLYU1J?= =?utf-8?B?R2d4SUQ0T3pUYnJVQ0NVZ3ZFTXJMbE9kdEpJRzZWL0Vtb2R0UXZFemJJeHRH?= =?utf-8?B?bHI3WHlLS2FOUHl2WEZRSmdDd0xRcFJCSzEvM2FvbHpLTVBrcEFnR3pVZFlp?= =?utf-8?B?M2gvNk0ydFQ3cE10SEpDYUxDcXNtNjFjZVhPQldvbUlXRlNJcGV6eC9oZ3cw?= =?utf-8?B?OFF4UXp5QVdSVTd4a1hOcWF2ODAxbW0wREZyczdqSERRNlhpc3RHYklobmxz?= =?utf-8?B?STVnNU5iRzVaUmx5NHBjWVpVeFJBTG9kU0lnNXhQL3RpTHk0akhMdmdkZm14?= =?utf-8?B?UmFKNXJmeWdHc3lnUmNIbkM5c3N2SkRLVUJBakJ3L0l4bGFLY2NhN0JtSjVS?= =?utf-8?B?a1A0S3RJYnFxNmZ1YmQwUm5FbmN0Wi96dW9xZFlWTjdoWXFhdDl0WXpTcXI0?= =?utf-8?B?KzN2aXVMWUV1Y3k1VDJjZlBwY3NZMjllc0p2dHhaWG9wZ3J2S1l1Zmo0OHU1?= =?utf-8?B?UDdNYXU5RkVodXQwZ2JucGNWRkEzamlUR0tyczVibC9oRFRTZkl5aWpYbjQy?= =?utf-8?B?Vld6R2V4TlVYeDcvdDAvcEVFbnRvVlpaMi9TNHVMM1ZKZWl4djJOd00zb0Jr?= =?utf-8?B?WVdKam1aU1h0SlVkdGtPWlA3Mlk2cTBEdWsvSUhWMG0velRYQVpMeGpQM3lY?= =?utf-8?B?ZVhNWE4yVDU5eHdjNGtPd1haMG9CaUY5YTNNb2VXc2hIY09mSHF2NTQvSnJZ?= =?utf-8?Q?1WnoK/LPLW3nUhk0GEgXLHPKjpZ3ePUMsE8dvn9?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4033adbb-884f-4c49-bdfe-08da965176cd X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2022 13:03:05.7933 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0172 Subject: Re: [FFmpeg-devel] [PATCH v4 1/2] libavcodec/flacdec: Implement decoding of 32 bit-per-sample PCM 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Martijn van Beurden: > Add decoding of FLAC files coding for 32 bit-per-sample PCM to libavcodec. > --- > libavcodec/flac.c | 4 +- > libavcodec/flacdec.c | 248 ++++++++++++++++++++++++++++++++++++++---- > libavcodec/get_bits.h | 12 ++ > libavcodec/mathops.h | 9 ++ > 4 files changed, 250 insertions(+), 23 deletions(-) > > diff --git a/libavcodec/flac.c b/libavcodec/flac.c > index 352d663c67..174b4801be 100644 > --- a/libavcodec/flac.c > +++ b/libavcodec/flac.c > @@ -28,7 +28,7 @@ > #include "flacdata.h" > #include "flac_parse.h" > > -static const int8_t sample_size_table[] = { 0, 8, 12, 0, 16, 20, 24, 0 }; > +static const int8_t sample_size_table[] = { 0, 8, 12, 0, 16, 20, 24, 32 }; > > static const AVChannelLayout flac_channel_layouts[8] = { > AV_CHANNEL_LAYOUT_MONO, > @@ -82,7 +82,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, > > /* bits per sample */ > bps_code = get_bits(gb, 3); > - if (bps_code == 3 || bps_code == 7) { > + if (bps_code == 3) { > av_log(avctx, AV_LOG_ERROR + log_level_offset, > "invalid sample size code (%d)\n", > bps_code); > diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c > index c5d9e95168..14a9202569 100644 > --- a/libavcodec/flacdec.c > +++ b/libavcodec/flacdec.c > @@ -64,6 +64,9 @@ typedef struct FLACContext { > int32_t *decoded[FLAC_MAX_CHANNELS]; ///< decoded samples > uint8_t *decoded_buffer; > unsigned int decoded_buffer_size; > + int64_t *decoded_33bps; ///< decoded samples for a 33 bps subframe > + uint8_t *decoded_buffer_33bps; Why do you need a new buffer here instead of just reusing decoded_buffer? > + unsigned int decoded_buffer_size_33bps; > int buggy_lpc; ///< use workaround for old lavc encoded files > > FLACDSPContext dsp; > @@ -154,6 +157,24 @@ static int allocate_buffers(FLACContext *s) > s->stream_info.channels, > s->stream_info.max_blocksize, > AV_SAMPLE_FMT_S32P, 0); > + if (ret >= 0 && s->stream_info.bps == 32 && s->stream_info.channels == 2) { > + buf_size = av_samples_get_buffer_size(NULL, 1, > + s->stream_info.max_blocksize, > + AV_SAMPLE_FMT_S64P, 0); > + if (buf_size < 0) > + return buf_size; > + > + av_fast_malloc(&s->decoded_buffer_33bps, &s->decoded_buffer_size_33bps, buf_size); > + if (!s->decoded_buffer) You are checking the wrong variable. > + return AVERROR(ENOMEM); > + > + ret = av_samples_fill_arrays((uint8_t **)&s->decoded_33bps, NULL, > + s->decoded_buffer_33bps, > + 1, > + s->stream_info.max_blocksize, > + AV_SAMPLE_FMT_S64P, 0); > + > + } > return ret < 0 ? ret : 0; > } > > @@ -331,6 +352,94 @@ static int decode_subframe_fixed(FLACContext *s, int32_t *decoded, > return 0; > } > > +static int decode_subframe_fixed_wide(FLACContext *s, int32_t *decoded, > + int pred_order, int bps) > +{ > + const int blocksize = s->blocksize; > + int i; > + int ret; > + > + /* warm up samples */ > + for (i = 0; i < pred_order; i++) { > + decoded[i] = get_sbits_long(&s->gb, bps); > + } > + > + if ((ret = decode_residuals(s, decoded, pred_order)) < 0) > + return ret; > + > + switch (pred_order) { > + case 0: > + break; > + case 1: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] += decoded[i-1]; > + break; > + case 2: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = (int64_t)decoded[i] + 2*(int64_t)decoded[i-1] - (int64_t)decoded[i-2]; > + break; > + case 3: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = (int64_t)decoded[i] + 3*(int64_t)decoded[i-1] - 3*(int64_t)decoded[i-2] + (int64_t)decoded[i-3]; > + break; > + case 4: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = (int64_t)decoded[i] + 4*(int64_t)decoded[i-1] - 6*(int64_t)decoded[i-2] + 4*(int64_t)decoded[i-3] - (int64_t)decoded[i-4]; > + break; > + default: > + av_log(s->avctx, AV_LOG_ERROR, "illegal pred order %d\n", pred_order); > + return AVERROR_INVALIDDATA; > + } > + > + return 0; > +} > + > + > +static int decode_subframe_fixed_33bps(FLACContext *s, int64_t *decoded, > + int32_t *residual, int pred_order) > +{ > + const int blocksize = s->blocksize; > + int i; > + int ret; > + > + /* warm up samples */ > + for (i = 0; i < pred_order; i++) { > + decoded[i] = get_sbits64(&s->gb, 33); > + av_log(s->avctx, AV_LOG_DEBUG, "warm-up %d = %" PRId64 "\n", i, decoded[i]); > + } > + > + if ((ret = decode_residuals(s, residual, pred_order)) < 0) > + return ret; > + > + switch (pred_order) { > + case 0: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = residual[i]; > + break; > + case 1: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = residual[i] + decoded[i-1]; > + break; > + case 2: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = residual[i] + 2*decoded[i-1] - decoded[i-2]; > + break; > + case 3: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = residual[i] + 3*decoded[i-1] - 3*decoded[i-2] + decoded[i-3]; > + break; > + case 4: > + for (i = pred_order; i < blocksize; i++) > + decoded[i] = residual[i] + 4*decoded[i-1] - 6*decoded[i-2] + 4*decoded[i-3] - decoded[i-4]; > + break; > + default: > + av_log(s->avctx, AV_LOG_ERROR, "illegal pred order %d\n", pred_order); > + return AVERROR_INVALIDDATA; > + } > + > + return 0; > +} > + > static void lpc_analyze_remodulate(SUINT32 *decoded, const int coeffs[32], > int order, int qlevel, int len, int bps) > { > @@ -402,12 +511,53 @@ static int decode_subframe_lpc(FLACContext *s, int32_t *decoded, int pred_order, > return 0; > } > > +static int decode_subframe_lpc_33bps(FLACContext *s, int64_t *decoded, > + int32_t *residual, int pred_order) > +{ > + int i, j, ret; > + int coeff_prec, qlevel; > + int coeffs[32]; > + > + /* warm up samples */ > + for (i = 0; i < pred_order; i++) { > + decoded[i] = get_sbits64(&s->gb, 33); > + } > + > + coeff_prec = get_bits(&s->gb, 4) + 1; > + if (coeff_prec == 16) { > + av_log(s->avctx, AV_LOG_ERROR, "invalid coeff precision\n"); > + return AVERROR_INVALIDDATA; > + } > + qlevel = get_sbits(&s->gb, 5); > + if (qlevel < 0) { > + av_log(s->avctx, AV_LOG_ERROR, "qlevel %d not supported, maybe buggy stream\n", > + qlevel); > + return AVERROR_INVALIDDATA; > + } > + > + for (i = 0; i < pred_order; i++) { > + coeffs[pred_order - i - 1] = get_sbits(&s->gb, coeff_prec); > + } > + > + if ((ret = decode_residuals(s, residual, pred_order)) < 0) > + return ret; > + > + for (i = pred_order; i < s->blocksize; i++, decoded++) { > + int64_t sum = 0; > + for (j = 0; j < pred_order; j++) > + sum += (int64_t)coeffs[j] * decoded[j]; > + decoded[j] = residual[i] + (sum >> qlevel); > + } > + > + return 0; > +} > + > static inline int decode_subframe(FLACContext *s, int channel) > { > int32_t *decoded = s->decoded[channel]; > int type, wasted = 0; > int bps = s->stream_info.bps; > - int i, tmp, ret; > + int i, ret; > > if (channel == 0) { > if (s->ch_mode == FLAC_CHMODE_RIGHT_SIDE) > @@ -436,34 +586,63 @@ static inline int decode_subframe(FLACContext *s, int channel) > wasted = 1 + get_unary(&s->gb, 1, get_bits_left(&s->gb)); > bps -= wasted; > } > - if (bps > 32) { > - avpriv_report_missing_feature(s->avctx, "Decorrelated bit depth > 32"); > - return AVERROR_PATCHWELCOME; > - } > > //FIXME use av_log2 for types > if (type == 0) { > - tmp = get_sbits_long(&s->gb, bps); > - for (i = 0; i < s->blocksize; i++) > - decoded[i] = tmp; > + if (bps < 33) { > + int32_t tmp = get_sbits_long(&s->gb, bps); > + for (i = 0; i < s->blocksize; i++) > + decoded[i] = tmp; > + } else { > + int64_t tmp = get_sbits64(&s->gb, 33); > + for (i = 0; i < s->blocksize; i++) > + s->decoded_33bps[i] = tmp; > + } > } else if (type == 1) { > - for (i = 0; i < s->blocksize; i++) > - decoded[i] = get_sbits_long(&s->gb, bps); > + if (bps < 33) { > + for (i = 0; i < s->blocksize; i++) > + decoded[i] = get_sbits_long(&s->gb, bps); > + } else { > + for (i = 0; i < s->blocksize; i++) > + s->decoded_33bps[i] = get_sbits64(&s->gb, 33); > + } > } else if ((type >= 8) && (type <= 12)) { > - if ((ret = decode_subframe_fixed(s, decoded, type & ~0x8, bps)) < 0) > - return ret; > + int order = type & ~0x8; > + if (bps < 33) { > + if (bps + order <= 32) { > + if ((ret = decode_subframe_fixed(s, decoded, order, bps)) < 0) > + return ret; > + } else { > + if ((ret = decode_subframe_fixed_wide(s, decoded, order, bps)) < 0) > + return ret; > + } > + } else { > + if ((ret = decode_subframe_fixed_33bps(s, s->decoded_33bps, decoded, order)) < 0) > + return ret; > + } > } else if (type >= 32) { > - if ((ret = decode_subframe_lpc(s, decoded, (type & ~0x20)+1, bps)) < 0) > - return ret; > + if (bps < 33) { > + if ((ret = decode_subframe_lpc(s, decoded, (type & ~0x20)+1, bps)) < 0) > + return ret; > + } else { > + if ((ret = decode_subframe_lpc_33bps(s, s->decoded_33bps, decoded, (type & ~0x20)+1)) < 0) > + return ret; > + } > } else { > av_log(s->avctx, AV_LOG_ERROR, "invalid coding type\n"); > return AVERROR_INVALIDDATA; > } > > - if (wasted && wasted < 32) { > - int i; > - for (i = 0; i < s->blocksize; i++) > - decoded[i] = (unsigned)decoded[i] << wasted; > + if (wasted) { > + if (wasted+bps == 33) { > + int i; > + for (i = 0; i < s->blocksize; i++) > + s->decoded_33bps[i] = (uint64_t)decoded[i] << wasted; > + } else if (wasted < 32) { > + int i; > + for (i = 0; i < s->blocksize; i++) > + decoded[i] = (unsigned)decoded[i] << wasted; > + } > } > > return 0; > @@ -554,6 +733,26 @@ static int decode_frame(FLACContext *s) > return 0; > } > > +static void decorrelate_33bps(int ch_mode, int32_t **decoded, int64_t *decoded_33bps, int len) > +{ > + int i; > + if (ch_mode == FLAC_CHMODE_LEFT_SIDE ) { > + for (i = 0; i < len; i++) > + decoded[1][i] = decoded[0][i] - decoded_33bps[i]; > + } else if (ch_mode == FLAC_CHMODE_RIGHT_SIDE ) { > + for (i = 0; i < len; i++) > + decoded[0][i] = decoded[1][i] + decoded_33bps[i]; > + } else if (ch_mode == FLAC_CHMODE_MID_SIDE ) { > + for (i = 0; i < len; i++) { > + uint64_t a = decoded[0][i]; > + int64_t b = decoded_33bps[i]; > + a -= b >> 1; > + decoded[0][i] = (a + b); > + decoded[1][i] = a; > + } > + } > +} > + > static int flac_decode_frame(AVCodecContext *avctx, AVFrame *frame, > int *got_frame_ptr, AVPacket *avpkt) > { > @@ -612,9 +811,15 @@ static int flac_decode_frame(AVCodecContext *avctx, AVFrame *frame, > if ((ret = ff_thread_get_buffer(avctx, frame, 0)) < 0) > return ret; > > - s->dsp.decorrelate[s->ch_mode](frame->data, s->decoded, > - s->stream_info.channels, > - s->blocksize, s->sample_shift); > + if (s->stream_info.bps == 32 && s->ch_mode > 0) { > + decorrelate_33bps(s->ch_mode, s->decoded, s->decoded_33bps, s->blocksize); > + s->dsp.decorrelate[0](frame->data, s->decoded, s->stream_info.channels, > + s->blocksize, s->sample_shift); > + } else { > + s->dsp.decorrelate[s->ch_mode](frame->data, s->decoded, > + s->stream_info.channels, > + s->blocksize, s->sample_shift); > + } > > if (bytes_read > buf_size) { > av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size); > @@ -635,6 +840,7 @@ static av_cold int flac_decode_close(AVCodecContext *avctx) > FLACContext *s = avctx->priv_data; > > av_freep(&s->decoded_buffer); > + av_freep(&s->decoded_buffer_33bps); > > return 0; > } > diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h > index 992765dc92..52d13b8242 100644 > --- a/libavcodec/get_bits.h > +++ b/libavcodec/get_bits.h > @@ -596,6 +596,18 @@ static inline int get_sbits_long(GetBitContext *s, int n) > return sign_extend(get_bits_long(s, n), n); > } > > +/** > + * Read 0-64 bits as a signed integer. > + */ > +static inline int64_t get_sbits64(GetBitContext *s, int n) > +{ > + // sign_extend(x, 0) is undefined > + if (!n) > + return 0; > + > + return sign_extend64(get_bits64(s, n), n); > +} > + > /** > * Show 0-32 bits. > */ > diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h > index f81d21f9c4..8a82d9d086 100644 > --- a/libavcodec/mathops.h > +++ b/libavcodec/mathops.h > @@ -137,6 +137,15 @@ static inline av_const int sign_extend(int val, unsigned bits) > } > #endif > > +#ifndef sign_extend64 > +static inline av_const int64_t sign_extend64(int64_t val, unsigned bits) > +{ > + unsigned shift = 8 * sizeof(int64_t) - bits; > + union { uint64_t u; int64_t s; } v = { (uint64_t) val << shift }; > + return v.s >> shift; > +} > +#endif > + > #ifndef zero_extend > static inline av_const unsigned zero_extend(unsigned val, unsigned bits) > { _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".