From patchwork Thu Nov 5 13:48:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 23401 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 74C1C448C17 for ; Thu, 5 Nov 2020 15:48:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C03068B820; Thu, 5 Nov 2020 15:48:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 512B068B826 for ; Thu, 5 Nov 2020 15:48:42 +0200 (EET) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1604584121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/cCLu2om/LpOAenk7niT7PjpaZX6gUEK9NS+Jp/XaTs=; b=ZmrFVLZAAic/Xwlc4U/atC1YCzmLZPxLRLX+iOHfL1dlY/EmTx8XiCVjfZllxTvVcq89lA vlOQI7UvRkHyZoZE7kdjjhAXOPJw80nHxWBLZ999Ur1nnIzueGd8qYIuM08ZM3tmk6Erzs laNOIA+RngHSWh7a7M5z0pyreQ9OON1UbB0PL5oU8WH9NbtAWS267bdnOzUB53GXfUrNXg Zf32NDd0bALIt0DIkzSvg7tmXkI1OOwDDGTkjorXzNgFFuPjbcKXyehmLGBQN72wt25LEH L4+b8hNmHzBk2pXstRZnu+X7re0g64UECuPfjaUkmnkFYisi+CaqrcUEHFQQMg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Nov 2020 23:48:23 +1000 Message-Id: <20201105134827.25564-2-zane@zanevaniperen.com> In-Reply-To: <20201105134827.25564-1-zane@zanevaniperen.com> References: <20201105134827.25564-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Authenticated-User: git-morningstar@zanevaniperen.com X-Spam-Score: 0.00 Subject: [FFmpeg-devel] [PATCH v4 1/5] avcodec/adpcm_ima_amv: restrict to 1 channel X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The format doesn't allow for anything else. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 5 ++++- libavcodec/utils.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 701b125c47..d34fd6c6e1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -110,6 +110,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) unsigned int max_channels = 2; switch(avctx->codec->id) { + case AV_CODEC_ID_ADPCM_IMA_AMV: case AV_CODEC_ID_ADPCM_IMA_CUNNING: max_channels = 1; break; @@ -1684,6 +1685,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case AV_CODEC_ID_ADPCM_IMA_AMV: + av_assert0(avctx->channels == 1); + c->status[0].predictor = sign_extend(bytestream2_get_le16u(&gb), 16); c->status[0].step_index = bytestream2_get_byteu(&gb); bytestream2_skipu(&gb, 5); @@ -1693,7 +1696,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - for (n = nb_samples >> (1 - st); n > 0; n--) { + for (n = nb_samples >> 1; n > 0; n--) { int v = bytestream2_get_byteu(&gb); *samples++ = adpcm_ima_expand_nibble(&c->status[0], v >> 4, 3); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index db51512e15..008e95c239 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1696,7 +1696,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, case AV_CODEC_ID_ADPCM_IMA_SMJPEG: return (frame_bytes - 4) * 2 / ch; case AV_CODEC_ID_ADPCM_IMA_AMV: - return (frame_bytes - 8) * 2 / ch; + return (frame_bytes - 8) * 2; case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP_LE: if (extradata)