From patchwork Sun Oct 2 07:46:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Burt P X-Patchwork-Id: 825 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1042445vsd; Sun, 2 Oct 2016 01:01:24 -0700 (PDT) X-Received: by 10.28.163.6 with SMTP id m6mr5009393wme.110.1475395284394; Sun, 02 Oct 2016 01:01:24 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id uo4si29259099wjc.195.2016.10.02.01.01.23; Sun, 02 Oct 2016 01:01:24 -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=@gmail.com; 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 dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA61D689EA1; Sun, 2 Oct 2016 11:01:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36E80689E1E for ; Sun, 2 Oct 2016 11:01:01 +0300 (EEST) Received: by mail-it0-f67.google.com with SMTP id 184so4555464ity.0 for ; Sun, 02 Oct 2016 01:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=7UaSPQ21aHAyAE72r/Ae8qCQpkbAHDX2q9hNDvX0npE=; b=TjN35h18/v55Xkow4oK31l7yHuQcC5JXs+4Y16xBk0FevFTEjylL/dUVsqlm3wWTJ1 uiINwDrKVIffnHk5Rv5WoQCOZWBwt0Lo/fXNIkE+lXYafhonoMFXGImIXO1uD62Ogd26 I7frkUzMSSAWQiuCbzbBPLfhFgmCFwqGvy3+A5z5n5cZVlA1N0+5UQZbTedWqnP3ChcP +2u0Swi1zgYFzDBBRMBQ++qGAVYzUOr2anofDoPGHjW+I6IcbAI6WRTygMY9zU9L7HpM 0AOAdd1w0B00/vaBVaNZ9Pemgh4enVg6XtcGO8b3gafL65L4WteBpCgZTSXV67uBD0f9 LwEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=7UaSPQ21aHAyAE72r/Ae8qCQpkbAHDX2q9hNDvX0npE=; b=fhndFfP1YPVg5zcpv625w6w7oZY1hjKcX9PhjrrIdbEOPXGOZ15QzAhqgBgwO+uvUY Ut7uhfMoOg2st8p/6C7KwTntC8NfjZHzxa0VxI9gSznLTIqzuIu+KRV8obClUKUQMHQA JJ0bVupWey8Sife7Crpb6YJqOZrDtijaDiofpm1YHRSOwE1uerHlgpCT0EyMTrDqqh1g y4z33QBMLPLljB/dMSWaxGzCcn20UcMkLwhx26ns3Qcyx2pv5Yn6IqHUpw7kgVA0ha2H jsvSD1D/qWGbQqabB2ENhJtVLF/mRaaQB+CoHbhwjf4BA6dCAbedQIe/FSs0s2p2N3K/ aEDg== X-Gm-Message-State: AA6/9Rmgfh5cBtxUQdkOQ2dWIHyvQ2C4EcEH1FPGGmLjlA3AjJz2wqisx9gsMdnuGal7XA== X-Received: by 10.36.225.137 with SMTP id n131mr11674339ith.105.1475394402864; Sun, 02 Oct 2016 00:46:42 -0700 (PDT) Received: from localhost.localdomain ([216.16.66.181]) by smtp.gmail.com with ESMTPSA id s185sm5387725ita.21.2016.10.02.00.46.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Oct 2016 00:46:42 -0700 (PDT) From: Burt P To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2016 02:46:30 -0500 Message-Id: <1475394393-10173-3-git-send-email-pburt0@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475394393-10173-1-git-send-email-pburt0@gmail.com> References: <1475394393-10173-1-git-send-email-pburt0@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] af_hdcd: support s16p (WavPack) directly 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The buffer is already being copied anyway, so interlace the planar format during the copy and remove one use of auto-convert. Signed-off-by: Burt P --- libavfilter/af_hdcd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index a9f2f93..90b6b64 100644 --- a/libavfilter/af_hdcd.c +++ b/libavfilter/af_hdcd.c @@ -1665,10 +1665,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } out->format = outlink->format; // is this needed? - in_data = (int16_t*)in->data[0]; out_data = (int32_t*)out->data[0]; - for (c = n = 0; n < in->nb_samples * in->channels; n++) - out_data[n] = in_data[n]; + if (inlink->format == AV_SAMPLE_FMT_S16P) { + for (n = 0; n < in->nb_samples; n++) + for (c = 0; c < in->channels; c++) { + in_data = (int16_t*)in->extended_data[c]; + out_data[(n * in->channels) + c] = in_data[n]; + } + } else { + in_data = (int16_t*)in->data[0]; + for (n = 0; n < in->nb_samples * in->channels; n++) + out_data[n] = in_data[n]; + } if (s->process_stereo) { hdcd_detect_start(&s->detect); @@ -1707,6 +1715,7 @@ static int query_formats(AVFilterContext *ctx) static const enum AVSampleFormat sample_fmts_in[] = { AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }; static const enum AVSampleFormat sample_fmts_out[] = {