From patchwork Sun Oct 22 09:47:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Gramner X-Patchwork-Id: 5649 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp5599190jah; Sun, 22 Oct 2017 02:55:38 -0700 (PDT) X-Received: by 10.223.144.227 with SMTP id i90mr9113340wri.190.1508666138711; Sun, 22 Oct 2017 02:55:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508666138; cv=none; d=google.com; s=arc-20160816; b=wnbnJEkHxxWtxjzjxmB8Bf/p2NQhL6wG5vZD484ao2jzrFyx0moltPZX09jd1iPIkZ WNCv1zectxq7L7rUPn527Kc/6zNIwbi3jq+YVXys/1fhyKAPHN2Ss9jVts05VFo1AXwr NlGB92b7g1yHovVZU+fSc9s4XIDBhhOfEqBjJ65sLnXk9GN2sk9PP/MxhGF3Kif5TXJI GeHufdmbatFoyOGHaajj7cDZ6DtyOjOUD82TfHZ/Da1nc/nKS9ohrfCKAxgmoSumf/Ih WKYHFj30ZbkojOU/YXqiYWzuTCO4FMj1DCTRR175nbaIJtBCrtfw95dKZBkKI7b0CW56 nyyQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=VfhHnKId9EoZtnP1RkN+ZwV8P0/MV6NsGG2LmjKrEn8=; b=XbwHJeVtHv/tNEksqyQKXYFOMh7il3ZHy3fXbIEsuWAdA8JqV48+pOmBkN6IJrLF4e RmKr4k9MFluoNWGVdDcOiJW5qF1uFRfQ72aJ2tTid6pC/zcSiEa9CLDNhD7+gqDW2CAD X0nKM8UMeGeSR6hAEjz259Qo20QjLBxUxRCxrcEEVbfQfAEArCtI0gkrJ2YjlWZi1gnN hQTOEfk/gy103LNuPMkJb9BH6Yfz9w0q6fEgvRbHglVUdf+oi+rZmlbyK5E/XOj6xBQX Q/mPtjpoqYOAq3XemO3D3VSHh7686fcFS7Hh0sbuTL7vCgFld/UmI7yXNIpT4Dr6F7/7 wcNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gramner-com.20150623.gappssmtp.com header.s=20150623 header.b=I6saP1xS; 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 v192si1883223wme.129.2017.10.22.02.55.37; Sun, 22 Oct 2017 02:55:38 -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=@gramner-com.20150623.gappssmtp.com header.s=20150623 header.b=I6saP1xS; 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 1A0276802DF; Sun, 22 Oct 2017 12:55:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8B3E689ECF for ; Sun, 22 Oct 2017 12:55:22 +0300 (EEST) Received: by mail-lf0-f65.google.com with SMTP id n143so227678lfb.11 for ; Sun, 22 Oct 2017 02:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gramner-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=bZJ73RUHuq6Dx1/r/UFYGwsl7qSPLtEfNfwlQD0imSc=; b=I6saP1xScQaKfdGuRsHBh0o8h+KBIiIeaoibAoFxvfVV6h3Op+OuwRUS5kLOtzS/M/ bFIHcF/nMYcatpyh7cfEHxThx+zpSwlr30qhBPZx46mJbqzthGtj/nu3nkYpv682IeVR R6/z0WRatmKpXcOD4OMHUe35c4AHfXPrdUnyp3hqv9kXgknMZLESgpfzgJQHSQaCVX3k 3IyeDozkW3dRVkIx2Kq7NFgi48jeV7eWh9GBkrJn59r8qjqtwhP8gS2/3c61GB+BJ5a0 wmYNKbetDai9xzXJCxipsDoZVMSyxj0vSmLqovLgXLKXGx4+oCw7JIo9/c8a9Yx7O4ez 0PJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=bZJ73RUHuq6Dx1/r/UFYGwsl7qSPLtEfNfwlQD0imSc=; b=oDU1tHzthae7cBM4cqjECT6WVp/yBCmDtwcWWT+OSzihl9UtccQkn26NtEfWZe3KeF DdLPx8srXTmNM+cvl2OdfgBMEkYHTMMH7VULbjqwmttHRzgVkA8wKmI4zAEHWP8fNFZV 23fMsIOw8Znbb6pWbhy9IzypmdOTM8kUdFM4Cw09p8aYHIAylj3Bmnnvx1KxMerjkkSy xdJzIXFgjR0LccjocS6WDcyuvx/3v66sKJqCCGoz5Nu5YRhNSc7Q3XnYBNkACavYFQTO lMmeBApCs8Yx6xfUVn7qPYiXf8VRlrriPOVq1sRbtTQQRnHmjJDpwetZzdMXl/4byvAH GfTw== X-Gm-Message-State: AMCzsaV0vR42P2AXtnSpZHaCuF3I8ewzvAEaTWo88OQhQiBKYLXzqpsB HqWJHwTxmCxl1tNEPKtrADWupXkK X-Google-Smtp-Source: ABhQp+Qs0hIHNE0Aq22kGF1hLw+SERrP++HwE/4dOKP6Bubvf0ph2qN74ePC81vQ+oCM+LqcFWp2uA== X-Received: by 10.46.81.81 with SMTP id b17mr3861397lje.185.1508665698021; Sun, 22 Oct 2017 02:48:18 -0700 (PDT) Received: from localhost.localdomain (81-227-53-67-no27.tbcn.telia.com. [81.227.53.67]) by smtp.gmail.com with ESMTPSA id 11sm1123042lje.96.2017.10.22.02.48.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Oct 2017 02:48:17 -0700 (PDT) From: Henrik Gramner To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Oct 2017 11:47:55 +0200 Message-Id: <20171022094755.72547-1-henrik@gramner.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] swscale: Reduce verbosity of misalignment reporting 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" It's a bit overzealous to complain about misalignment with AV_LOG_WARNING, especially since memory bandwidth is much more likely to be the bottleneck compared to data alignment which the user may not even have control over. --- libswscale/swscale.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7f3e22355f..4eca79edc2 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -307,26 +307,14 @@ static int swscale(SwsContext *c, const uint8_t *src[], DEBUG_BUFFERS("vLumFilterSize: %d vChrFilterSize: %d\n", vLumFilterSize, vChrFilterSize); - if (dstStride[0]&15 || dstStride[1]&15 || - dstStride[2]&15 || dstStride[3]&15) { - static int warnedAlready = 0; // FIXME maybe move this into the context - if (flags & SWS_PRINT_INFO && !warnedAlready) { - av_log(c, AV_LOG_WARNING, - "Warning: dstStride is not aligned!\n" - " ->cannot do aligned memory accesses anymore\n"); - warnedAlready = 1; - } - } - if ( (uintptr_t)dst[0]&15 || (uintptr_t)dst[1]&15 || (uintptr_t)dst[2]&15 || (uintptr_t)src[0]&15 || (uintptr_t)src[1]&15 || (uintptr_t)src[2]&15 || dstStride[0]&15 || dstStride[1]&15 || dstStride[2]&15 || dstStride[3]&15 || srcStride[0]&15 || srcStride[1]&15 || srcStride[2]&15 || srcStride[3]&15 ) { - static int warnedAlready=0; - int cpu_flags = av_get_cpu_flags(); - if (HAVE_MMXEXT && (cpu_flags & AV_CPU_FLAG_SSE2) && !warnedAlready){ - av_log(c, AV_LOG_WARNING, "Warning: data is not aligned! This can lead to a speed loss\n"); + static int warnedAlready=0; // FIXME maybe move this into the context + if (flags & SWS_PRINT_INFO && !warnedAlready) { + av_log(c, AV_LOG_VERBOSE, "Data is misaligned, this may reduce performance.\n"); warnedAlready=1; } }