From patchwork Sat Feb 10 23:09:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp1755060pzc; Sat, 10 Feb 2024 15:09:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IFw8rjd0iyiUEMMzx5H0nd88nKobtlxqVjt948Jt84nSWZboCO6Q+4QLQZu/Coyy1luo/YL X-Received: by 2002:a05:6512:3494:b0:511:29ee:83b8 with SMTP id v20-20020a056512349400b0051129ee83b8mr1704506lfr.62.1707606567695; Sat, 10 Feb 2024 15:09:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707606567; cv=none; d=google.com; s=arc-20160816; b=CsR2uyj9i/2dNXmHCFpnKPwtdqYaR5Jw6Qha71UcAag4ww5sqv+B9EO1s52C+0jVyI Sdt9tb5gME8IS0lZYzlctwb6F4/nyg3k2IVTynfM8o1lB1wepvS6kTu3f4yyFVFQQx3E h84qT5D2NHvp494HEReWns/fhLetJcAzVHvydEeCblpbWOyYVnNG16eDR9yQ4qJtbpog MKVtcFb633WWm6+cljbbh/kO03eaDdcG3zLlSxvz24+Veg7kcLkveIGXstaCytMrjVMG Dgl+trv25OxHJB9/ZFYqQxrqcW+qxh2pQtzs8l/dlmPthsVM+yog6l7btfNzWiftlOoB sDIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=9nXOPHsl1gMXHvTxFjh4Zrgzk2iMRalP7kSWhqeXRhQ=; fh=hHISfDuI+RmD8u8fO8KKn1o+4wiRPoxvw9bqRc5so70=; b=TAGqb/SRSKN+mPqM/4KvHrs6qXxOh6izAKJCh3ODQchVNNNfTyqlQghXrauU9oozOG Goo1+vAyt20BPSzuadeX0o5Q8Z8LztI9tsNAMERjp50JPFSLRzN852c6Mb8vaAfbOAi4 l5etOA3Rg/jgCnZ74EmMV8EjcnHkgwtMwEGsHt6CUm6k19xYokeiIodolHQnsygW3Hnl nPjGEBmNrsjxcc964QX6Aoqw/IKqclT1MaJ2O1eEFQa687JxIebG6g8llh4380SPvlhz 6Zy02QNYaWMQuNw8kxWZl5SJC0byi3xixumpVdoZYWsCvfXjkjwph5f4Oj4G7z7+okEg bBlg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=SYnY+3Zi; 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 X-Forwarded-Encrypted: i=1; AJvYcCV+TommWj/2+vUBVP0tYpTQTaKNT3CFxQByVgvzkdloqiXC2j77QToOXrnEEraGl2kYZmhkR8FNI68kL4D5m4Cqu3V/t47ccREIFmFp62RjXItS9vCiCQzcDjQ7pK3BOsGb4JHtGG9tZ9M9LJTYVhnErahSMJk8FGfhpS4W0Ii3TQsXtei6M+hfhu369v0nPBq59a7Ma7LmNsgDAZS/rHQRGBBWjF98EjbCE9Hlt7UAlrbTKasRk7KOe65QtpFkQrnbxqm7/F26pPSdWQb+j+asM+M7rczcy0wHOLBUV13CwO3X+kG6f+Sbapk+amPfhjiWDBCwLsN8yCKVs45N7Kpx6k+iiTd74nFaMxH2QeKRCTyetssDXfOEEAszfAnYFvkOVaaLJN/PMEd1H6N2kEZNO6ls6lrlbJkruvIxOXc3Cni/J9QYoogNdQRpDZWFDdfjGK7qu4AssCzO4w5uv7TJN1ttWeOcpCw2QoIAI4fkeKPpBl/F/CPLwhzfImS9nMqBLGoOLedYI1w9b62wYB2l9vY8DLHIpHNRRGVc7DzE63xN2pDDCwTymN6Wf7ESxdyAUjQ2WIPpvBWoRU95YkDaiBlQr+Hga+y1Q170cVi9cnuPwIRyWdm6bXY0cDxf/LKYhMw2Kk6zQqLgnRoSGxo5hr96fNoYYxFP/jdEY22kvY1okYRSh4syvlE4cJz8a71BRI2iTWiTrq9HMWfCIDakaVahiwzEtuNA5FHN4rg+s7dcXwc2ymVpnJ7VVIqXPIn2wfx8ReMc9HqpP8T1qroRKqlqYLD9FZSUqiQ2eYzZ5oToPLyk5Xb3kW6DmM5Yy5GaXvRDU40O7iiHgzGzmGTbMddUG3jZu9FDtV9Oeq62/f9jn5ufyghUXk0ebYbWtk5UDm6UWh9+Aj1zSqPxW4qt8wmfs52jGT+uiVS7l2GPCK5gxRzCs8mNeU/YUG3lVzhrg+ UTUQuIU9SzcGCrT7BUpQOdsxzwBYf4QTGxxljE/MCRAdt/rnOUkdFxphBuRnpf1Hc44a1+qLtwVLbknv2EmrEgaOoyZOyuFY+wOsWU+tMWpNJOBwOeqfjLoM6mXFmiw0TCHzy5SHjn1hMn7L3HgeRoNopddKiIfk7KpBVmPXyB69EaS0sdjmySKr3E0q0ogTGJhTupUZix2m8tXo9zN9PsI7yjQgKV71lMyKRKc4wJeWKzcEg6dcBLV7TOThIYMRQ+EGc0zFXof5FNjhDXrk7laUB63KPJ0Mq67wJlIfk8xVjNyfomSvbxFSU5jbZWjN3CWUuap3AfRU2zN6Zt9bIS+ovf2oKJ8rs/55ryIXeFdzeM+ZC04F/ChKe/VpXnSjN1DNS1zUc8iUVVh+KsuC8puABGh00UZMG7+Pv9Wmcvv6bVNOy8F4rwGdMFt+x4bzu37FlPrH/bYrRWIc5KANUCGAYBRI36e1QHd2rud4R7/WYEAnG8caSj4YW0rTywTHZI8Ds3Ew1CPJRtaiDv99Y/VHXBC0VDtLQ7kIW45WaVelrPej9HLQo9Qez/NHVqVYzFsUVtYq5xCzMVd2tN82Xi3IprRAT4OVPIte0TkxMupu7MEnQ5P8UwVOKBqdSd Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z5-20020a17090655c500b00a3c534ca631si488962ejp.59.2024.02.10.15.09.27; Sat, 10 Feb 2024 15:09:27 -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=20230601 header.b=SYnY+3Zi; 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 40DAB68C9F8; Sun, 11 Feb 2024 01:09:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3B9A68CC5B for ; Sun, 11 Feb 2024 01:09:17 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d751bc0c15so19559545ad.2 for ; Sat, 10 Feb 2024 15:09:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707606555; x=1708211355; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=t5gyn4xSxBbe0eBPJsG+ClKcH9tmuH02UFQqbuB2qjE=; b=SYnY+3ZiDS/IJ7FsYLq8eRvk8Lxhg8OG7HtBKH+IJJGUBTIojQvoFjMrF5dnn4Sx1h E3l22eYnADfSzJgG3RPRvNB9Goqt2jh6AE+hCxEuVCLw4c5YCgTQJ4GBNEUQZfDA9B2b pWw2KXGoVon94pv57+ZWm30LHJfGBoaVXQ8zmYj5bAHeI068pLvawigUGI6+PuVDMAkJ +95JMvXDn7IisAMXwyOGwmKUQE78xpEuG8dmZZLfuNEKflPp/WVvr3Gr00PIG6UuPT/0 ZY+V3RQS7qAIG/IG6nsu6W6D0Ive8x99S8/+7s9MYw6ti6rJjtpxw01wNZdiz5vtPL3p hZtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707606555; x=1708211355; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t5gyn4xSxBbe0eBPJsG+ClKcH9tmuH02UFQqbuB2qjE=; b=wLCB2LtrFC/738wjixDF1bTRHM2heW+Oav+mGT5KBawWrSGlFDcXXQRt64gRcAC/FD eP+IiY/Eqw9MU+pHLgi2bo6i4f/ht2QO1l7u8n06XWmWyu2sJVXqD9Yli2SO3W7X2SL5 uhNBBDlnwIJJVn+MgSi2xMsISyHW5wLq05ApUHpyKijNnb4f1oniNewe7Ro10bwPjzPA G3zIK0ETgJrq2Djsaru1RK6gk4PJdksZ7H+dumvUw24OfFoAUOKqkqZPVbpxsopl3viG laSUtj8PNyyL9fgc+1kmdp8CB5C8RIrC9WIiHxxk7CBnZWO3nrJxMlttzLcR3d+vKqpr TF4g== X-Gm-Message-State: AOJu0YzxjzVfHPk73xow7r1MEgFqNmp0zwgiiSDNoy6cMg5FwI5Tjfpc sVS/5j4EJsesPcToW2fdy+FtHFdwYri4aNghp7+my8j6RARwmeq7sj6HU8Rl X-Received: by 2002:a17:902:748c:b0:1d9:d300:a69d with SMTP id h12-20020a170902748c00b001d9d300a69dmr2846653pll.11.1707606554751; Sat, 10 Feb 2024 15:09:14 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id d13-20020a170902ef0d00b001d6ff1795aesm3521339plx.8.2024.02.10.15.09.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Feb 2024 15:09:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Feb 2024 20:09:02 -0300 Message-ID: <20240210230903.64206-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat: add a disposition field to AVStreamGroup X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 9TTgQkFmtOUS The existing (and upcoming) available group types are meant to combine several streams for presentation, with the result being treated as if it was a stream itself. For example, a file could export two stream groups of the same type with one of them as the "default". Signed-off-by: James Almer --- libavformat/avformat.h | 8 +++++ libavformat/dump.c | 77 ++++++++++++++++++++++-------------------- libavformat/options.c | 45 ++++++++++++------------ 3 files changed, 73 insertions(+), 57 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5d0fe82250..931c274879 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1093,6 +1093,14 @@ typedef struct AVStreamGroup { * Freed by libavformat in avformat_free_context(). */ AVStream **streams; + + /** + * Stream group disposition - a combination of AV_DISPOSITION_* flags. + * - demuxing: set by libavformat when creating the group or in + * avformat_find_stream_info(). + * - muxing: may be set by the caller before avformat_write_header(). + */ + int disposition; } AVStreamGroup; struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); diff --git a/libavformat/dump.c b/libavformat/dump.c index 9d37179bb7..c72d7840c1 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -538,6 +538,46 @@ static void dump_sidedata(void *ctx, const AVStream *st, const char *indent, } } +static void dump_disposition(int disposition, int log_level) +{ + if (disposition & AV_DISPOSITION_DEFAULT) + av_log(NULL, log_level, " (default)"); + if (disposition & AV_DISPOSITION_DUB) + av_log(NULL, log_level, " (dub)"); + if (disposition & AV_DISPOSITION_ORIGINAL) + av_log(NULL, log_level, " (original)"); + if (disposition & AV_DISPOSITION_COMMENT) + av_log(NULL, log_level, " (comment)"); + if (disposition & AV_DISPOSITION_LYRICS) + av_log(NULL, log_level, " (lyrics)"); + if (disposition & AV_DISPOSITION_KARAOKE) + av_log(NULL, log_level, " (karaoke)"); + if (disposition & AV_DISPOSITION_FORCED) + av_log(NULL, log_level, " (forced)"); + if (disposition & AV_DISPOSITION_HEARING_IMPAIRED) + av_log(NULL, log_level, " (hearing impaired)"); + if (disposition & AV_DISPOSITION_VISUAL_IMPAIRED) + av_log(NULL, log_level, " (visual impaired)"); + if (disposition & AV_DISPOSITION_CLEAN_EFFECTS) + av_log(NULL, log_level, " (clean effects)"); + if (disposition & AV_DISPOSITION_ATTACHED_PIC) + av_log(NULL, log_level, " (attached pic)"); + if (disposition & AV_DISPOSITION_TIMED_THUMBNAILS) + av_log(NULL, log_level, " (timed thumbnails)"); + if (disposition & AV_DISPOSITION_CAPTIONS) + av_log(NULL, log_level, " (captions)"); + if (disposition & AV_DISPOSITION_DESCRIPTIONS) + av_log(NULL, log_level, " (descriptions)"); + if (disposition & AV_DISPOSITION_METADATA) + av_log(NULL, log_level, " (metadata)"); + if (disposition & AV_DISPOSITION_DEPENDENT) + av_log(NULL, log_level, " (dependent)"); + if (disposition & AV_DISPOSITION_STILL_IMAGE) + av_log(NULL, log_level, " (still image)"); + if (disposition & AV_DISPOSITION_NON_DIEGETIC) + av_log(NULL, log_level, " (non-diegetic)"); +} + /* "user interface" functions */ static void dump_stream_format(const AVFormatContext *ic, int i, int group_index, int index, int is_output, @@ -620,42 +660,7 @@ static void dump_stream_format(const AVFormatContext *ic, int i, print_fps(1 / av_q2d(st->time_base), "tbn", log_level); } - if (st->disposition & AV_DISPOSITION_DEFAULT) - av_log(NULL, log_level, " (default)"); - if (st->disposition & AV_DISPOSITION_DUB) - av_log(NULL, log_level, " (dub)"); - if (st->disposition & AV_DISPOSITION_ORIGINAL) - av_log(NULL, log_level, " (original)"); - if (st->disposition & AV_DISPOSITION_COMMENT) - av_log(NULL, log_level, " (comment)"); - if (st->disposition & AV_DISPOSITION_LYRICS) - av_log(NULL, log_level, " (lyrics)"); - if (st->disposition & AV_DISPOSITION_KARAOKE) - av_log(NULL, log_level, " (karaoke)"); - if (st->disposition & AV_DISPOSITION_FORCED) - av_log(NULL, log_level, " (forced)"); - if (st->disposition & AV_DISPOSITION_HEARING_IMPAIRED) - av_log(NULL, log_level, " (hearing impaired)"); - if (st->disposition & AV_DISPOSITION_VISUAL_IMPAIRED) - av_log(NULL, log_level, " (visual impaired)"); - if (st->disposition & AV_DISPOSITION_CLEAN_EFFECTS) - av_log(NULL, log_level, " (clean effects)"); - if (st->disposition & AV_DISPOSITION_ATTACHED_PIC) - av_log(NULL, log_level, " (attached pic)"); - if (st->disposition & AV_DISPOSITION_TIMED_THUMBNAILS) - av_log(NULL, log_level, " (timed thumbnails)"); - if (st->disposition & AV_DISPOSITION_CAPTIONS) - av_log(NULL, log_level, " (captions)"); - if (st->disposition & AV_DISPOSITION_DESCRIPTIONS) - av_log(NULL, log_level, " (descriptions)"); - if (st->disposition & AV_DISPOSITION_METADATA) - av_log(NULL, log_level, " (metadata)"); - if (st->disposition & AV_DISPOSITION_DEPENDENT) - av_log(NULL, log_level, " (dependent)"); - if (st->disposition & AV_DISPOSITION_STILL_IMAGE) - av_log(NULL, log_level, " (still image)"); - if (st->disposition & AV_DISPOSITION_NON_DIEGETIC) - av_log(NULL, log_level, " (non-diegetic)"); + dump_disposition(st->disposition, log_level); av_log(NULL, log_level, "\n"); dump_metadata(NULL, st->metadata, extra_indent, log_level); diff --git a/libavformat/options.c b/libavformat/options.c index 03e6a2a7ff..f54a3c97b5 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -208,28 +208,30 @@ const AVClass *avformat_get_class(void) return &av_format_context_class; } -static const AVOption stream_options[] = { - { "disposition", NULL, offsetof(AVStream, disposition), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, - .flags = AV_OPT_FLAG_ENCODING_PARAM, .unit = "disposition" }, - { "default", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DEFAULT }, .unit = "disposition" }, - { "dub", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DUB }, .unit = "disposition" }, - { "original", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_ORIGINAL }, .unit = "disposition" }, - { "comment", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_COMMENT }, .unit = "disposition" }, - { "lyrics", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_LYRICS }, .unit = "disposition" }, - { "karaoke", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_KARAOKE }, .unit = "disposition" }, - { "forced", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_FORCED }, .unit = "disposition" }, - { "hearing_impaired", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_HEARING_IMPAIRED }, .unit = "disposition" }, - { "visual_impaired", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_VISUAL_IMPAIRED }, .unit = "disposition" }, - { "clean_effects", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CLEAN_EFFECTS }, .unit = "disposition" }, - { "attached_pic", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_ATTACHED_PIC }, .unit = "disposition" }, - { "timed_thumbnails", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_TIMED_THUMBNAILS }, .unit = "disposition" }, - { "non_diegetic", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_NON_DIEGETIC }, .unit = "disposition" }, - { "captions", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CAPTIONS }, .unit = "disposition" }, - { "descriptions", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DESCRIPTIONS }, .unit = "disposition" }, - { "metadata", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_METADATA }, .unit = "disposition" }, - { "dependent", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DEPENDENT }, .unit = "disposition" }, - { "still_image", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_STILL_IMAGE }, .unit = "disposition" }, +#define DISPOSITION_OPT(ctx) \ + { "disposition", NULL, offsetof(ctx, disposition), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, \ + .flags = AV_OPT_FLAG_ENCODING_PARAM, .unit = "disposition" }, \ + { "default", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DEFAULT }, .unit = "disposition" }, \ + { "dub", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DUB }, .unit = "disposition" }, \ + { "original", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_ORIGINAL }, .unit = "disposition" }, \ + { "comment", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_COMMENT }, .unit = "disposition" }, \ + { "lyrics", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_LYRICS }, .unit = "disposition" }, \ + { "karaoke", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_KARAOKE }, .unit = "disposition" }, \ + { "forced", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_FORCED }, .unit = "disposition" }, \ + { "hearing_impaired", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_HEARING_IMPAIRED }, .unit = "disposition" }, \ + { "visual_impaired", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_VISUAL_IMPAIRED }, .unit = "disposition" }, \ + { "clean_effects", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CLEAN_EFFECTS }, .unit = "disposition" }, \ + { "attached_pic", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_ATTACHED_PIC }, .unit = "disposition" }, \ + { "timed_thumbnails", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_TIMED_THUMBNAILS }, .unit = "disposition" }, \ + { "non_diegetic", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_NON_DIEGETIC }, .unit = "disposition" }, \ + { "captions", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CAPTIONS }, .unit = "disposition" }, \ + { "descriptions", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DESCRIPTIONS }, .unit = "disposition" }, \ + { "metadata", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_METADATA }, .unit = "disposition" }, \ + { "dependent", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DEPENDENT }, .unit = "disposition" }, \ + { "still_image", .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_STILL_IMAGE }, .unit = "disposition" } +static const AVOption stream_options[] = { + DISPOSITION_OPT(AVStream), { "discard", NULL, offsetof(AVStream, discard), AV_OPT_TYPE_INT, { .i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, .flags = AV_OPT_FLAG_DECODING_PARAM, .unit = "avdiscard" }, { "none", .type = AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONE }, .unit = "avdiscard" }, @@ -380,6 +382,7 @@ static const AVClass *stream_group_child_iterate(void **opaque) } static const AVOption stream_group_options[] = { + DISPOSITION_OPT(AVStreamGroup), {"id", "Set group id", offsetof(AVStreamGroup, id), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { NULL } };