From patchwork Wed Jan 3 08:14:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 7099 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp15620076jad; Wed, 3 Jan 2018 00:14:58 -0800 (PST) X-Google-Smtp-Source: ACJfBosYk1LIIvUBBM4MJnnaVQbn7uvazlhZ82t0J2kuGT8lYmHNCn6dbS49LyCYr4c0zO7Od6bW X-Received: by 10.223.196.19 with SMTP id v19mr632568wrf.135.1514967298353; Wed, 03 Jan 2018 00:14:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514967298; cv=none; d=google.com; s=arc-20160816; b=X2vqMmLlyzmtAspZPXUz989Ve06Kei5I4I2L9WiQbmYliMRG5RQ+ZrH06/kyRlRw5h f+UMLC+1fLaET7agv7Joun3TKO6x9ugYuwmGacc2GuMo3tBqwmGXqgtwTlvxIrwftPTu yXh4Ml8A4Nmhir7knek7KB5tben5ceheqDlpNIT+Elu78/iQhmh2yGsvI4fyEX5TY7fU aDDGFXXjfu1lTSXyiwpQ3EDdr2/p5q/OfJrI6kPM48UJRhL2dNAxN+0yJpTvXxab0ky3 SWsFeboBv2CUoGIfr72LBRfXd5QuaRw/N7mMX8CRsRzc/fsVnrGkBvtMQ/6nGp/2FQwm qXTw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Olv34wpIitkgdc3kSDi3Zp0yhJre/D1ffemf/Rh4LY4=; b=oHp+wQXc/nVJOHtfERqaQr1tkB/ty/xhRGGuhsDsq26DnRH4oVIifGf1c74UL0P/dp DO8/dm+awDK1Xwh/nDl2WnLFTjh3Sdj6182h7hhp6jKoYlo8BLRZClTiyPRIP9tfB03r el3kp7+57z2n7pRFFhtoduJaOmleiXP4W12yw2YgWzMKPL+8cXXDd4x8aaY2jrsHG89z oXNYvN5E5WkSmajnLM6p6/OuMPAG5xys4SVrwGEy9lKetHP6K45wMaSkcYcJUA8JI8Nl W5hVdxz4/M44XnmWaFIgl0bDxeKuvLs9tO2oiCdCXTlJ/aSe/eLy1NT8PuJV2aNOliid HGqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=czNEzXAu; 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 16si419796wru.468.2018.01.03.00.14.57; Wed, 03 Jan 2018 00:14:58 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=czNEzXAu; 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 82EED688351; Wed, 3 Jan 2018 10:14:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f43.google.com (mail-pl0-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C621680A1F for ; Wed, 3 Jan 2018 10:14:33 +0200 (EET) Received: by mail-pl0-f43.google.com with SMTP id 62so826137pld.7 for ; Wed, 03 Jan 2018 00:14:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GcgocuihaGU4jeCs8TZ6s3yC6THyjhMGhJZUfeE+59w=; b=czNEzXAuoJAkPydBPQRK95ZMeIvJ3xW5dAoBBARodu1ypVTnjWW8jmVvhSUWFk3dz7 GRr5fSfuQZChI5ccP93I8knyX5R1oRnwfMedDblosAfzxznqEDvz4rkXTInpWNNC+l8Z dXqvcN2foLD8pYCBAsNR+rRB0SjBPp1P0tFgUX88vkilWGcJtIEtoffIe+nI7r1je1Px WMtVCOoRZCx1OEAkhj3TL8YfMVgc2n4p3YaCg/J/Xtn//7eKVvSc+FVV4SNkSmSniiUO hxJlRYCpP7pcA+voS0tGCcGmQUVnuMnX9X/WDugMPHU9MLBekXyJvB0QQmAbAR2VAP3N hk6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GcgocuihaGU4jeCs8TZ6s3yC6THyjhMGhJZUfeE+59w=; b=XkNQBuovZP9gVCrke859JpnyzScsP8ZuGMJ3Pnqi+yJYa8JzzYLdimVycV7+Xh4kqI hC3GixdfujEeaheV6n8rPg2pgOkW82+L1OY8G5Kym/9UPMil5wbgGTlC1vyHUBnMYLos 06biBQlMBCBkFmXPscTE3eQIMoA57TDIxuq9kou3kKB+mQb6S3zFH97wEY6jP7CbMCxB lEStdpSu/q3naiVvb1s0L1V/THuSYY5s+rHHyF3dgiILmzGt1OTqhfowG9iRO97lqflq i4KiGGxt5e0a7zHNgK+Izld9VfT6iDuZoHBGB6vwWu+AZoAHVFpEppFwFHTFK9hCf2fE fk3Q== X-Gm-Message-State: AKGB3mJP85BfCcToqHf/0FNVyJPTxwYpul76QnUD2zE353B/H9o/dlZ/ hCxkzj101bocM6n0S9t5FkfU1fVf X-Received: by 10.84.168.3 with SMTP id e3mr695550plb.208.1514967288231; Wed, 03 Jan 2018 00:14:48 -0800 (PST) Received: from localhost.localdomain (180-150-45-216.NBN.mel.aussiebb.net. [180.150.45.216]) by smtp.gmail.com with ESMTPSA id j13sm1448417pff.131.2018.01.03.00.14.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 00:14:47 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Jan 2018 19:14:23 +1100 Message-Id: <20180103081424.47388-3-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103081424.47388-1-misty@brew.sh> References: <20180103081424.47388-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 2/3] adpcm: consume remainder after consuming XA chunks 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: Misty De Meo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Misty De Meo --- libavcodec/adpcm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index be206c55ba..50ffba0db6 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1115,6 +1115,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int16_t *out1 = samples_p[1]; int samples_per_block = 28 * (3 - avctx->channels) * 4; int sample_offset = 0; + int bytes_remaining = 0; while (bytestream2_get_bytes_left(&gb) >= 128) { if ((ret = xa_decode(avctx, out0, out1, buf + bytestream2_tell(&gb), &c->status[0], &c->status[1], @@ -1123,6 +1124,12 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, bytestream2_skipu(&gb, 128); sample_offset += samples_per_block; } + /* Less than a full block of data left, e.g. when reading from + * 2324 byte per sector XA; the remainder is padding */ + bytes_remaining = bytestream2_get_bytes_left(&gb); + if (bytes_remaining > 0) { + bytestream2_skip(&gb, bytes_remaining); + } break; } case AV_CODEC_ID_ADPCM_IMA_EA_EACS: