From patchwork Wed Jun 10 23:32:46 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: 20300 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp922146ybm; Wed, 10 Jun 2020 16:33:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMG2A7JTlbebmmuNnHam30mujsT2jyWSJyzqZEzvlmiVvnYV4N+hLHYU8QGJSpCao4qCdi X-Received: by 2002:a1c:5fd4:: with SMTP id t203mr5010958wmb.184.1591831990670; Wed, 10 Jun 2020 16:33:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591831990; cv=none; d=google.com; s=arc-20160816; b=zwI1aPAUYoo+kC134zOyz8hMM7KpOVKHtZCQGVXLODRL6llL8QMgoCwsf4W5WBP1NK XwjNgRC+M1bP90qOIWwXNuOtWOXlIm+C+VK6d8J+xCOqHG74tdpSwA7Js4tiQmMYMDKD rMlkA5WNFaTXodO2sKtzwdYX6k4Qsvqgu9QG0zDHOU/Eb8eRRwrfkogziC0WsOQF8B9p lwDOD7wClnKPKn0Mh3nVPMtHFhSBoeoSQPLyXjC6reXpTCBWELXMos4etzA2JCj6e/vY AQ6oYLOcpm5VgXScsx1KDj6lGARsFaSfJDd3ASrkNdCa1KG6dEIPCM0Tw2skqEnGPqVE PBBA== 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:from:to:dkim-signature:date:delivered-to; bh=hiYLEITEwDV3Tfgbv+MfpyKVO6hwrZs6xMQkRVj8/iM=; b=K7YRbSsUp95IC9JMIFWK4ltrpfRDqNvOLh9iRcD0VKCDb8o+ylOJdz13EX5XUBlaQd dTZ75Ch6OjdiX1o4XdMti0iJzJWF2kFqWML5OyQ/dQ6u8zCwQnQ5miXYwBFlVcnVWNwU QOhXp66O+RqJ9GnCa77XOG+t4H6aAUeTDhHBdXeSjNVm88DTz2yACkb+uXQN+uWT8Lk4 IMCsbniRZ929J5Vc7C5g0Zu/uk1gmtg1hOd+W5CsHyMzyVCSTM+T02xyP56FeC4l4bwg c6dziAXdrt4o+KlYpQdCgzTGA+lcS+z12z4o/VnerkXl+FVPyhvCYeNK/qzDNNMPESXF qKyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=mL0tQ7uv; 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=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g82si1158182wma.61.2020.06.10.16.33.09; Wed, 10 Jun 2020 16:33:10 -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=@zanevaniperen.com header.s=protonmail header.b=mL0tQ7uv; 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=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E65E68B53E; Thu, 11 Jun 2020 02:33:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F81468B50A for ; Thu, 11 Jun 2020 02:32:56 +0300 (EEST) Date: Wed, 10 Jun 2020 23:32:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591831975; bh=/nYnoQSo7WdXLRLWdxj8hU8ZlLzofKj5B7n24gPlPt8=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=mL0tQ7uv21+iEOkuGNMlTkQIeCbSjY1hLVeJIFyA2MdooiiX91aMtcott7kwwjv/1 v99hfJhizhpQfP0ph27FZf21N5GfTmGtEZoehf/HHOPVyCbN2ccGwhAakB6zi2L97W 7pedpgMNaRAZdYpKIlQ4kEuqGCGbM3LbdhLYUi44= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200610233155.1050210-4-zane@zanevaniperen.com> In-Reply-To: <20200610233155.1050210-1-zane@zanevaniperen.com> References: <20200610233155.1050210-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 3/7] avcodec/adpcm_ima_apm: prepare extradata handling for encoder 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" X-TUID: Su6IFi/6lePa Content-Length: 2152 Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 79c5d625d1..328971adf1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -162,11 +162,11 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) } break; case AV_CODEC_ID_ADPCM_IMA_APM: - if (avctx->extradata && avctx->extradata_size >= 16) { - c->status[0].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 0), 18); - c->status[0].step_index = av_clip(AV_RL32(avctx->extradata + 4), 0, 88); - c->status[1].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 8), 18); - c->status[1].step_index = av_clip(AV_RL32(avctx->extradata + 12), 0, 88); + if (avctx->extradata && avctx->extradata_size >= 28) { + c->status[0].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 16), 18); + c->status[0].step_index = av_clip(AV_RL32(avctx->extradata + 20), 0, 88); + c->status[1].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 4), 18); + c->status[1].step_index = av_clip(AV_RL32(avctx->extradata + 8), 0, 88); } break; case AV_CODEC_ID_ADPCM_IMA_WS: