From patchwork Sun Aug 28 21:19:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37524 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1584486pzh; Sun, 28 Aug 2022 14:20:32 -0700 (PDT) X-Google-Smtp-Source: AA6agR7IEEWNCKckpJj4CuUxGUGLKLM3+oX31IF1lgMZfL5WY/12EwLlrQGr0QH96oSKyRTw0TJ5 X-Received: by 2002:a17:907:1c06:b0:73d:ba76:9e63 with SMTP id nc6-20020a1709071c0600b0073dba769e63mr11637044ejc.384.1661721632237; Sun, 28 Aug 2022 14:20:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d16-20020a056402079000b00447d32305f7si5029822edy.54.2022.08.28.14.20.31; Sun, 28 Aug 2022 14:20:32 -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=@outlook.com header.s=selector1 header.b="fqkyl/En"; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2394968B9AB; Mon, 29 Aug 2022 00:20:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6579168B378 for ; Mon, 29 Aug 2022 00:20:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QvMdfHgUSJf8AwNlDq9aaAW84tV9Hm9ET0erQp/AHOYkiz/Wq+oGYsTQwP/XE+OTRuWIiyfgi9zGHXAfkk/0HOI087MXPtWSSmF61Ma8f4iygN+jw5vhcdO/IixLxFRZctoBWkB7QluUe18JhjUyoscnRejZnZ/ivQcPadbqkBsUY1LmY/NH3RtaEEMdSCdPVjvOYNUYtIDUZH2+/JX3YZ1Z/kv57jwshBWI9wKoZY7+ivLGDcmR6viKHkoGRYLZQFNjxkKwi4ZJI+84i8PgoMuL0d3WfAcTRxcj4BbSf6JuZER/QNEwq+dQttp0+1M40ecIPVK5c1fpqGu8j5LKqw== 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=lx/RU4qR9+/NhDA24ibbpuSm1f+RLIveg3WAwsIgRA8=; b=F49WnNZXWhrf3vI3/3Q2fDk1FI2xE8yJevHCEu0YQAL6WitkDzyaVRYx8aDSdkMRMdWU8CeyLbIUIwI8TewlW53w8a2Nh8ZlLZeY7c07/KqpwUta8VKQdl7+GSFGlxAa8Oib8Wyjx/4JkOnUDY5vY5QIR5AlVAEW43LWvOPAx1jmbRMWiw3K7oppVL9OXL5uQgeBVehz+Ifdte//1dDJSC6Be1wPeDho5FcRlUQxKBTJQbiz7O6+nvwVQ0c4uzo32s15Vzkb9aNm1DtDdrL+k8UTaaf7KL5YOxsxAO/hAi+S4DyQ6/5vxGb/Xf3dmtO8Kv18wUtmKYcM+Fr6A5q16w== 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=lx/RU4qR9+/NhDA24ibbpuSm1f+RLIveg3WAwsIgRA8=; b=fqkyl/EnPg0nozjQZu0qLDWGl4lyK+TSyXorzWtkcyc4RFfqTGtGcKkyDSMwTnCOTPCI/B5H58PUOtOih5ED3EvZssHvGiUdsjNA6j2OzI+9LSS5eP1YQRFxeC6nv0n1zsyy1fzzj6NWBcAmmYqNue9HLwlaR8HZIpT7Bbvimhc7ITfNe3OzWiIA6tM7CfSy8uFiSN/i8wdI2Afkt0+yOAKwMdan254gn7trHT1EZZ8saNUFNHByOBIgcPWR089Ru0/9k+G0sPr40WFjQuQxT+Xp8DKxzyxmSomHoWR8x7nsgWNQnReMJmSL245xLgl6m9w34ab5NKyYiD37StPmZA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Sun, 28 Aug 2022 21:20:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee%9]) with mapi id 15.20.5566.021; Sun, 28 Aug 2022 21:20:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 23:19:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5ALsJvE174/3HeuLb4jORlbLqkOPSS8y] X-ClientProxiedBy: AS9PR06CA0114.eurprd06.prod.outlook.com (2603:10a6:20b:465::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220828211957.472263-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d90b4c53-7084-47ba-61e8-08da893b141e X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOdeljhWKFN0uJiTma/puRzg2oQuIJga5v+tSjs9x+Sug2yWy+aVV0p2lqn1uEicBdakwTwYgdabhgYj0tQPTKcf8eZQz0gzv3NZNA96iZnjyMWhtHzCH5xU8UnSiJMHBmE5jsP68hldHeStZCtFl/ryLsRSsoJAdtGtC/gNGKslsxX+rvuzDVcNvYWH22F1mwp5p3zSV0LCS/lrz4vshYcDRILZPkui7ji3M+MRZ6ZHq/86uPMcdNmlzAAYYj/VNzhXh90Cnv40fjMjsY6zMi3WFjJyT8lC2C9nr9hneU7SDk8znw9srNP8FjTvnEQn7Z4KpKJFZjIPBFqCY6NjJwueyYDc6GaovrZrjvFn3YnI5zWAslE9sLz2j5s113Ac3xL5pIDMIDPfdXOhWBuRbkcF9BM9Nc8oTUcJUsiomGziueXLhOU+x6dgjbwOr4Z552vGPdLxMOyIEA26hXNvirCoksN4eQ3qZMgb257z2/LzmNQampGmXHZriRGTkNYYP6M8hHRxun+2kY7aAVeoouOALxCQO072mM4s21Tf8grUo3kIgX4Yk4xj37dViooeXwbSUgbZF7AbuZgWNoapbmgiQg2weiKD0xyDzSndU8gLsIewVrtm09Zv1q5QNvMjrpaQWmpjbwBBJBM32BpWzttvV+ywFQOa55J5CmwEomjchuvj+R/5QuChMiDaJz1sxow7fUsLtJI06qCaOeWQQKrYNljO89KIGZJBCUCuMK3ob4= X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2IkFxSFOf2XOgycCqkWMWpm3IDp3ZiujP7G+oRlWmbKpaW8XiR6CJRI5gcB5nST3/lc9uBcNUtsqYsWW3AqzPzUWZt3ktymRPvQehRhUBh7igJHbmztLfpAFEWGR/ZSgcpcaeobtpYBN46N3m+Vgm1rP2G/ss1+jAZaO2vLfDymfNlPM8xTC+89jkGKe7/dpHJ3BPgpPn/49IrdFCtqGTU6X221uf8xd5Rs1Xizwu2SdixBidCYD91Y0bk4f7og+pCarjGaDZyGfAC9bbuF7kQVL33qQ0Q/eymYpa6nHH9YH6j/MMEetMm+PjgL15k5zLNJRsXJDFKaM6kjCeE0BazksnvmsZt6v3n/yOLvCEPf83RCMC2YZac21s9qJbgwoqlcvtpLK57aGmvwpps7MIUrpYm65IteJNXwnEXARVsB0wT2FzgmHDPwKzETVbLxQy13O5j5mSCgHMnjFoPO7Hv4TOjjUtPMeur0TIlMzSECjmPOhh1BHuI63GTfsdcQ9jKy4+vWzUyUUK6trdrM5miz1YXBDFGLxmiuBjeABYmIcc+mDfRqEkk/gPSpt1VVlKI8n++5vBurs6t/kzS2BFmj2OrnP1rRdmjnoZGuf6UfsHUDDoKZZdguCmR7XLWPLKDh+Gp/M9ew1BIfj734dQg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BaunM3Q+kD7cfNpCKdeaAxxY6nobfbi8KnuyPcyWJnHd0jqxDql9XLxCnNRoBeQ/iTKADGrV+RWMW4ZFOh6CkrKKIlLICo/fwEjcLyn9JZbGPixxqCptCWLDCH3dCUAMHUzWHU2Yc88csRfyK8NERhUlGHDAAnhgA5PJKnm2BZTAgI+pMVaCW86e1FSfvC82W5JY/J5E+uOtU5QPIGbfuKd/0SIy54A8eEfBJ8VkAzex2UqqkljLkR9lBg037c6ipuxYUMd0MxZ1WCJQrU9CpHjsvyl1Wa4xD5WidM1IFRet3Rnh0JWWGb/1JqWK6N9APBdG2MLCH7OwHENWLfKPGIa79Z+c0HIqqBXaJ5hQW3oWR9Wl10OtJI16mevrH/+I3a7/Dq2Qkh0IVRRTj5+ornu4jPcPv30m91d4ef63wICzU5O3wfkDnuwuidIk+8/DzE+zx7lgSFqdB3jbrWjzslg2Ehx+MZ94kyMJABUHgVt+eIiIcbGHa7J6Sc23KlCZKvYXJ6RQ/7rtuG+hyfe2mePVmxiaWjaWfpDVDZBupUw+9O84aByC0FVFfEAU4aJi+UfV/nRcOQhp8jdXSRKsF0P1nx/doQxCK2SjaHRr7hW2+rYmwxfHADZIMvk6e2SM7mLXzbeMXOt8+VF/k+0vYDopvDNKFdAH4tAKabtG7WQ9zts/cuoLBBJYakwti+66ZUBeWQ7zpNHA3cM+A4bRA7ersJQzOTgtcHvtgVHhgYNOWm8NfrJoG94DNw2roAtf0hU0HQmO0hgegLY+zlejSP9IqIpe5anXnSYJ+MLJTww2nNa39DidU1c95WjSMYUeva04KRm3z3E6Pn+S1ntW8j+pCXl4MyvX/AtwTz+NB3bHobHSYLdBfkREdkMcAj4wcPE/BK+28C7KUF5Lpovi9PgIY9BhWN0uoLRLdKiihK/3ArRXZ6rG//opuiKGpgxUkTUNiMZQEUjzqgtnn/klkYBSXVng2hf2UZTv8RUOvqdw8aoJ8hTl9qwnNlgMFZfkQqy3984cQ7qlOXMs3Qaca9nRAE6D/hfDhTRPcmUHXg2gVe/R4pLuN74Ncx9BJ1VRG/KxB36vk9f3x9uR2HzLTZzZmK6UsMArbewNccYS12ZNoAiujbHzulDb/xM6I3FFr9Qbr5rrExC+z60pa2UBVe32m6DR3BNI1jIw3M+F1lI/zTfnJQM8x3Y4fyH2TSsuCWcQp1/1mRhdDqY6ELPm33VIPGVyyGYkeAqc0zSBTgmy8+JyX7SFgz7T0hSMyjielOtuveoH+BqGRMDCCVh+cXZPj+uTliIRO+ezjTLvolI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d90b4c53-7084-47ba-61e8-08da893b141e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 21:20:06.1676 (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: DU0P250MB0747 Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/flacdec: Shorten name 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IeHA4Uwm6+mp Signed-off-by: Andreas Rheinhardt --- libavcodec/flacdec.c | 80 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 5ddc5a34d2..d03369eb6d 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -50,7 +50,7 @@ typedef struct FLACContext { AVClass *class; - struct FLACStreaminfo flac_stream_info; + FLACStreaminfo stream_info; AVCodecContext *avctx; ///< parent AVCodecContext GetBitContext gb; ///< GetBitContext initialized to start at the current frame @@ -73,7 +73,7 @@ static int allocate_buffers(FLACContext *s); static void flac_set_bps(FLACContext *s) { enum AVSampleFormat req = s->avctx->request_sample_fmt; - int need32 = s->flac_stream_info.bps > 16; + int need32 = s->stream_info.bps > 16; int want32 = av_get_bytes_per_sample(req) > 2; int planar = av_sample_fmt_is_planar(req); @@ -82,13 +82,13 @@ static void flac_set_bps(FLACContext *s) s->avctx->sample_fmt = AV_SAMPLE_FMT_S32P; else s->avctx->sample_fmt = AV_SAMPLE_FMT_S32; - s->sample_shift = 32 - s->flac_stream_info.bps; + s->sample_shift = 32 - s->stream_info.bps; } else { if (planar) s->avctx->sample_fmt = AV_SAMPLE_FMT_S16P; else s->avctx->sample_fmt = AV_SAMPLE_FMT_S16; - s->sample_shift = 16 - s->flac_stream_info.bps; + s->sample_shift = 16 - s->stream_info.bps; } } @@ -109,7 +109,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; /* initialize based on the demuxer-supplied streamdata header */ - ret = ff_flac_parse_streaminfo(avctx, &s->flac_stream_info, streaminfo); + ret = ff_flac_parse_streaminfo(avctx, &s->stream_info, streaminfo); if (ret < 0) return ret; ret = allocate_buffers(s); @@ -117,7 +117,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) return ret; flac_set_bps(s); ff_flacdsp_init(&s->dsp, avctx->sample_fmt, - s->flac_stream_info.channels); + s->stream_info.channels); s->got_streaminfo = 1; return 0; @@ -137,10 +137,10 @@ static int allocate_buffers(FLACContext *s) int buf_size; int ret; - av_assert0(s->flac_stream_info.max_blocksize); + av_assert0(s->stream_info.max_blocksize); - buf_size = av_samples_get_buffer_size(NULL, s->flac_stream_info.channels, - s->flac_stream_info.max_blocksize, + buf_size = av_samples_get_buffer_size(NULL, s->stream_info.channels, + s->stream_info.max_blocksize, AV_SAMPLE_FMT_S32P, 0); if (buf_size < 0) return buf_size; @@ -151,8 +151,8 @@ static int allocate_buffers(FLACContext *s) ret = av_samples_fill_arrays((uint8_t **)s->decoded, NULL, s->decoded_buffer, - s->flac_stream_info.channels, - s->flac_stream_info.max_blocksize, + s->stream_info.channels, + s->stream_info.max_blocksize, AV_SAMPLE_FMT_S32P, 0); return ret < 0 ? ret : 0; } @@ -177,7 +177,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size) metadata_size != FLAC_STREAMINFO_SIZE) { return AVERROR_INVALIDDATA; } - ret = ff_flac_parse_streaminfo(s->avctx, &s->flac_stream_info, &buf[8]); + ret = ff_flac_parse_streaminfo(s->avctx, &s->stream_info, &buf[8]); if (ret < 0) return ret; ret = allocate_buffers(s); @@ -185,7 +185,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size) return ret; flac_set_bps(s); ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, - s->flac_stream_info.channels); + s->stream_info.channels); s->got_streaminfo = 1; return 0; @@ -389,13 +389,13 @@ static int decode_subframe_lpc(FLACContext *s, int32_t *decoded, int pred_order, if ((ret = decode_residuals(s, decoded, pred_order)) < 0) return ret; - if ( ( s->buggy_lpc && s->flac_stream_info.bps <= 16) + if ( ( s->buggy_lpc && s->stream_info.bps <= 16) || ( !s->buggy_lpc && bps <= 16 && bps + coeff_prec + av_log2(pred_order) <= 32)) { s->dsp.lpc16(decoded, coeffs, pred_order, qlevel, s->blocksize); } else { s->dsp.lpc32(decoded, coeffs, pred_order, qlevel, s->blocksize); - if (s->flac_stream_info.bps <= 16) + if (s->stream_info.bps <= 16) lpc_analyze_remodulate(decoded, coeffs, pred_order, qlevel, s->blocksize, bps); } @@ -406,7 +406,7 @@ static inline int decode_subframe(FLACContext *s, int channel) { int32_t *decoded = s->decoded[channel]; int type, wasted = 0; - int bps = s->flac_stream_info.bps; + int bps = s->stream_info.bps; int i, tmp, ret; if (channel == 0) { @@ -480,68 +480,68 @@ static int decode_frame(FLACContext *s) return ret; } - if ( s->flac_stream_info.channels - && fi.channels != s->flac_stream_info.channels + if ( s->stream_info.channels + && fi.channels != s->stream_info.channels && s->got_streaminfo) { - s->flac_stream_info.channels = fi.channels; + s->stream_info.channels = fi.channels; ff_flac_set_channel_layout(s->avctx, fi.channels); ret = allocate_buffers(s); if (ret < 0) return ret; } - s->flac_stream_info.channels = fi.channels; + s->stream_info.channels = fi.channels; ff_flac_set_channel_layout(s->avctx, fi.channels); s->ch_mode = fi.ch_mode; - if (!s->flac_stream_info.bps && !fi.bps) { + if (!s->stream_info.bps && !fi.bps) { av_log(s->avctx, AV_LOG_ERROR, "bps not found in STREAMINFO or frame header\n"); return AVERROR_INVALIDDATA; } if (!fi.bps) { - fi.bps = s->flac_stream_info.bps; - } else if (s->flac_stream_info.bps && fi.bps != s->flac_stream_info.bps) { + fi.bps = s->stream_info.bps; + } else if (s->stream_info.bps && fi.bps != s->stream_info.bps) { av_log(s->avctx, AV_LOG_ERROR, "switching bps mid-stream is not " "supported\n"); return AVERROR_INVALIDDATA; } - if (!s->flac_stream_info.bps) { - s->flac_stream_info.bps = s->avctx->bits_per_raw_sample = fi.bps; + if (!s->stream_info.bps) { + s->stream_info.bps = s->avctx->bits_per_raw_sample = fi.bps; flac_set_bps(s); } - if (!s->flac_stream_info.max_blocksize) - s->flac_stream_info.max_blocksize = FLAC_MAX_BLOCKSIZE; - if (fi.blocksize > s->flac_stream_info.max_blocksize) { + if (!s->stream_info.max_blocksize) + s->stream_info.max_blocksize = FLAC_MAX_BLOCKSIZE; + if (fi.blocksize > s->stream_info.max_blocksize) { av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", fi.blocksize, - s->flac_stream_info.max_blocksize); + s->stream_info.max_blocksize); return AVERROR_INVALIDDATA; } s->blocksize = fi.blocksize; - if (!s->flac_stream_info.samplerate && !fi.samplerate) { + if (!s->stream_info.samplerate && !fi.samplerate) { av_log(s->avctx, AV_LOG_ERROR, "sample rate not found in STREAMINFO" " or frame header\n"); return AVERROR_INVALIDDATA; } if (fi.samplerate == 0) - fi.samplerate = s->flac_stream_info.samplerate; - s->flac_stream_info.samplerate = s->avctx->sample_rate = fi.samplerate; + fi.samplerate = s->stream_info.samplerate; + s->stream_info.samplerate = s->avctx->sample_rate = fi.samplerate; if (!s->got_streaminfo) { ret = allocate_buffers(s); if (ret < 0) return ret; s->got_streaminfo = 1; - dump_headers(s->avctx, &s->flac_stream_info); + dump_headers(s->avctx, &s->stream_info); } ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, - s->flac_stream_info.channels); + s->stream_info.channels); -// dump_headers(s->avctx, &s->flac_stream_info); +// dump_headers(s->avctx, &s->stream_info); /* subframes */ - for (i = 0; i < s->flac_stream_info.channels; i++) { + for (i = 0; i < s->stream_info.channels; i++) { if ((ret = decode_subframe(s, i)) < 0) return ret; } @@ -565,9 +565,9 @@ static int flac_decode_frame(AVCodecContext *avctx, AVFrame *frame, *got_frame_ptr = 0; - if (s->flac_stream_info.max_framesize == 0) { - s->flac_stream_info.max_framesize = - ff_flac_get_max_frame_size(s->flac_stream_info.max_blocksize ? s->flac_stream_info.max_blocksize : FLAC_MAX_BLOCKSIZE, + if (s->stream_info.max_framesize == 0) { + s->stream_info.max_framesize = + ff_flac_get_max_frame_size(s->stream_info.max_blocksize ? s->stream_info.max_blocksize : FLAC_MAX_BLOCKSIZE, FLAC_MAX_CHANNELS, 32); } @@ -619,7 +619,7 @@ static int flac_decode_frame(AVCodecContext *avctx, AVFrame *frame, return ret; s->dsp.decorrelate[s->ch_mode](frame->data, s->decoded, - s->flac_stream_info.channels, + s->stream_info.channels, s->blocksize, s->sample_shift); if (bytes_read > buf_size) {