From patchwork Fri May 7 11:07:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27647 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp427621iof; Fri, 7 May 2021 04:13:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8rr4oFUHX2qbHCMguDDBoaYp1wWsmlcdywiQV78JLNqFCsbybCCyw0+2fp7CCcJPq9xbz X-Received: by 2002:a17:906:11d4:: with SMTP id o20mr9464675eja.247.1620386037332; Fri, 07 May 2021 04:13:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620386037; cv=none; d=google.com; s=arc-20160816; b=ymzoHCuhjChiPkZIb5S2zwSm7s8P8i6TfCSnzZcHGxlr4FR1AoU2AY6ItNYGVOqw1Z KFsNoiscUF5PcrWB6NOJSa4XegLNGt+tY1psTDOvi91KQDBmR6wzeEQo7SYmyUrvsyPZ o4J0YTFnrchts5P2cmjGiHhMIhC6zSAXf+vkdvuK4WGronAvalH6nNsv5eFPJcRy9oTI ixRFiVpXuFOdLSF9w5CycvJrigiElPmduT3brAKWYZ5gyNgfg/2qY8zgf4R22oK4efDJ H+3rR8KpMle3WLZWtwUpRCj0DKTXl+ZUEcDhCkOiHwiGmRTs3b/dp4TExJQEfQnnLNk+ gc+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=LKvzCk57yo80muVNLYquGJfLxlmQ0F4p2/WOAfGjKMw=; b=maLOaPp7IAhuMoktICtCRiKYX25H8E2TDI4IvHFDHMkDJVh5lrlWHQbqabvpFGzX8n hymHK1LpkciTtzJiv808tkdFWhqlXP1p834Sdflz1w8ty15ox9e/qNKm9PdSBjOrMcV6 BlN6VQyYfRoNIF/ljBAJmn1Ulk8VgJaWn2P5P10TP3OvvfdDEN3/9dgtEO1ngWLhn+W5 1fM75ua86nLTprUF4/0cFNUth7aFQ4haQ7EDXs5vT9rIP9nUhWpFJDJBtsCcgOR12cBl RQWy/coI4WJ2ekYQy5a0XlKwWv9qa6wBd5TDYymFl+41rJNI/dEeaUM3ZB7Vz6GWU+q5 DXVQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z19si4631781eji.473.2021.05.07.04.13.56; Fri, 07 May 2021 04:13:57 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5BE4468073F; Fri, 7 May 2021 14:13:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C888668038E for ; Fri, 7 May 2021 14:13:45 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1leyLJ-00Fh9J-0B for ffmpeg-devel@ffmpeg.org; Fri, 07 May 2021 13:08:25 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id eyKLltiZAljeHeyKLlzRWj; Fri, 07 May 2021 13:07:25 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=o83nqyVRAAAA:8 a=OR_WgY6nZcHo_xoQ_aQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 7 May 2021 13:07:25 +0200 Message-Id: <20210507110725.1580-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfDP5WyIiTChrIbLnVhI6r2SKPbssXAArRFTqP4mim30QRCabjldc/QTDqWzEDFtAWHZt9TAfwc00yF4iEC0XGqeEAkKmIUqK8/Fo2U3YJj6c/xwU7u1F ajOpC+wxiupx9LahpeRx/stQovNkfnJ8ZoyySWHR/fE7F7RjNfBN9briKf8pc+5H6zZdJctaVx9doA== Subject: [FFmpeg-devel] [PATCH] avcodec/alsdec: Fixed decoding error for mono audio files 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: noboru2000 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ByL68Do9ozNC From: noboru2000 A highest_decoded_channel flag is modified to serve as meant. Signed-off-by: noboru2000 Regression since: a11aa5f3ed7ee4d2385a7b725d43f6070d790b4c Fixes: Sin48k16bit1ch.mp4 Signed-off-by: Michael Niedermayer --- libavcodec/alsdec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 0aada77450..ba873ec53a 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1632,7 +1632,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) AVCodecContext *avctx = ctx->avctx; GetBitContext *gb = &ctx->gb; unsigned int div_blocks[32]; ///< block sizes. - unsigned int c; + int c; unsigned int js_blocks[2]; uint32_t bs_info = 0; int ret; @@ -1810,14 +1810,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, else ctx->cur_frame_length = sconf->frame_length; - ctx->highest_decoded_channel = 0; + ctx->highest_decoded_channel = -1; // decode the frame data if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0) av_log(ctx->avctx, AV_LOG_WARNING, "Reading frame data failed. Skipping RA unit.\n"); - if (ctx->highest_decoded_channel == 0) + if (ctx->highest_decoded_channel == -1) { + av_log(ctx->avctx, AV_LOG_WARNING, + "No channel data decoded.\n"); return AVERROR_INVALIDDATA; + } ctx->frame_id++;