From patchwork Thu Jun 15 00:04:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Rummell X-Patchwork-Id: 3996 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp973033vsw; Thu, 15 Jun 2017 13:40:49 -0700 (PDT) X-Received: by 10.28.197.195 with SMTP id v186mr4154776wmf.13.1497559249044; Thu, 15 Jun 2017 13:40:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497559249; cv=none; d=google.com; s=arc-20160816; b=xyLWx5wL6szowFfCxXVCbJYn46g2ALzIFUpDQhTyfSXN/gLM1cXQ/cAn0ZahaVu79P Mi6mTVku7hHjp742i2Oy6EM4GTqzkNefKQWlaC37bANoWPrm6En4qKQ+GzcG6PJU0MNS je34xu9sXNtX+1SUDvOcc4ncPnE6KXJUA1livw0ubQQRKXCadysbcAC0u+4lYm/hpEVQ vb/U4MQjsukNTTMziDLmFv0cb1CXBEu1D1WbUZqbURk2/MVf+BQAkIpcNjs5JpUn4rDW aWHwDykBtnGFGurfybmju+d2deX0Z3VJ2eqNyK+1LHaA4ox18F9Vu6Ul0ou5Zn5rTB/1 5dyA== 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:mime-version :dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=cXgigoVJrpd508QVLiBPtiLQIJVPoOl9wSyk88G5avg=; b=YnnqH7mzRNGlj7+BefO+VWIMUaD/3B1TJcWWe+tWOqXViGCp0lFeN9+2aiJEbPbhar 1OI0fg4P3Yg6b2hQKJh4HPtcU3GOJAL/7nAofRxnvNWOlxuuJc1ZnvD8oGjWfbvv9IKR ryE2L8CKmnhOdoiCTlbjeMbOU9oppxQVqVjBT7MMibj9K802oWeiLaY+rcw0rHSXQYL9 /5bKfKMsn8d1pBzUhhEDzVpFjLJrKrMIFCmBx6N+4ZFXnfZ1Hi8S60pWs8sTUF165auJ ++6fEPKVVcL5lcb12TI4wcIqXoaBHbUZMbFA/aMnct4b2CR/m/lABRHrzfMJOAeJPTfE 6cnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.b=oO3vAWlb; dkim=neutral (body hash did not verify) header.i=@chromium.org header.b=GasKDua6; 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 j43si300482wra.339.2017.06.15.13.40.48; Thu, 15 Jun 2017 13:40:49 -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=oO3vAWlb; dkim=neutral (body hash did not verify) header.i=@chromium.org header.b=GasKDua6; 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 7211968A3F9; Thu, 15 Jun 2017 23:40:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua0-f176.google.com (mail-ua0-f176.google.com [209.85.217.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72E3A689EFA for ; Thu, 15 Jun 2017 03:04:56 +0300 (EEST) Received: by mail-ua0-f176.google.com with SMTP id m31so10600255uam.1 for ; Wed, 14 Jun 2017 17:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to:cc; bh=yK+/FsCrjzWhvapYREjNymsSMq7v4DvrBW7+x6fL2qE=; b=oO3vAWlb7MgUPar6hZFtYubfuyt0s1vddkDFo1J7CMRsfgJCUvp17fVD1V2T93i1BK nzKbwVC0YuLKld/8dts2+ypvdTUe8EouUYW9eY7/kAEm3fRvV4u7TwGPHdS52cQQTRRh jbdPWRJkgTOR+Ay8u2kbloJoyEr8MhSkTVQ9xEnYVimfvm01S7icY/G1vEyIwpPEA/Vn t2aus1ToGM1tb+9+dRF4Xr7N5aDxW2vXxDpT6GwlR1zbYsx0mmAY/pm0luc1EkiITiBI KtIE4LqBpkvgSaVLvlGwa2kLLHjBwVlGbAV657iprL5saU7TcyrdbH7bn2wk7bSEbjL/ EISA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to:cc; bh=yK+/FsCrjzWhvapYREjNymsSMq7v4DvrBW7+x6fL2qE=; b=GasKDua63YiEppjZm1x1MGIcshbDhCv+PnT37dNbWTmT81j6SGY0uWkUsSnLD6T7+q hIFExOAB7wB5njMRS9wlb569GW74iDf/Y18WqIeuxCQsmoFzH88pLVDT++exqqrugV84 IqgLVno81KHHxU74PHOhnw/MXpJ8WDrZxzfvM= 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:from:date:message-id:subject :to:cc; bh=yK+/FsCrjzWhvapYREjNymsSMq7v4DvrBW7+x6fL2qE=; b=T6CU+CrJbaAjgkH1MW8LpPYjk1SkBuICmfiokaSyhq4e4KUTwim90ytnnT+989Kt/A S+Onw1Z/s2rMPCdULjrFRllMiBJxkF93eVpmCkc0GSE3XGhdt1D33INCJKF1kJcD4Mou 1PvKVdqx9qy78lzpGGc04BNGLF4gZugSUhIu8m/lQWtmAu8RKsU9V7i1dDiT1OLxkAB5 yMH0KuWxrkRZG+WRdvZRAV4tiTxkSImUP/4ou2YhRiUFkpCKF3B05xfFKwJJ77rf3JCI k9z8kOSMVWb49boqo6LgrYNJFYCl5tI3vzqyvIaUP5WAJgp5lSv9zy8dz/7iMX1KT3lM Oj5A== X-Gm-Message-State: AKS2vOzt6lVF7NPoAIOuvn0hU2nUz8KAsJW1SC4CPHDhQaBw7pCTA+z/ vICzNw2F60CNBg5Sa5qZ2DG4ZgMjRVHUWsrMIg== X-Received: by 10.176.27.90 with SMTP id n26mr1708973uai.94.1497485097698; Wed, 14 Jun 2017 17:04:57 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.47.83 with HTTP; Wed, 14 Jun 2017 17:04:56 -0700 (PDT) From: John Rummell Date: Wed, 14 Jun 2017 17:04:56 -0700 X-Google-Sender-Auth: 4JTaKNjK-FUU21fK76d0RrNgshU Message-ID: To: ffmpeg-devel@ffmpeg.org X-Mailman-Approved-At: Thu, 15 Jun 2017 23:40:42 +0300 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 6418fc43b06cea4cf49e410d474ae92022c4dbd1 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. When FF_API_MERGE_SD is set, the compressed side data is expanded into |tmp|, leaving the original |pkt| unchanged. So when retrieving side data, get it from |tmp|. If the side data is not compressed, |tmp| is a copy of |pkt| so the side data should be accessible from either. --- 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..327fb8ccb7 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(&tmp, AV_PKT_DATA_SKIP_SAMPLES, &side_size); if(side && side_size>=10) {