From patchwork Mon Feb 5 10:58:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vasile Toncu X-Patchwork-Id: 7511 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp2664261jai; Mon, 5 Feb 2018 03:05:32 -0800 (PST) X-Google-Smtp-Source: AH8x225BUuUWdxalrRNdCL60Sx/OvLWZBaDpTcn/GbddKkerAm763iRGqSrDPvYswMsGIi88tAyo X-Received: by 10.223.178.206 with SMTP id g72mr16100754wrd.213.1517828732757; Mon, 05 Feb 2018 03:05:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517828732; cv=none; d=google.com; s=arc-20160816; b=WQ/pjwLozTwBhEJbEGiTBTaRBlJnxq8IDAYFl4esIWsFZw9CbkUOOy8/d72zv0lkUx WMKJJHCLVimXab6BUNhBcINQ26W1tJvU2MhDgKIEFc3+jf5VWvCE57BqaAsSHccplRd6 1b67fb275pMvJcx2j1XpkI/ZSg+ypi4bLKrEaIo9MBIEDOr5nRNq+uqI0hsUx9qQjQQQ dgs/lChrM/I47mts51wtxOjcrRpVpX05B8sTTLl03krVa9FoxvJjWzBNc7QdNfuoVhPi GZAocckgsDTidNvm14drb55HWRgvzLS2pjwNouKYGvZmJHjUXcdGFxjFQiU6lnjgOsAM L49Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=9MLgJrSItAWxJQSSMHlgfZ+drRvHfH/KAeH4N0NL/Jw=; b=0hv69J/9idPQeZfzMpHXUBQwc+llgqmVtxS/iFVepce25cqMdf0lyXdfT5mlrI5rJ3 +EjdkXFk4MbuVNxaBTqMAvo56/i+wGEhNflANZj4EHniy1pcxMciC8yueEIzcUJ+Ye8D OBdVM5NrWjJ1ND+e2LNRWwhTSdTpiTA1JU2Lpk+uMaKNwbfNapEjZP2q/NtfJHHD5ztx gmQZMloJ7ReFcOqAmrcohazFcqgQbRQcJS2ZILdwJUcOq/zSZUFLRWgbRRF+u2b9D30d hdRvxBAkKKsD8bok/Qhjx5jK9jcf74MSi4Gn8jBnUQ0Nj9Y639QVLVjYCxePW2TSzaZf QEBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tremend-com.20150623.gappssmtp.com header.s=20150623 header.b=GXbu0ZLi; 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 n17si6845583wra.303.2018.02.05.03.05.31; Mon, 05 Feb 2018 03:05: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=@tremend-com.20150623.gappssmtp.com header.s=20150623 header.b=GXbu0ZLi; 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 CBB59689AE8; Mon, 5 Feb 2018 13:05:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D4AF6882D3 for ; Mon, 5 Feb 2018 13:05:16 +0200 (EET) Received: by mail-lf0-f45.google.com with SMTP id h92so41113931lfi.7 for ; Mon, 05 Feb 2018 03:05:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tremend-com.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=PkXugLdX1e/cIjn8vbWMHbEPV7B3JyAo7FcjhtF6vG4=; b=GXbu0ZLio5MayriioUSbw9Pm1MTAQHIg4TNJreYI6x69ZhBZfZrkbWDZsI3KdeWae9 SMDp1B8lWr0a4yTNp2KNMkwgnj4oI5Kl2ZfiNhcb0bVPttfqN+iyFi19qup+YqVzKKe0 UDmO/KOur/mpKfbzE7qs+QxZ1a5kBWUOR4rc9Dwdr04yrniAGJcTWj9/JowzAWbvkvfx JvuwII6dyjkpVa66z4vWDjxZVvh9IOfBYONE5IZb+yHR6RJViLQ6DSbhoOmg2pZt73WL RoWKE1zCVCFaw30IZCmzVPRCjKg/Zp6J/aQKFVcOiqTsaneEFJeb108LVlCwwf2xQAWB 7bWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=PkXugLdX1e/cIjn8vbWMHbEPV7B3JyAo7FcjhtF6vG4=; b=hseWAvC99UIAj7GEtRQAWOcfM3PWgYIiBSgsOIRLNzCwDCdWBEteYMtUc9OLBzCUvb gQ72eld8xuZJ7l/Odhh5EtaOs/sqbESCVNGDyEMNMtwtceAYDQMC9yKOZFm5wQJ/MCn6 3QWmK1NkpiQ6iq4a8KnAS4K4LJhQyc6OuTxmi46IROgY+en01kIPr9RLUaSFyPOCfSwe pJ3ESPLtCBB0dETORc+bBvghP5AnZOkwBANwJtvuMiPWUuS1VeNIabZlO+eb/vGmQXl7 e5vWJahaAgJxNNTlDGP65khTmNZwDNYohX5++8SIjuJ/WtX7EghXPVWUSNwj9WZQp5WO HaiQ== X-Gm-Message-State: AKwxytdTFSLeyvfGQjAGezsUdXIhbYm2tBGj0kY/OZiCfSvsNEq5221O GRlg4mR8L96/812i+cdGsx9Y3w== X-Received: by 10.25.78.155 with SMTP id u27mr32972722lfk.86.1517828340531; Mon, 05 Feb 2018 02:59:00 -0800 (PST) Received: from [10.1.11.59] ([86.125.13.144]) by smtp.gmail.com with ESMTPSA id y26sm1803192lfk.30.2018.02.05.02.58.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 02:59:00 -0800 (PST) To: ffmpeg-devel@ffmpeg.org, stefasab@gmail.com, tmundt75@gmail.com, baptiste.coudurier@gmail.com From: Vasile Toncu Message-ID: Date: Mon, 5 Feb 2018 12:58:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] tinterlace license 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hello, I'm looking forward to modify *tinterlace* filter from GPL to LGPL. The ASM opts will remain under GPL. Previously I tried to make a whole new filter, *reinterlace*, that acts just like tinterlace, but it happens that this task results in unnecessary duplicated code. I want to address the main copyright holders Thomas Mundt, Stefano Sabatini, Baptiste Coudurier and other ffmpeg maintainers for their approval. Here is the path for the new changes: From 6cd7a4c7a963baacd9bdcc1b5ded8eef78de521b Mon Sep 17 00:00:00 2001 From: Vasile Toncu Date: Mon, 5 Feb 2018 12:32:30 +0200 Subject: [PATCH] Converted tinterlace from GPL to LGPL, expect the part with  ASM opts. ---  Changelog                   |  1 +  configure                   |  2 +-  libavfilter/tinterlace.h    |  8 +++++---  libavfilter/vf_tinterlace.c | 10 +++++++---  4 files changed, 14 insertions(+), 7 deletions(-)   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.   */ @@ -262,15 +262,19 @@ static int config_out_props(AVFilterLink *outlink)              tinterlace->lowpass_line = lowpass_line_complex_c_16;          else              tinterlace->lowpass_line = lowpass_line_complex_c; +#ifdef CONFIG_GPL          if (ARCH_X86)              ff_tinterlace_init_x86(tinterlace); +#endif      } else if (tinterlace->flags & TINTERLACE_FLAG_VLPF) {          if (tinterlace->csp->comp[0].depth > 8)              tinterlace->lowpass_line = lowpass_line_c_16;          else              tinterlace->lowpass_line = lowpass_line_c; +#ifdef CONFIG_GPL          if (ARCH_X86)              ff_tinterlace_init_x86(tinterlace); +#endif      }      av_log(ctx, AV_LOG_VERBOSE, "mode:%d filter:%s h:%d -> h:%d\n", tinterlace->mode, diff --git a/Changelog b/Changelog index 7a73447..aae5564 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release,  releases are sorted from youngest to oldest.  version : +- Made tinterlace filter LGPL, expect the part with ASM opts  - Bitstream filters for editing metadata in H.264, HEVC and MPEG-2 streams  - Dropped support for OpenJPEG versions 2.0 and below. Using OpenJPEG now    requires 2.1 (or later) and pkg-config. diff --git a/configure b/configure index 2711382..f58038f 100755 --- a/configure +++ b/configure @@ -3281,7 +3281,7 @@ stereo3d_filter_deps="gpl"  subtitles_filter_deps="avformat avcodec libass"  super2xsai_filter_deps="gpl"  pixfmts_super2xsai_test_deps="super2xsai_filter" -tinterlace_filter_deps="gpl" +tinterlace_filter_deps=""  tinterlace_merge_test_deps="tinterlace_filter"  tinterlace_pad_test_deps="tinterlace_filter"  tonemap_filter_deps="const_nan" diff --git a/libavfilter/tinterlace.h b/libavfilter/tinterlace.h index b5c39aa..ceda17c 100644 --- a/libavfilter/tinterlace.h +++ b/libavfilter/tinterlace.h @@ -6,16 +6,16 @@   * This file is part of FFmpeg.   *   * FFmpeg is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Lesser General Public License as published by   * the Free Software Foundation; either version 2 of the License, or   * (at your option) any later version.   *   * FFmpeg is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details.   * - * You should have received a copy of the GNU General Public License along + * You should have received a copy of the GNU Lesser General Public License along   * with FFmpeg; if not, write to the Free Software Foundation, Inc.,   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.   */ @@ -67,6 +67,8 @@ typedef struct TInterlaceContext {                           ptrdiff_t mref, ptrdiff_t pref, int clip_max);  } TInterlaceContext; +#ifdef CONFIG_GPL  void ff_tinterlace_init_x86(TInterlaceContext *interlace); +#endif  #endif /* AVFILTER_TINTERLACE_H */ diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index f13791d..238704e 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -7,16 +7,16 @@   * This file is part of FFmpeg.   *   * FFmpeg is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Lesser General Public License as published by   * the Free Software Foundation; either version 2 of the License, or   * (at your option) any later version.   *   * FFmpeg is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details.   * - * You should have received a copy of the GNU General Public License along + * You should have received a copy of the GNU Lesser General Public License along   * with FFmpeg if not, write to the Free Software Foundation, Inc.,