From patchwork Sun Nov 19 10:01:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pkv.stream" X-Patchwork-Id: 6194 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2648732jah; Sun, 19 Nov 2017 02:01:47 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ6napOvQDdcZ/mQ+DiNTLFFsWdDesnkf6qiydDGf+NbwWoWAMpgXiBph6Zyo6QlIJDO8OV X-Received: by 10.28.22.16 with SMTP id 16mr7112209wmw.138.1511085707286; Sun, 19 Nov 2017 02:01:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511085707; cv=none; d=google.com; s=arc-20160816; b=uoSn7+5MuRhz3HDJ8dZCMoQCfEonqlMzu7dMe8jrQgRh7tkf2RX4wxFeke3mJ6w568 I3yuw8fcOuaXzebs3gbi79XTZuMoViT+t8VAKXLWaQke9E2YOw+wKjWAukU+0CgjdKbt 7BKq9SgAuK6hVkPkkB3XxrPydMSwz6o+XumpiYAfqDTb1sE3Q+jb45ifxaJAI/cV5iqy n88nwHnW9Rivu6XG8fgsoyRsNNg+P4k2PoqU6g1vTDvs3CgR3w96rFgzu9Q3zAxUHgcd i0ADTFJRJPQ+GVaa/vlaVzUBIfKTb+Z5mNX59+qpywmknVJNtv173i+ApdlM8pirrv2S 9BtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=awNpeX6SsQe8bgsBZ0xM/3VO4XqgAnqsowiyle+U+ZQ=; b=M6Z6ua+Xih/PfQ5docfZObV9RbIx4gdO2jeLrMCDnvjQw+ndgBKkQvjG+wfw1e21Er Iry8ci/udCR2uevNWVl4Efd0SJMVXK5EzL/xgXX4AiJXFUOU8RvOHxiomLiqHzVbN3VV WUK/TdgWG4+oQ2UAGH7bZhnZ9hOje0IpteTvEcjwz5f9EhLbwvFFc3NEWOfB41mF0ZiB 3VUHl5pfDd3+26zEckWjZDLQ8D8Ez8truxcLzGrrIhi9kMN1ogixZk9oVtAgzxh6ulWD kftddq484FK9P7so+Lo7P4JCJi9cocfKcriIvgzhRwSVUNQWslLSXYRV/nRudt+nfGsS 479g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=H5jQulAN; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k20si5781006wmi.13.2017.11.19.02.01.46; Sun, 19 Nov 2017 02:01:47 -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=@gmail.com header.s=20161025 header.b=H5jQulAN; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 759C0688312; Sun, 19 Nov 2017 12:01:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39DB86805A1 for ; Sun, 19 Nov 2017 12:01:22 +0200 (EET) Received: by mail-wm0-f54.google.com with SMTP id 128so4937142wmo.3 for ; Sun, 19 Nov 2017 02:01:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=eHGvBw/aqByiLAAbgywZX5myro9DHdTW/mikmzKc0+U=; b=H5jQulANerk0vcZQoWFiYDd9XbxmIKpmfSkEnicWM4QKwzZJmhSWkPaWQTlS/AvgZ4 EQUEam+0RoEJj1IEQY9swXGBYflHwsjjG99Hi0T18XQfW8+UKFPq6+LZqYOZBP0CQYqI HI+9Emhxe+7QFBoRBmf3N8T9pQU1hv7vPrl6Ao7DPC8+I8tJH3HG+M5D8DEQkO1Edwsk AADT5on0+STUxmxv0tmazUXKoJ8BC6acXo/zR+4KAPbYxR6GP4jgs7/sZkzgLM6eNdCu LaCWPb/6MlMPa0FMbPwo1uZk0U7sb1jaK7csQFaNjMPQux7VRWq2CA40fXDFrCYZKnDT Xt2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=eHGvBw/aqByiLAAbgywZX5myro9DHdTW/mikmzKc0+U=; b=W0fBsglzvL//9NWskMQt9AcHcgZ5F7eK6nQcuF2UMms4Ev4r/apvPtMU08xE+Zic6z aZlddta8AZxn+NMRa4y5Lz3iyxpeXI/5P9gUxjtJZuGxF6VZN5djoHR/aASx9Cih0A4q Pz0THmuVp1gGkUyLObnRT7gvuxsy7to07KTM8yYhuA9corXtoEnLzyWF1DKElYHcZGoX 4LQMLYqkkKrdTBKndyD4VFdIrszNGIB95wWzeFDe8gvrMqQA3BhVICWC7471P6ZyynWH dMnn6StdD8pSSidatWqE31i5zlzhlpdvULu17Smy5+/W/9Tdy70HwVkmADw6Q5kS0zwA Xmag== X-Gm-Message-State: AJaThX5AplykvsoWNbEmv0e4xMy1E/5GyEkOQSM4uViax6VYymN6GzYU xqfzk3/FEGziBBiFRTZkBcPXUw== X-Received: by 10.80.216.139 with SMTP id p11mr10341517edj.24.1511085698333; Sun, 19 Nov 2017 02:01:38 -0800 (PST) Received: from [192.168.0.2] ([176.159.7.188]) by smtp.googlemail.com with ESMTPSA id b36sm6517858edd.67.2017.11.19.02.01.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Nov 2017 02:01:37 -0800 (PST) To: ffmpeg-devel@ffmpeg.org References: <20171111000728.GZ6009@nb4> <6111ca51-c953-284a-9d57-905bf8b5fcf1@gmail.com> <20171112160048.GQ6009@nb4> <20171112163827.GT6009@nb4> <19c44254-1279-b685-3f46-0f03b2fa7a07@gmail.com> <20171114121355.GB6009@nb4> <16cfbba9-053d-0958-0042-6487d93301e9@gmail.com> <20171116014847.GT6009@nb4> <148ce8f6-476b-a8b1-a7ae-d44cd2e44316@gmail.com> <20171118202649.GC4903@nb4> From: "pkv.stream" Message-ID: <1869a08e-dfda-1287-6857-aaf8269f4694@gmail.com> Date: Sun, 19 Nov 2017 11:01:33 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171118202649.GC4903@nb4> Content-Language: fr Subject: [FFmpeg-devel] [DEVEL][PATCH 1/2] ffmpeg: add ui64 type to SpecifierOpt 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" Hi Michael >> Tell me the best course; or if you see a way to make my >> MATCH_PER_STREAM_OPT() code less hacky. > iam sure theres a way to do this less hacky > why do you need a 2nd table ? or rather why does it not work if you > put the entry in the main table ? (so there are 2 entries one for > OPT_SPEC and one for teh callback, will it not send the data to both > matching entries ? > > > >> Regards >> >>> [...] >>> >>> >>> _______________________________________________ >>> ffmpeg-devel mailing list >>> ffmpeg-devel@ffmpeg.org >>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> cmdutils.h | 1 + >> ffmpeg.h | 3 +++ >> ffmpeg_opt.c | 41 +++++++++++++++++++++++++++++++++++++---- >> 3 files changed, 41 insertions(+), 4 deletions(-) >> 7c1249f0cb4daa1aebbf94b0e785e644997f754a 0001-ffmpeg-fix-ticket-6706.patch >> From 00c3c724544b16c19282b39644e2584f9c4a4181 Mon Sep 17 00:00:00 2001 >> From: pkviet >> Date: Sat, 18 Nov 2017 00:26:50 +0100 >> Subject: [PATCH] ffmpeg: fix ticket 6706 >> >> Fix regression with channel_layout option which is not passed >> correctly from output streams to filters when the channel layout is not >> a default one. >> --- >> fftools/cmdutils.h | 1 + >> fftools/ffmpeg.h | 3 +++ >> fftools/ffmpeg_opt.c | 41 +++++++++++++++++++++++++++++++++++++---- >> 3 files changed, 41 insertions(+), 4 deletions(-) >> >> diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h >> index 2997ee3..fa2b255 100644 >> --- a/fftools/cmdutils.h >> +++ b/fftools/cmdutils.h >> @@ -155,6 +155,7 @@ typedef struct SpecifierOpt { >> uint8_t *str; >> int i; >> int64_t i64; >> + uint64_t ui64; >> float f; >> double dbl; >> } u; > please split this in a seperate patch > > done. I've split previous patch for channel_layout bug as requested and put the new OPT_SPEC channel layout option in main OptionDef. patch 1/2 : adds a uint64_t type to SpecifierOpt ; useful for next patch of the series (this is not absolutely necessary but avoids memcpy back and forth between int64 and uint64, and reads cleaner) patch 2/2: fixes ticket 6706 (channel_layout option not passed correctly from output stream to filters for non-default layouts) Regards From 550c6410e06f36f8d1dce68c11cc53ebd58f3568 Mon Sep 17 00:00:00 2001 From: pkviet Date: Sat, 18 Nov 2017 22:19:46 +0100 Subject: [PATCH 1/2] ffmpeg: add ui64 type to SpecifierOpt Adds ui64 (uint64_t) as a possible type for SpecifierOpt. This enables use of uint64_t options with SpecifierOpt such as channel_layout when expressed as a 64 bit channel mask. Signed-off-by: pkviet --- fftools/cmdutils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 2997ee3..fa2b255 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -155,6 +155,7 @@ typedef struct SpecifierOpt { uint8_t *str; int i; int64_t i64; + uint64_t ui64; float f; double dbl; } u;