From patchwork Mon Mar 12 01:24:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7933 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1070856jad; Sun, 11 Mar 2018 18:24:17 -0700 (PDT) X-Google-Smtp-Source: AG47ELuKgMs2O2QxilT5j3tq0rEfQIfkx6VTDSip1SDDHjoQBOWkACQCTjPxQ/tVbumHvCpA3jcK X-Received: by 10.223.195.116 with SMTP id e49mr2677311wrg.5.1520817857033; Sun, 11 Mar 2018 18:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520817857; cv=none; d=google.com; s=arc-20160816; b=cSbL0XIx9LPu3o6oooSYB7ljw3b+zyRCGb0BHQIA4Y8nblbQ3OhD6EBIROEA4+UiXQ EYDXR4xiu+JMBJOw+hNnXooC6wuo0qCZ3yX4p63w453bpVuabeBhDU93uBmOVHrSae+a YNGkMfW0MOo7Ld79+7ygKHfSTNHvzRXX7Nx0F8tM5iK2Ml6xTu48ciTN73HtrfyleQ3u PjrXgy/TCHPv3h1/X9j6JL6haHQi9oNO2qz/mMIxy658AOpKe1u4F9boFY/H14wPPWgm JIvGTKv3rPbaLokvFe8mlrjZJ/1zFwznaQBD1DtlLG/yVeMP3OqeByiDHsrl6eBBpCOn Y4pw== 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=o3k08qkvKDaUsqK/qqFrUtPczI8bkZyf2jbGo3xBngQ=; b=DzWlY96CtlANcxXiu7Sx9SEA1tedoNLWTtyvA5QfBRTDFMoGCTdf8mPpp0+YXSQptM JMS+7iO3vDO6qJtElplj5U3/BY/VCnSo+ABEet6gC1eJLGhcoo4ZHAD6mnIe03yX62ZP jXfy2GaEuKDsYJEOi2q9utV749AaEmCDaeZSAE+izdIbsjj/8QrBejpSU2oHm+js472r QtbWqHl/eaFtP5Sz7PBmAxo0eXfmRg55BAYcpmRUDOY+XZQgS0Sf/IbAWIW1ZI9MfrEo j0f/iwTZZ9Ka1LKkDDFrgJZcgY2qTZtpWE+9NSM+aChFJEg37bgz6HvtanmznkjE/FKe eYzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nUUmFgYm; 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 b28si2541711wmi.175.2018.03.11.18.24.16; Sun, 11 Mar 2018 18:24:17 -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=nUUmFgYm; 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 677A268A3CE; Mon, 12 Mar 2018 03:24:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28BA8689A03 for ; Mon, 12 Mar 2018 03:23:59 +0200 (EET) Received: by mail-pf0-f171.google.com with SMTP id h11so3668774pfn.4 for ; Sun, 11 Mar 2018 18:24:09 -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=+v7QCF1vlbjFIbHzuPp7jjwaiWdTIe/dXt1AkJWIa3s=; b=nUUmFgYmyIu1Fm41PvH6KHK+04GZHxXhXlCmUnSIMFhuixBSl+xBBl+v20oVyuu++w geteBkbx3BtVNYumzRSYZqVvVriXZMoh2eQpDLSoOZgZV/n4jC+6Fkdk9ethBm1ZN6gc FCQ4fY4MKUmlsIH5pc64ygNH6bMIoSSxgNc3oNIvsr/Jt96B+GM66Yztvwu3zAXMuUEk Lw8Yr9jYWU5Q3O4l2eWBI+IuhwStQe02+HTFgNki6Yclk+0IvqeWI5A7ITl2JIoBBINO rPOHSgo/gvuvryZ4OJ1Cu+piym7qu61O3M8nf0QxOhJKW9FA/b+b8YO/W8ob0Vvf9WkT 0KHw== 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=+v7QCF1vlbjFIbHzuPp7jjwaiWdTIe/dXt1AkJWIa3s=; b=JS+Yn2okNkrrvtyW0tAqxl5yFnrdKHmyQcQTEeepzkWA7nn+7j1ehAyJgYtAej+Rur 4GDI3h623IxVPmk33CEwPHHI1g83D1VhpgWDKVURlPNWfczViYM08gjwj23dDd2OWHw7 An2aoZ3EDssG4E/YP6jwv+JiNCrb2uGN40AucRk8ujaTWn8/QTi5mfs1WvLQalZVQ/2S ny8SWOdNLNVWVaUjq7k7tM0+h7nK8blvnKsRXPn71u4K32v8ABEsKLXb0YWrB/ZhJYHk lw8DIN4eFlVeR5AzbZ0Y80Dh9LSBbbx4EdgKwpVaDhaBE3iGXvqxqDvYFLR3FPwYbNiD qPQQ== X-Gm-Message-State: AElRT7Fp7pBV7B2V58mp2xOMIPDlSGk9ItplXq/SAX9yzcxHcSeCO1vo z2ofq9PkT2j+hrgWrPMRHYGoOvD3 X-Received: by 10.98.147.156 with SMTP id r28mr6284726pfk.204.1520817848187; Sun, 11 Mar 2018 18:24:08 -0700 (PDT) Received: from [10.67.68.25] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id q87sm14084985pfa.29.2018.03.11.18.24.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 18:24:07 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer , Mark Thompson From: Jun Zhao Message-ID: Date: Mon, 12 Mar 2018 09:24:05 +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 05/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 70221e1330749ea09b2bfbe682326f4bad913c55 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 8 Mar 2018 14:22:25 +0800 Subject: [PATCH V2 05/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 } };