From patchwork Mon Mar 12 01:24:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7931 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1071019jad; Sun, 11 Mar 2018 18:24:31 -0700 (PDT) X-Google-Smtp-Source: AG47ELvbnYd1czbSwrTqjht1pEjabVesD6PKBCb4pPy9uHWshoI6Y81kv6RDbEBVOEhKOoQNpqoX X-Received: by 10.28.153.75 with SMTP id b72mr4393018wme.127.1520817871653; Sun, 11 Mar 2018 18:24:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520817871; cv=none; d=google.com; s=arc-20160816; b=ZhgcqqoLn6t1H4bSJapy/cyxtefCH0Vj8BbBF16E73UJ7WqE8ch2ZlkoUCPc0TVguw anTw9Kr3SEgyWWfIRtRDPt/U8mvG6HKV8WFXlu1Hfu8aNQ85m0tPZp58viokwaqnOg1X XtjCUUriQlUP9T/Tyyd/X9Sxgws6+I6652zQ2FXBTSaLOULbMaZdrUPBWs3zZl+1VUkb yTrmxhNNgayB8P2cbYwc9xqMU5rMEHqngqfY++hY9AvLY+LdOOHMAmsVkENTL6CECVft iqbbPjZhFTmrT5GswOWisZ1GyN7pSO+ShOwXEmC3ZpAzdkUROL6k+hM1vCHTV4rykWjJ h0xg== 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=tIAtKMJ3mgFCYNtL9XOCiC3RsH4n9vPTfwEKQu2Ml1g=; b=MDNUx7qnWmr9QreXzbxp4S/jBBtbovmqoIG15ApwKx3pUZQnirBXME3CMiGqwE3oJP SjflM+B4Y9NnhLQlxjHSXR4No88RIFOvKcjT7L0Pit226wa3bV3HzFx6PXgGSESkc1fu QNMe/LpZeHH1VOU1DotRttqEBZHqwvJksaIt0/MfkF6d2Jnm5IAzkkESafzAW89vvllZ w/dx1Ldhv9VfZolmiXv1sXY/SpVewe0vLLBNqMEOjfaH2uUCXTvnkQHJv65c4PZMHf7+ P0MeGZ95i6WFJZs+juSLdvdLWJg1Lce175Namm5X6zmngu8OYsVmdXvyF9BRCBPjYEcz b/lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KgaO6jA5; 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 e8si4768572wrc.177.2018.03.11.18.24.31; Sun, 11 Mar 2018 18:24:31 -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 header.s=20161025 header.b=KgaO6jA5; 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 05A6C68A3DD; Mon, 12 Mar 2018 03:24:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E485268A1DE for ; Mon, 12 Mar 2018 03:24:12 +0200 (EET) Received: by mail-pg0-f43.google.com with SMTP id g12so5867322pgs.0 for ; Sun, 11 Mar 2018 18:24:23 -0700 (PDT) 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=HNnXBwVtDnaR1XVo0YR+tUGtGKw4It4Vj5jx+W5Mf6k=; b=KgaO6jA5TxO9SuY6MuwzhhAcO/HefPHX/PXlb5yTTCmAjVrs4NRCFKZ3+BbgpmO+rn amcO+6uE7+f/cA+GI8OBmfDIfpJ0IoiHZvsgHecriIrrnDPGHJfoi5KCI3nBYbG08bVA bILuM7pP28tj5KALkGlcRZaYoMpUGvRe2jKDKCBmsUPmF7ejN8/WvpwZPn9W7mUzNI3u czXwJ8NN+zOj17+qQ7nogE1e/TmO4CvBMNX9z3lKCapKMP4kApIvigHhzt8jU+xqxwmF VyL7bsNuMxb68slKlkudcuo21DockRIqUlGk2LTokoXJ3oW+4TrAFp9j/k6oTsy/vs+9 MetQ== 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=HNnXBwVtDnaR1XVo0YR+tUGtGKw4It4Vj5jx+W5Mf6k=; b=Iq3v6zJYAOLsvZLzdlcO00q1b6Yb3LDzqptu1r9Oi4Wf/mlTbQkmOm7qnlJN+cUvYT hjTPSTa7xVnCD1jFk0SkmjGSmePGGXUeuf6gyxO9GE+Szpq9X7sLUZIkGIz60J4gWcZA ohj2CeZQHpM3Dxi0mgR3wA/oX/0uQdhAPgfpY4oOAdotng0Lj4tR8Nz+u8dt0wY7b0FT yfXWHb09zNh29V3RAVSA3+HmlRrH1j6zMS2YnYT7GxdhywoRVawxSYn7WhnYAp9mmY4O Ylrj0CBjh4//nukmI06xvPgP71Rd2B1/W67/TowoIh1k5NHTi8sn2NTVboKStE0i7SYD SMJg== X-Gm-Message-State: AElRT7FWk+OcVHk/R0HFR0zgetvKWeXFR6UXxh5Jmcu0AavEjLa+DgoS F47ylm7fn/iZwlGUC0fH17M= X-Received: by 10.101.71.202 with SMTP id f10mr5100429pgs.91.1520817861942; Sun, 11 Mar 2018 18:24:21 -0700 (PDT) Received: from [10.67.68.25] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id 2sm13954167pfo.70.2018.03.11.18.24.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 18:24:21 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer , Mark Thompson From: Jun Zhao Message-ID: Date: Mon, 12 Mar 2018 09:24:18 +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 V2 06/11] 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 914eb177fc86418f584a8472d83c8017a4531458 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 14:28:13 +0800 Subject: [PATCH V2 06/11] 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 } };