From patchwork Tue Aug 24 13:43:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Olivier_Cr=C3=AAte?= X-Patchwork-Id: 29761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3041200iov; Tue, 24 Aug 2021 06:44:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPR/1Tb1AkowI4XG3Q4K05R4l3WlfIxlUKQd4Ony9vrnzXx+86xW9lAhV3hfYjSvZfmG6b X-Received: by 2002:a50:d587:: with SMTP id v7mr9360896edi.120.1629812653536; Tue, 24 Aug 2021 06:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629812653; cv=none; d=google.com; s=arc-20160816; b=HIlfbfCxothO8gNvuu7Kx0b9zAF966tbnMes+XjSTgUU7/PY6cHWxepyX3w4lwOGMh /UtfKi13jQoDeDJ9OmtM9dSrXhRSuhGi/h8IIypMQdBIFtpL3Blw+Y3Z1/LVPFfDQSQI rbhY3BzAJOfK6S5x27adIE55UEb2jreBbGt5J+K7/ZaatqrQZZi6nLKEXbE0QtDssmTW kskI2reTBn52nlRUQbp3ptzopPhiJwY/WkHiSEfS55SvGs4qhiPxJF4NGVKjj7RnmFe3 GwUuYDZobbSTHRyR99H5hSlPIgrloI5zftUBNfcGAJAQiQsypABQ2nekgS5lk3e4uVBn lpXw== 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:delivered-to; bh=E0arDkijyzPP50f4DQnIIF372+cf9rfH+fvgm7UflbM=; b=eWpCLhuBvdBulJGsMMCbtBJoyc0nL0sqrlXJddE9FBuXWrwpmgt2CONIqdw6InCRJL I1rjpUCsN4/UgkX8o8OJsAnpdzq8hna8Ia4vPKQoKnR/dVvDiCXixar+dBRMclM3AUJn gpHZjnxL+w8lBNQYTIqy6/2ECSmI7/5UH85rCASaN3dfIFLpVZj/7lxMZ/5Cb2K6hOmk DqAs2hSOLxTtLYWGoohLGH0wRRSd1jy+mmswyF47fKjuaAH2k4UQCPTbwore/IKDvfDh XLPJgsHpywTYemJ5GDaooGp8itLlIz1EvpJKJju2TuXSJdbpMhr+KPABu8604RjXacFL DorA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l1si17326914ejz.748.2021.08.24.06.44.13; Tue, 24 Aug 2021 06:44:13 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 89A38689EC9; Tue, 24 Aug 2021 16:44:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC7616898A6 for ; Tue, 24 Aug 2021 16:44:03 +0300 (EEST) Received: from TesterTop5.. (unknown [IPv6:2607:f2c0:f00e:4a00:3993:2098:36d5:9418]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tester) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id E781B1F41F6E; Tue, 24 Aug 2021 14:44:02 +0100 (BST) From: =?utf-8?q?Olivier_Cr=C3=AAte?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Aug 2021 09:43:42 -0400 Message-Id: <20210824134343.190946-1-olivier.crete@collabora.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/wma: Return specific error code 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: =?utf-8?q?Olivier_Cr=C3=AAte?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: el7iObKBPJEb This way, the calling functioin can just forward it instead of making it up. Signed-off-by: Olivier Crête --- libavcodec/wma.c | 4 ++-- libavcodec/wmaprodec.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 004ffb5515..d9fda2dbfa 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -459,7 +459,7 @@ int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, if (get_bits1(gb)) { av_log(avctx, AV_LOG_ERROR, "broken escape sequence\n"); - return -1; + return AVERROR_INVALIDDATA; } else offset += get_bits(gb, frame_len_bits) + 4; } else @@ -477,7 +477,7 @@ int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, offset, num_coefs ); - return -1; + return AVERROR_INVALIDDATA; } return 0; diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index e0d00d2d37..3e7ec1a8b9 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -991,13 +991,16 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) /** decode run level coded coefficients */ if (cur_coeff < s->subframe_len) { + int ret; + memset(&ci->coeffs[cur_coeff], 0, sizeof(*ci->coeffs) * (s->subframe_len - cur_coeff)); - if (ff_wma_run_level_decode(s->avctx, &s->gb, vlc, - level, run, 1, ci->coeffs, - cur_coeff, s->subframe_len, - s->subframe_len, s->esc_len, 0)) - return AVERROR_INVALIDDATA; + ret = ff_wma_run_level_decode(s->avctx, &s->gb, vlc, + level, run, 1, ci->coeffs, + cur_coeff, s->subframe_len, + s->subframe_len, s->esc_len, 0); + if (ret < 0) + return ret; } return 0; From patchwork Tue Aug 24 13:43:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Olivier_Cr=C3=AAte?= X-Patchwork-Id: 29760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3041312iov; Tue, 24 Aug 2021 06:44:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIj0JFIu+e4tfluH/vkjQ+Z/JvRZF0BLvcLn9rMCx+BR78aldgWwNllawoTDB9fjtu2m2v X-Received: by 2002:a17:906:95c9:: with SMTP id n9mr41748592ejy.178.1629812663544; Tue, 24 Aug 2021 06:44:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629812663; cv=none; d=google.com; s=arc-20160816; b=ObadSpxgEl6yY0C75eOIYe/ACBcdQ/pGxCakWUPmT4RYyYYM9rUv+hpA4GYjgWjF66 l04y5SfQNAf28Vu5YqIM+6IvMQj7a/HtgvinZthKUb1mk/V40SUlQgBL7kGZ+DTbsDIe TSCksZ9Vj0Wplc3q8Butjf1q6ZEzpyHPkRsnPlrYy+MT7tYa3qPJkJ2jnJGDu7HEZBff CqDINCRFwydJgGovLGW4IzBwFK/7uCyjmMj5WQMaThpjXU2Bo3wzo+VZWypbs82sXccD 1/KGixPIZwAq7MOKWGS83ZycXa8dW+iVjuJphv3kRV9l07kM58+igzA9syPKOkigrAU0 OuTQ== 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:delivered-to; bh=SF+Be/jhFAN8tmg/cyn9LWMBTSEJ+7li5HFBrzP3GWk=; b=Hlg/1RlV+98cpEZesEJ9ThkjSZ6/VQvs2H4y2xFKqVlrupwOamN5Am+Ca5pnPsgV5t joHkpXOb0JRBm4CA4OL2kw9tzUy5Ig1E0AgpjheAueKXcJuaeMZ8w+WO4m2ekk18oxqc 60yOxSWGUVSnW6EHV0z67QWolGZxowYWFqDQAt3Zpe76xwsB5VILG/JVFARmBmPcnrqV OwYrOgalvl4FJo6csGjT+AFIUhXIJJ9qVJLE1qKP6Tk/jltYI5xpWKbx59tr0NT6j0rc yzTfQOuwC1wSlHsk6s1Br2kXChLAVtYq9EurInmt+A0skQMulmIZQVOD4HMol236GCyn n+vw== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w14si9936588edc.231.2021.08.24.06.44.22; Tue, 24 Aug 2021 06:44:23 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9584968A0BB; Tue, 24 Aug 2021 16:44:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 767E8689EBD for ; Tue, 24 Aug 2021 16:44:05 +0300 (EEST) Received: from TesterTop5.. (unknown [IPv6:2607:f2c0:f00e:4a00:3993:2098:36d5:9418]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tester) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id B6A611F41F9E; Tue, 24 Aug 2021 14:44:04 +0100 (BST) From: =?utf-8?q?Olivier_Cr=C3=AAte?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Aug 2021 09:43:43 -0400 Message-Id: <20210824134343.190946-2-olivier.crete@collabora.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210824134343.190946-1-olivier.crete@collabora.com> References: <20210824134343.190946-1-olivier.crete@collabora.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/wma: handle run_level_decode error 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: =?utf-8?q?St=C3=A9phane_Cerveau?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dKvwnnN5cGBp From: Stéphane Cerveau Consider data as invalid if ff_wma_run_level_decode gets out with an error. It avoids an unpleasant sound distorsion. See http://trac.ffmpeg.org/ticket/9358 --- libavcodec/wmadec.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index d627bbe50e..d43fe239ce 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -601,15 +601,18 @@ static int wma_decode_block(WMACodecContext *s) if (s->channel_coded[ch]) { int tindex; WMACoef *ptr = &s->coefs1[ch][0]; + int ret; /* special VLC tables are used for ms stereo because * there is potentially less energy there */ tindex = (ch == 1 && s->ms_stereo); memset(ptr, 0, s->block_len * sizeof(WMACoef)); - ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], - s->level_table[tindex], s->run_table[tindex], - 0, ptr, 0, nb_coefs[ch], - s->block_len, s->frame_len_bits, coef_nb_bits); + ret = ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], + s->level_table[tindex], s->run_table[tindex], + 0, ptr, 0, nb_coefs[ch], + s->block_len, s->frame_len_bits, coef_nb_bits); + if (ret < 0) + return ret; } if (s->version == 1 && s->avctx->channels >= 2) align_get_bits(&s->gb);