From patchwork Thu Mar 8 08:43:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7866 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp545193jaj; Thu, 8 Mar 2018 00:43:47 -0800 (PST) X-Google-Smtp-Source: AG47ELty9aOPTspBXqhlbmqgPtuw7mC5Dr6gbzce4SB6J5h0bT3gM2zha3hY8Ow1uoiSV7vXn7uf X-Received: by 10.28.139.142 with SMTP id n136mr15843318wmd.101.1520498627912; Thu, 08 Mar 2018 00:43:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520498627; cv=none; d=google.com; s=arc-20160816; b=TjCx0RgJ8BA95wJIiSFKyWM9oHa4TPuei00BcsHf0VGIcgGh50iqfX7ZIEH5Sz9f7v FETuiVtEVobjzkCmfU1jTwDtqKtm2PZhAGVMDjzDf5hGq0tAIhbaZ/LVsAyJtRS20lEf h8PE/UfAaBjZ1vbWzPzTzzATybAUAkgkSIOQeYRkXRUDAnZvpwzi27FOAMzeRMpqYKgW bRO39pwHOlyWgGqtcMr/9GfCqOdj6h62MzRp3u4RRNM1HU20MzAiOdfwQNgDMf6SbCrM lRQ5Ob6lxIfj2TD2M7ZqsrxYddIF3Yr9tf4vY7sgE6RSZ/MLmBSsnaF56Z/O0ikKhG80 X60w== 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=hONg86Q6fHGRzxtjATY/FOMQJ+Rc1pt2a0glFagoXCo=; b=1BW0y6rJKSQ+dKnPXazTG33Wh278M9mi69PihANgJY3qDvuxkc7wibQ0gHuhQMnNW/ sYwpszLLP2MUw0/SEtAAqkAeACsrywnMqDuCpHKnUJywryBtpFdkVDMIJQbmj9Lk1YLT 9vsIlJqzB2OFjtXYmYnXcjW5bxBG4KCFMN3TWRutl9oca92ZD3XtFQMlxxtFi1UpaTqx XKdx1/ZeBaB+YiD2fOMQ5BaMTN5uescsUfhZoW8qgbdTCCqr3UNGwMVAJ7EfWoOa/nFm pnbK9e+LOqTNkqTYjd6BcUrQsoXFm/PKtVZIREzX8OhmjP+yl9RomcqDpoAGv61LFlKO 6YeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PRi6z8Ze; 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 a124si4099225wmh.255.2018.03.08.00.43.47; Thu, 08 Mar 2018 00:43: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=PRi6z8Ze; 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 DC26A68A646; Thu, 8 Mar 2018 10:43:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f169.google.com (mail-pf0-f169.google.com [209.85.192.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ECB7689DD6 for ; Thu, 8 Mar 2018 10:43:30 +0200 (EET) Received: by mail-pf0-f169.google.com with SMTP id d26so2087925pfn.5 for ; Thu, 08 Mar 2018 00:43:39 -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=dnnajiWU8paC2cYl48TkxNlqnmaHTdfOJXPtNpBADhg=; b=PRi6z8ZeTIFVPa/TCUtobr4BRFHTgC4EMZl+BGVLcknKrwuuJiUVDMhPOnwZve7L8u ADjSbVAPz915XiBxr0GDj0L44Or18B7wa4014nHDeFpTI9U4KJZyt0fKRFz/ZYvKHsFy 6prrbbrpP73ZpZ0WX6zCkHOlDGH+eleWePcJtIkXZZO3LcwDJo3gzMVNnvpMzt+BfEDA AsfVbg8TZSiKjj9kqmInWPGCSP0XDFTUz2wKsphumlsoCWrxYUHnS/j2OvRpqDoZ5NqO cPxXLhM4u3lSggCHYBPp+L70G2nDQMU7yAyn3YVvKKTUeLOMuDGQ8YZ6DDnY1kdWmCh6 tSRQ== 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=dnnajiWU8paC2cYl48TkxNlqnmaHTdfOJXPtNpBADhg=; b=Z9nEqIbp7gM/NaHSjGvRT5xDQpWmSzPcb5B7mUcQiG6nYHrZcZsIqNfmQ2j47CfYIA 3+nF2bNIxzgp7L6g+lDfQMSLKjtji4a6448ZhBYoScXHpTP4EpvHawW+mcFZ+6OFyfV1 DG6FalxJ9LqrKZeezCP4Ku9Hr5+1n/cVbv+fIXuBhQyblXPbKRwOZke39F7NKDNMyUe0 6EacNnJ/smwmm0SdnmY9WDMWR4AgDKg9vAAK31vGRo7r2ROz2O6u1n5crut7FtRATOs2 Bhq5lO5umOFKqLB/cHbN/0TfLRzgglx2aAVvRxRjGKmD1Bfgr4MVrujfuk7xrJYk5GJT pjCw== X-Gm-Message-State: APf1xPBJqhTM5knExFlzneQA8v0P6AiFRexsiPYV+cs1msUqfySJSddJ ZZ9YUhkuRGpV4d/ztA8ZjYMVmbfk X-Received: by 10.99.163.80 with SMTP id v16mr20513118pgn.19.1520498617527; Thu, 08 Mar 2018 00:43:37 -0800 (PST) Received: from [10.67.68.27] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id n12sm31646226pgp.20.2018.03.08.00.43.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 00:43:36 -0800 (PST) To: FFmpeg development discussions and patches , Michael Niedermayer , Mark Thompson From: Jun Zhao Message-ID: <46be3adb-b69d-d10c-3fdc-d6ee41b1bd2c@gmail.com> Date: Thu, 8 Mar 2018 16:43:34 +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 05/10] 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 9748a9b27ef1b67505202ad8e33b5259c066781c Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 14:22:25 +0800 Subject: [PATCH 05/10] 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 } };