From patchwork Fri Jan 5 09:06:48 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: 7136 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp531401jaa; Fri, 5 Jan 2018 01:12:33 -0800 (PST) X-Google-Smtp-Source: ACJfBovH3JzgzkChdqpgu4A6x6icM7KY2QdUaBFXhpzCTWiM4iIbkRSPN/vLpU8R//F4U0RYebQ1 X-Received: by 10.223.179.7 with SMTP id j7mr2179463wrd.178.1515143552894; Fri, 05 Jan 2018 01:12:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515143552; cv=none; d=google.com; s=arc-20160816; b=sP/ZV63asiNOBy1nVd8M0BraWSTNQll01cOKxr/TjBI9UjyqNI0zgZCj4NgJ1Y19mj DXjGZe/9HEkGtxkZiRjvPgjXoAzC0riUFOtpcTbchjYtJdmhNi82RcF6IltguVClk9fw Z+FRRfy7tHXO4qU1dhtDrve9n+WR6BE6EimffNj715nfe9fryCaCrB7K13+eyFVEr875 7xyP39W7Z8cX3ftB7moKEkJUXHmV2k+17gNTdHnfoam9KTILX4ayXKiisTstmILQyUXj amOnvogkYtWn0qp+b1hjXV0S9do6P1Tc+Y/aShm/jljisVt+xNn/vF6oepR1nbK5QZte 53Lw== 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=uMrTrY1uwtpq9hHQpuCzaYOO1qrwsRq+O8yVxVxt2ac=; b=osbZJnTB+yS8Kw6BPSTUMKVjPA0kRBKOJcnXcG9Xa1GO/yitRQCRnBr3NMiUYvW8W0 7ODf96E8+QLUu/HG194j2ReqhEqLmuuq35CmZ86NCvstP5+5dV62tHTvqEIcqxTABprX IMEShXOEsg4FU5PNHj8CSycatXZMb4BaRPVQwIqWTg9PzulHyzPcRyRiWj3913Svz2QP XA3KnzNnST618pK+zG7dh28UNJk7bVjCIwPYn4+sLaVQV4iX0kjHuZrvXIKrMkXEpvG2 qSjzsKOKzNw3M156NLPZX75/1bz5g7lWk9c8LiON8on/NUhTxxTHrrffzm5VAA0toZKM U9Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XvMmb/J/; 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 l3si3802732wrg.58.2018.01.05.01.12.32; Fri, 05 Jan 2018 01:12:32 -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=XvMmb/J/; 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 50A946899AA; Fri, 5 Jan 2018 11:12:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f52.google.com (mail-pl0-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EFF9680D00 for ; Fri, 5 Jan 2018 11:12:08 +0200 (EET) Received: by mail-pl0-f52.google.com with SMTP id b12so2749431plm.3 for ; Fri, 05 Jan 2018 01:12:25 -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=a5YfNQPxnenkzPqXFmsa7lar+LzbmuYOWVuuqMPO74A=; b=XvMmb/J/1bjX9sNDft2V4LgmglOMLFT/xRnOYwwRx/r3Yfwh0UeatfBehkwEqks2Xt BPAX7eERvccDUG83qtARNroT3rWZNHPvyqbUEigpwKDhkt+CO1MKBpW3VPa8dQyQCu1I CpY+TJ9F6Oju+GtG0MCKrYDGYUHnyUMmEqUu/Bg9WaYTXkI0lyB7bqx93wI7kGe1FjMy yXmGq1T7IXcvJDeQ4FF+YfalmW3IU5/b+4qes0tm0moLQo8xbDM8L405VYKBuH6uNsf+ mKLnXdLx2vAl81Z5R9lJeXVYz52OuKd33afxQOfoetq8oKideYsiz6BvGTLYFZWpO5ct kwxw== 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=a5YfNQPxnenkzPqXFmsa7lar+LzbmuYOWVuuqMPO74A=; b=d9ujBk5J0cEQo2Ps6L8AkIPafCaoUrIt4lxjvKRXJHXu45wh+8maLz7P1l5kMRGFpk T6JPZBqjPQtUn7L/POuOAuP1+iOcJ49jyqYmLCIb8dSl+Q2RGP9qwPACSpQTvaFNCNZK TWJAWFQ2u0Zl16SK/zAWTAFMgfZw1Z/YOI5Wi5db8tE5vtHAQfH1tzdYER5EfAFWup4d sQFU+a11eYmtp5Y7xlSnrLyv1xZZSxlygXWz6roOc+QVio9LXNct8xirHRjpl4nykUQm sXTr4oquTyJUE7xQ8ohKz1k8KTRFjpkCy9c1en+nMXzX1sf1NQUZJtGIl3zwN5lMPmq1 Tyew== X-Gm-Message-State: AKGB3mJ9kLGAxRjWlsLBOm8FZjCqr28RvxekusQPoCd673NZ0+BLaUyH SGyreJVYOvikfpborDiH5g477nVd X-Received: by 10.84.231.22 with SMTP id f22mr2402688plk.442.1515143224864; Fri, 05 Jan 2018 01:07:04 -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 c184sm10944306pfc.8.2018.01.05.01.07.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jan 2018 01:07:04 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jan 2018 20:06:48 +1100 Message-Id: <20180105090649.76346-2-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180105090649.76346-1-misty@brew.sh> References: <20180104203901.GP4926@michaelspb> <20180105090649.76346-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 1/2] 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..cd3bbd33c2 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; 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: