From patchwork Thu Mar 8 08:43:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7867 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp545286jaj; Thu, 8 Mar 2018 00:43:55 -0800 (PST) X-Google-Smtp-Source: AG47ELuIibBGi2uwoDnp1MYcqrOydxaYE2xxjA5ie1+sQZkAZ5mjhkCBRRWxju/LYv2hzwO7VAGW X-Received: by 10.28.139.19 with SMTP id n19mr17666471wmd.40.1520498635548; Thu, 08 Mar 2018 00:43:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520498635; cv=none; d=google.com; s=arc-20160816; b=d8ViXbWS32S4cLwwbtH+K7degSCqJah2fuxqAgnRXbAdJzbGt1rPF1ewe1/iAvbsUH KyGAsuvuYLxbdhWqEIs/eO1L8hKy673fztvJ2auuS3X5eY4gbYEBd5l2VNAzLfxFWi27 uauTQVzY7QCjdliRvRxwbN6Ym0kqzeR2ll/VTVzazNNFlJ3k63l+LZc19zdxBhTs+Bcz xnRFjRwR/i0z7g34GF9KwJuSTxWt+MOtgkJrxgxN6q/22L/U1CPtBW1GFFw+xyRxfvLB 1PoEZFkA9Ds8phAU5jjmCyoH2VMcXS+nF9juhqOr60owmUTbXiJCNicnwB/ZyNaGj6a/ TQtQ== 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:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=d1tf/k8wVsHoucDL/zqzdymPIPoCAIMeMDXgFmK07I8=; b=rhEEyONV6KF2H2SsiHDUZsmkWVjQvA9LWEHlwkBh6W3ydpkwhv6rGMTpG5SZ750SNF gup/a/aCIguiyvYhXhdspPkzMghdetBfpI9Pn2y63YKPWtNlrNSjFXFaAIsRoLs7Mt28 mx6Eu54Gxni51yznIqBcpf4mhrzknmDSF+OBT5oZuJ/7TkiIuzaNctnrYUCIsqyCC9DE GGE/R+0mqNLl7ehsdo+U7n7/ZjInUmXSyzsGIFaPMNLboNefnuWnR/qHNWV/NLGkGQVH 0fNWNu44InTwbnVXWRx0PkkSrZp2LFZkHzmTC60uX0olGM9yMxbAqhwTBuT1PlPw6mMO ivUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TN4RuHfe; 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=QUARANTINE 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 a20si5462823wma.13.2018.03.08.00.43.55; Thu, 08 Mar 2018 00:43:55 -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=TN4RuHfe; 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=QUARANTINE 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 8DF1768A65A; Thu, 8 Mar 2018 10:43:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f53.google.com (mail-pl0-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88EAD68A657 for ; Thu, 8 Mar 2018 10:43:42 +0200 (EET) Received: by mail-pl0-f53.google.com with SMTP id w12-v6so2981218plp.4 for ; Thu, 08 Mar 2018 00:43:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=2UQn/1c4b4VjvGdxqlklj4h/xCW/SwE2nKY91phxjjg=; b=TN4RuHfefVZ6JWGgcy7p/Ef3xzT1ed4cA796o9uUKaIy2hXVGbRYkTuiAnnvavJPX3 H8kkKQT2tWVWyvA26E6b/RcWp4cvrrhvb7XOzXHwzycokm4zSBiHwCkMbuOpYFdtqCYS oPzeARozQekMqGcCDiYwTnkVXRR5ZNbSylmma7on0AC1Kmo+mMRYEbJAzJ/jnMQYN2/q 0xUouC61q4u70Sv6sW6Cx7Csf5cwLz8qcf8NtXQtD5IbAmK2ATXaMKTazHqyw475qsCI mnFJyu8aDhc9zxv2OIk2ALFOEWuu6JgIzcUnXE9G2+ZfIWAjJ1G3grJT3XeTULvpvDlQ 93Zg== 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=2UQn/1c4b4VjvGdxqlklj4h/xCW/SwE2nKY91phxjjg=; b=D832cmU6g4rzHWgJbK0V6baBXwRS74LbqY7aYuwC8Ufuo+cAsWfoKlNGsqBec5kKky JvXeoKr6fTsstHklAN3wYJWExPJTn2bcOzhv3KqoXI/siAvnS5Kyu5gPbNOq2sT/Nxny 3OwF6k4tqt035c3+jcfoSuW7dDQQQMpDBL+Z+wzCoh3GUuEg14AfaGlI9Yp1+2JGTLjO 0mSTeSHOUOUZQKgBYjYPFWBLYUayXSZV4s2jMAa9iA7X46wChbXGk+EJrHsX3ffhJVhO vyyqXWrepFeI68sL/K0spVHcy+vNguBByU+1WlEz7D0xJvVNSvVpyEWRUsinOOVpH0PK 4jCg== X-Gm-Message-State: APf1xPAmMJuboGdtB6E8cLr3ArDsGw4ZWAoHoARlzK63oCmjVz5R5o1h 7fJdWN/YE1WXs29pzK6TPSc= X-Received: by 2002:a17:902:be02:: with SMTP id r2-v6mr23642510pls.234.1520498629665; Thu, 08 Mar 2018 00:43:49 -0800 (PST) Received: from [10.67.68.27] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id h26sm30166757pgv.22.2018.03.08.00.43.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 00:43:49 -0800 (PST) To: FFmpeg development discussions and patches , Michael Niedermayer , Mark Thompson From: Jun Zhao Message-ID: <6cf9f4d2-9855-175a-6c2c-107ec972dbd7@gmail.com> Date: Thu, 8 Mar 2018 16:43:46 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 06/10] lavc/h265_metadata_bsf: support dump options. 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" From 8dd710a5693503555e302bd3248a805e5cd92e93 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 14:28:13 +0800 Subject: [PATCH 06/10] lavc/h265_metadata_bsf: support dump options. support dump bit stream filter options Signed-off-by: Jun Zhao --- libavcodec/h265_metadata_bsf.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index 2398ee95c5..2b5dd9debd 100644 --- a/libavcodec/h265_metadata_bsf.c +++ b/libavcodec/h265_metadata_bsf.c @@ -379,59 +379,60 @@ static void h265_metadata_close(AVBSFContext *bsf) } #define OFFSET(x) offsetof(H265MetadataContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) static const AVOption h265_metadata_options[] = { { "aud", "Access Unit Delimiter NAL units", OFFSET(aud), AV_OPT_TYPE_INT, - { .i64 = PASS }, PASS, REMOVE, 0, "aud" }, - { "pass", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PASS }, .unit = "aud" }, - { "insert", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = INSERT }, .unit = "aud" }, - { "remove", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE }, .unit = "aud" }, + { .i64 = PASS }, PASS, REMOVE, FLAGS, "aud" }, + { "pass", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PASS }, .flags = FLAGS, .unit = "aud" }, + { "insert", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = INSERT }, .flags = FLAGS, .unit = "aud" }, + { "remove", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE }, .flags = FLAGS, .unit = "aud" }, { "sample_aspect_ratio", "Set sample aspect ratio (table E-1)", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, - { .dbl = 0.0 }, 0, 65535 }, + { .dbl = 0.0 }, 0, 65535, FLAGS }, { "video_format", "Set video format (table E-2)", OFFSET(video_format), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, 7 }, + { .i64 = -1 }, -1, 7, FLAGS }, { "video_full_range_flag", "Set video full range flag", OFFSET(video_full_range_flag), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, 1 }, + { .i64 = -1 }, -1, 1, FLAGS }, { "colour_primaries", "Set colour primaries (table E-3)", OFFSET(colour_primaries), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, 255 }, + { .i64 = -1 }, -1, 255, FLAGS }, { "transfer_characteristics", "Set transfer characteristics (table E-4)", OFFSET(transfer_characteristics), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, 255 }, + { .i64 = -1 }, -1, 255, FLAGS }, { "matrix_coefficients", "Set matrix coefficients (table E-5)", OFFSET(matrix_coefficients), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, 255 }, + { .i64 = -1 }, -1, 255, FLAGS }, { "chroma_sample_loc_type", "Set chroma sample location type (figure E-1)", OFFSET(chroma_sample_loc_type), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, 6 }, + { .i64 = -1 }, -1, 6, FLAGS }, { "tick_rate", "Set VPS and VUI tick rate (num_units_in_tick / time_scale)", OFFSET(tick_rate), AV_OPT_TYPE_RATIONAL, - { .dbl = 0.0 }, 0, UINT_MAX }, + { .dbl = 0.0 }, 0, UINT_MAX, FLAGS }, { "num_ticks_poc_diff_one", "Set VPS and VUI number of ticks per POC increment", OFFSET(num_ticks_poc_diff_one), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, INT_MAX }, + { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "crop_left", "Set left border crop offset", OFFSET(crop_left), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, HEVC_MAX_WIDTH }, + { .i64 = -1 }, -1, HEVC_MAX_WIDTH, FLAGS }, { "crop_right", "Set right border crop offset", OFFSET(crop_right), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, HEVC_MAX_WIDTH }, + { .i64 = -1 }, -1, HEVC_MAX_WIDTH, FLAGS }, { "crop_top", "Set top border crop offset", OFFSET(crop_top), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, HEVC_MAX_HEIGHT }, + { .i64 = -1 }, -1, HEVC_MAX_HEIGHT, FLAGS }, { "crop_bottom", "Set bottom border crop offset", OFFSET(crop_bottom), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, HEVC_MAX_HEIGHT }, + { .i64 = -1 }, -1, HEVC_MAX_HEIGHT, FLAGS }, { NULL } };