From patchwork Tue Jun 20 20:09:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Rummell X-Patchwork-Id: 4063 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1596010vsw; Tue, 20 Jun 2017 14:42:19 -0700 (PDT) X-Received: by 10.28.52.195 with SMTP id b186mr4510797wma.122.1497994939259; Tue, 20 Jun 2017 14:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497994939; cv=none; d=google.com; s=arc-20160816; b=Tkd96pnpg8TBxVowrXojbDTmIhfxC9UY8LlztZlylEHHM8JM5EW3RvNRWLGYKxaoju 3XCF7NiJ7JVOTwjg/fLaDV6C5Qk5xeprA7CbvMbGQpyLlPA+pIErx+BmA1cE5js7xej3 lDp2ks5OvJ3D512Ddd/TBjy/tdrvPRbDyazGvA8YmwmBGrr5ZIt/LZANxUCPYW5ToY5W 4MJuPRQNpPQN1nV73R46DFKrF6ASFzN9wM1if46NC9sQS6JvzNTeS+7FpFYUeJ6p/XLK oFqBPRVqgeANGgIEnTuA1FkZSMgFuOHQyVSU2HEYBgdgFLVzDt/J6h0M67p4GFSGsiWm 3J+g== 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:to:message-id:date:from:references :in-reply-to:mime-version:dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=tGsZ68fM1gYc77Pkp/jHIEPN0xHx4jXQNVE1EVcLH/c=; b=xkr48GyPa5Eb1vgyEt3WjgDLOgtJrF/pLl+h9ypIBuZgXItk+6IMsWtQFVZDqBnDFo nx1wUz9Hd8ey1mTRT3I3ZnoNsMGmiYduxhe7Oj2rgGEE/Gs7ZUSd6Z2f8/DOnIicbbvb V32659xDdCt8oCO9kKasIezAGQQ1RRStV+MFa64z4e454U6xuqhrvB2Z4gGYrHpi5rxP O/KYI9IbrF30mipafXkhkvSgTzgxnMaalhFDPyU60/jL54u1xJtDZw9pNpmQwGoU/NTh i/p1k/QoOdfdpxsTRhj9WesjqMk+y3uxzVcNg1qryWT6W6dA7zWvScQNfbPx2Bhxhy8x 00gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.b=KDSgLYJA; dkim=neutral (body hash did not verify) header.i=@chromium.org header.b=hTvZjvEO; 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=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m29si7869725wrb.254.2017.06.20.14.42.18; Tue, 20 Jun 2017 14:42:19 -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=@google.com header.b=KDSgLYJA; dkim=neutral (body hash did not verify) header.i=@chromium.org header.b=hTvZjvEO; 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=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B546068A2F9; Wed, 21 Jun 2017 00:42:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f180.google.com (mail-io0-f180.google.com [209.85.223.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9477668A441 for ; Tue, 20 Jun 2017 23:15:06 +0300 (EEST) Received: by mail-io0-f180.google.com with SMTP id k93so91694031ioi.2 for ; Tue, 20 Jun 2017 13:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=DHF9jreJwJBohMzc064binM+MJb21ertA87E6LXSMK4=; b=KDSgLYJA7/ZSjwldgC0CnbScJj3f5VNnZip1YU7CumnsaFc6soHeak+daCL40f/cCz 6jRFXzp4Bh0Rcy7Rg2QXk+4C7eGwJyo0HO3x5bpDOTredLushC7f2Ulox9tQxELpCKqP J6EolmUJe+E8B9LMOLSLKJJt5CbnvgsYhi88KteKe/e6c3qWU4Rgn0ffXYfqtc+QQCoL nxut5tgaMKA8+6Omb9SKXwlPxGDmtO/OhoLzk2ThhEnpFkjfMy3o869Am+eqQMNQEBJv ueGTI7f4H/etk+nO2mlDVzP2xqKdAvrClwKRZkNOHMdAq5e2l49620Ra7rFTNsTX1KaK IpLQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=DHF9jreJwJBohMzc064binM+MJb21ertA87E6LXSMK4=; b=hTvZjvEO1uyjds4ph7TiLtYPIx8I/Q2VSRk0gEgPWrLJzTQxzyjn7it8bN39IDn9Yo dTMeMMwGxD68RxFaBp47R7/WNZSB5XMYkSa2ox0ub0MFmKKu/3ZncgUoR788bUPjcODW dV7lYe2aXb69MuiHQ0poF8vbxM7+CyPYjf2TQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=DHF9jreJwJBohMzc064binM+MJb21ertA87E6LXSMK4=; b=b0u/h1h+cE1KMtwGuw3l4mSUmE7kTvrDVuSlLuZocVCu8mIDF/ljMOcHln1aDxTVdQ zIgs06aXcQ+Mvn30mvBYlznWhgesma+tQmY0NdUcSEMvQWNOEsXKFZJp8itOLTnaVcXk HA0jKXbKkLzG8Wgus3bu3XR5dxTsZLHh04RY2h3RtjSK7ito1wWEWy/QrIhVsbkX1zp/ YSoe7oXkUzRpd3/Yulkqsjvx6zP1S43Xb2+wWyER53O0eL61ql57cwhNSE4CMD25ZUAx TJdJsTeLdttHodENYvK7+BnVNtUv0VC/R7KsXocsMKK4NJ18Lpml/6sTpdsGRUlq/oNt li8w== X-Gm-Message-State: AKS2vOz+O3me+5Ctd7d3oIIHoFYvTIugkg7K3tMjMfA83P0IvlWn1lNs jcNw0gqdfqCB6SuZdaz0+6wvJ3OncHfw X-Received: by 10.107.19.17 with SMTP id b17mr26964828ioj.51.1497989349789; Tue, 20 Jun 2017 13:09:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.135.150 with HTTP; Tue, 20 Jun 2017 13:09:09 -0700 (PDT) In-Reply-To: <4f25bb6f-a026-4feb-05cd-ec67f948b94b@gmail.com> References: <4f25bb6f-a026-4feb-05cd-ec67f948b94b@gmail.com> From: John Rummell Date: Tue, 20 Jun 2017 13:09:09 -0700 X-Google-Sender-Auth: AjNNF81-VyROY69-aOt3D1l8Cvg Message-ID: To: James Almer X-Mailman-Approved-At: Wed, 21 Jun 2017 00:42:10 +0300 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] Update decode_simple_internal() to get the side data correctly. 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: Dale Curtis , FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Using avci->last_pkt_props works. Chromium tests work, "make fate" passes. Updated patch: From 0fd3c5c9abd3cea943b12f65f219d479b5949e4b Mon Sep 17 00:00:00 2001 From: John Rummell Date: Wed, 14 Jun 2017 14:43:04 -0700 Subject: [PATCH] Update decode_simple_internal() to get the side data correctly. Use avci->last_pkt_props to get the side data. Using |pkt| doesn't work when FF_API_MERGE_SD is set, as the compressed side data is expanded into |tmp|, leaving the original |pkt| unchanged. --- libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) avctx->internal->skip_samples = AV_RL32(side) * avctx->internal->skip_samples_multiplier; discard_padding = AV_RL32(side + 4); diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 584d9d6241..f7dea930ed 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -462,7 +462,7 @@ FF_ENABLE_DEPRECATION_WARNINGS frame->sample_rate = avctx->sample_rate; } - side= av_packet_get_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, &side_size); + side= av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size); if(side && side_size>=10) {