From patchwork Wed Mar 14 05:42:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7970 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1605220jad; Tue, 13 Mar 2018 22:42:29 -0700 (PDT) X-Google-Smtp-Source: AG47ELvAnQceQAdWeUu5l2EFt7iJTlr8rvDEmI5NL69BU4Cbr4UiXLG2G8tqnroOA/HASqbTR6cS X-Received: by 10.223.133.214 with SMTP id 22mr2688167wru.130.1521006149066; Tue, 13 Mar 2018 22:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521006149; cv=none; d=google.com; s=arc-20160816; b=v8YPu3deKoNSLsVOoNe4DN5v0Cb7RvWEEntr0eZhAE8Y/QaMN5GhN5hlIgAFk1OvI+ rWJE/K9ETgdSv/W8BtuxT9NdFs1iSSBVYzW+XBd+EGblutPwzk5hCDyIrHTQBF72LgXQ YMPt/BwQeXNKp9hEYryqFtKBsqDmMSxI+GPrUKPCTUt84k8VDZdrBo1Wyr2M/LTzFnY9 ZdKmh6fUTBM+yHwyaocjucCBn049olKvnizYNzZGCjtjDwf2lx38NJqTCYQ6jM39DOcA 5hved/KnnLdzNLukiFbp6zTW+iXTizPkxxHgHRJ7eJx5uaxjXBFubvpDZUDHqqpY2cR7 YKww== 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=zBL7YgrGeoCA5+fHbez4b3kusswKV4rs+AQo4/5AKo4=; b=gEmje5Pfi2ux+TFOs6IbuvmGASk339cuwKSxh0iiCf3sDwSumwIf6MBVedG7rR+qgf wL9reeSMLe1EGqIRCghT1vtb7qFbx8QOhuinT3P3+pYYPIO5rFTQRR5OiIl/o2mVAo3Y dYw1/YOUY+H1yNZe31K8dBd9eCUtIOf97n0P72bzPt+U++73VuWoD1m1JiZkjNFJIsGj cWz62KfDQkAirgLu6JiCAhFRqoyBXAfGBtQh2TKhdNMLDVPfviOKkBmqSAkaOmBnLBDR Ayo3q0R29ItqmkSl/3fBRDJUo91N6IEhteh58yCF1Rizc0vv+5dvKJmsCLkAylo4gykV vDwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YD4n+cOG; 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 c20si394550wmc.272.2018.03.13.22.42.28; Tue, 13 Mar 2018 22:42:29 -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=YD4n+cOG; 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 0B23268A0B4; Wed, 14 Mar 2018 07:42:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ACEB68A088 for ; Wed, 14 Mar 2018 07:42:11 +0200 (EET) Received: by mail-pf0-f175.google.com with SMTP id y186so970236pfb.2 for ; Tue, 13 Mar 2018 22:42: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=EfZonKZ2q0t5L9QOaObuABAuZ6hNzUN3B5KexdXJXks=; b=YD4n+cOGCdgtNeKJOR8xOVbT85IeubWZodMA0yISKZD6aKUlHVaWQ5io8tfozIUNbg zYLi3Lf+DXcshuLS7km7YjT0GcUgR7/TmubMbHnW2uCTR6r4E3PelOdp9dz07Vc6oNvb teizYQpD225SFvIR9vAm2QlQENoWz5INS/yerg2jI38yLBT9jsNwiFKJymq5Aoq3RUIK N5zpn/f9nXCLtBsAjnAGCJLfJXVD5P6YpXPTf3tv5yvIT6olgj2LtqfN10FpSAJlmJzF 7HnzPQ6hQOpkLQDKynVulY/GC8vfi2oYGrUJxJOpgVNJK41MvFRvG31uqIimrkUaE5FU LuPw== 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=EfZonKZ2q0t5L9QOaObuABAuZ6hNzUN3B5KexdXJXks=; b=cVbatPHjiNHz4XY9HFsQYqGPtgOcxVyOgf6Gm9yR2+pW680rtW5694WPm7PrvoNEBs nX1LNv796OIqWdVe2cWtnufKeblesVGNdMtHHVnx1CB6iGJ1JITIxbOEYdRBEJDNcolK PeghX5NlvV3cksX/e4tHxqUYH1vLbB4tnhDGjdzji3jIvZECAnwEoSWhkRaPTGBfEWto oIVupnTaK9r3aSZ/r/InI+MgNK+enKTE7vWBeLXBQOtLZLpcwJRXY2QNPOcIxLeKw2UE ydIsB+IRsu7rUUeypVXi9w+oQqXt24n2DLLcKakTBsJ/Wu5Bk+mhD6SOxIoCljRxA2FG IFTA== X-Gm-Message-State: AElRT7Gq1xvTGKsL352IA/hLv8Z96xFLZBXDjPo6CbLgtJgSzyht69ux VK5DK4Gc2GHDBpWfQiz83HONUHc7 X-Received: by 10.99.126.24 with SMTP id z24mr2674005pgc.110.1521006141982; Tue, 13 Mar 2018 22:42:21 -0700 (PDT) Received: from [10.67.68.21] ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id p6sm3090229pfg.183.2018.03.13.22.42.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 22:42:21 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer , Mark Thompson From: Jun Zhao Message-ID: Date: Wed, 14 Mar 2018 13:42:19 +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 V3 06/11] lavc/h264_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 4db1a0f7cccabe1f74991ba160b8f8506bb5f865 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 14:22:25 +0800 Subject: [PATCH V3 06/11] lavc/h264_metadata_bsf: support dump options. support dump bit stream filter options Signed-off-by: Jun Zhao --- libavcodec/h264_metadata_bsf.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index 466823cda6..12e739a354 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -451,63 +451,64 @@ static void h264_metadata_close(AVBSFContext *bsf) } #define OFFSET(x) offsetof(H264MetadataContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) static const AVOption h264_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 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 }, { "fixed_frame_rate_flag", "Set VUI fixed frame rate flag", OFFSET(fixed_frame_rate_flag), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, 1 }, + { .i64 = -1 }, -1, 1, FLAGS }, { "crop_left", "Set left border crop offset", OFFSET(crop_left), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, H264_MAX_WIDTH }, + { .i64 = -1 }, -1, H264_MAX_WIDTH, FLAGS }, { "crop_right", "Set right border crop offset", OFFSET(crop_right), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, H264_MAX_WIDTH }, + { .i64 = -1 }, -1, H264_MAX_WIDTH, FLAGS }, { "crop_top", "Set top border crop offset", OFFSET(crop_top), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, H264_MAX_HEIGHT }, + { .i64 = -1 }, -1, H264_MAX_HEIGHT, FLAGS }, { "crop_bottom", "Set bottom border crop offset", OFFSET(crop_bottom), AV_OPT_TYPE_INT, - { .i64 = -1 }, -1, H264_MAX_HEIGHT }, + { .i64 = -1 }, -1, H264_MAX_HEIGHT, FLAGS }, { "sei_user_data", "Insert SEI user data (UUID+string)", - OFFSET(sei_user_data), AV_OPT_TYPE_STRING, { .str = NULL } }, + OFFSET(sei_user_data), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, { "delete_filler", "Delete all filler (both NAL and SEI)", - OFFSET(delete_filler), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1 }, + OFFSET(delete_filler), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1 , FLAGS}, { NULL } };