From patchwork Mon Feb 12 13:05:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp658578pzc; Mon, 12 Feb 2024 05:06:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/Z1Fjrg59OUexLNMbAU7/Puh0nG3qm+vj4/rj/6bOl8C+kC8xGYfX7epgJ0BlLuETVLtW X-Received: by 2002:a17:907:100a:b0:a3c:36be:2496 with SMTP id ox10-20020a170907100a00b00a3c36be2496mr4777287ejb.3.1707743175459; Mon, 12 Feb 2024 05:06:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707743175; cv=none; d=google.com; s=arc-20160816; b=twXnxuAasQ0SgcC+80o8MFD0K+J6Vu+5KN3F4d7tKh4Y1mNv87YtUq3e14Mf/9q1dh Hu1JYN/9Lb+rPuUDNDbf2anZA3LyFzt8uN+weRxqgTzDkuZp1o2HZPRkOBB7HVPf+S9h /JnxxVmJgUDaT8do0rISAwQb+cKZxAlVXt4e5/1ZkWTEgo/J2biL+lznRa/Lm/bDHVzb ob/6IANxpMM2mCHhZmN/GxFLl5YZFU1Q1TZud2oe4pDaqb4iM6VGYirS67uCUb8aUofo 924RzVF2qRj4CKyTc5hd7QElhLMXh8sWF6sboLxAKDTYljixI4RTiuAW2kwu2tCH791w dNWQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=GJsHVlkVNeQ9WJRWrwSASlPKlfwUU0zWkNlcR5pZbGc=; fh=LuRiuEbuuQQP0c6Hax/LliCDZWOj5CFmQRusxTFJ9Ao=; b=MvmtWYzz8VjAv4h3mPDqQORMZf8pthZ0H5RGGOOJvvHxIWuinqW9akEojNvDQgFR74 ZI1c1Thle6hOVPKK0AhDd7MBplFwzJ2RZdGbjrGEnyfUiPqA6b12yazLET1iiU3R2V27 4bEsBvbYd8QcUVNle0SyOyOfNB8MJ4O75oJoP0TrMMq75gNiLP2o07bwOTFZTqjbePd9 Ti6qA3h6r6Dzd9lExFKnDInogdP0cVeLSuArc6DJIN9h8kczR6lKTYWq7xImsYKhiSRd rh0wMONi2xxi7I0do8CosKSrM1empDm9rAi4k6+RSeQTAbLg3KJZl3FZE+V5JcVfA4dV yJiQ==; 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=ZPUPjEyS; 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; AJvYcCWIprQFGK0hRTAVNHAYZNO+uKYOT8PNh0o4A6Mb8XqRERPjuQER1SKpCsuzb+Zheh9dVf6v+DyBoXHqRBitAgA3p2Np99wPnuqCnxN0DZznGx8ufI5eU+0m/CYBqhZ8YaZ54q78q1m5bq0B/IiLzOT030okx+wbnthqqNJulQuD2IkDo3iN3Dx0WqoGXfj3bitiDEqUkn07109BSclTpzfy7IhUEPEmQptR0zJ6FIVn8eLXjd+/nTqxc9Odf1/zf7J5KPZuWCXdzmuujZB8oFdg4BmyVGv0lOL8JB7Hhpyp+oKZvguxAYxpMAe1IsJGQQjXhWqCwRrZsswkCXnacJZNv27phU1b5WD2SO/q2ETe9AMThxp9J6mFek7jbtq/CVcH2y8qGh+NECjoqXKuqHeCetAvdE82TEu7+V7XzteYaGuwRrJf1sbPR4RN48ZqkZEXaF6D9XLALqyvyk6qIZF99HvUe6ean6KhAVSGnGx+XmtFYp/mEqBDUQgtnoayv512Eil6Ps/MwtEa1Hi32xxU56w3gkjL0xdzx9NyJ37MHbM0anY9QRui9SENCb7I66LGZqcy1vLqt0dkUPec9zNuSEgK4D4n4fa0kcTMwnauvk+j+nsQti+PM+6+ZPS92xZP+gCn270BlkFDz5nmOMCXufpAwNMsGdTMM9+lD5mK2VGedu79gd2ezVXa/cITszpq+AZerqKcGwsFzh8RUvuJXupOc4y8XS3o/cL8njns6S8rlWJcxMKOsxBSXXTeQUuXyStgaZMcmVaNuUYCJjnSRolMjs2/HfpmZrEsqs6z9bEkXrS4/J8CiUaL8ooJ3oBzjB1K7J8gd+Bgtusz/ovygz3z6vPUvKRALMn74yQrh1PR4ahR9OOPoTBX3khHB8KFiECeFTJhfEyCjc6nEIdOGR63yuGrtD0n0R5mFsmOoUZe4Fh2GLtMTGePuSShemGjhF CoG4jF1tlYuYl0MYzYhUYL5XlHR652c7/gGP0Fj6Tc2dVcxK3xIIHVfOWcL8CBuRs8L0NMpDdk79JGlzIaOvjivTZ9A5LBPwvnaljIFPapjnQbqrewqrXmhgO8dBaEuiSIWn9T87qmfYApqmNBFr0ao2oncclDNFhGg7gPML6+Us8OTNZ9KG8gdhuX0MdLJPkaGfMomcIT8+dGNhyJBpbYH+NEwcVchpk0vtcCXjyEVSEFZCFVph3F4so54NUiLL1lAOJnsm3FEiuEXUXpWY+qfzQ7/s3i2U3fPvkoErLbqEkyZXu5e70cxl0uWaVFz1uBVNiG3ZiAPi3gONwAP8Yo77AxpGILkVhg/dEznjjnqTUqrbNEOPCGktsZ6a74OI2fQsTft6KyEzDB09XXAA8M/OSU6g+YIGKzVxpm9iR24vYIWcmp+50lrwceaTJeBub8wNDETB2U6287ICUZz4+pmJpq7hdljGDrybYiY2mjtxewSZRIx1bjG9xriKxM/qxPG/wLhS46qyK94k8yddH42zoJQr3aOZx7eGrJz/Is9B8GZMBnq4kY2Tnw7SFS5FTTi86tfR0ZWtx0cXjf59bTUazKe4eaQqpaR5ElftnXleMwn5bmqhezxm7X14c= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d5-20020a17090648c500b00a3599b5c353si177876ejt.260.2024.02.12.05.06.14; Mon, 12 Feb 2024 05:06:15 -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=ZPUPjEyS; 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 747F468D15C; Mon, 12 Feb 2024 15:06:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C040B68D115 for ; Mon, 12 Feb 2024 15:06:04 +0200 (EET) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6e0939748ecso2222347b3a.0 for ; Mon, 12 Feb 2024 05:06:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707743162; x=1708347962; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CotRuAwUW9ZnlUekFWe8IeCPw4eVI50LSEBHOAYROMA=; b=ZPUPjEySZrfejA7qH1CF3mSQ43eVyh5oHoTB7QxS3KUpcr5yC2g1Jz+FI4K1hZUeIo /loZDYKXFvAAg3R2BTAybix9/N5OZe25Tn3rUQ+QSbwbM8yTxC7+Hxj3BijO8CcrSZ4O FkuvddYWHJWq85FofUc4rlTnJSPy5AEPhQYoxboi4LjkmzPxbu8/PfCMXujSE9dtW4YL AVmo04Cr4NuUNBEhYRUVXhT5dLFYYOzraT5VqO+e1+TKNgKKT/tUyX+HUUK8BKG+ii0C bTvVvl4DRrbI/53lUZZfkJFINmp7ArYZt65qodvz+fH5TiROu84+HOGbr48K3k4zKqw0 W0nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707743162; x=1708347962; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CotRuAwUW9ZnlUekFWe8IeCPw4eVI50LSEBHOAYROMA=; b=TKqtUrm2QooGhqiSwom99baGdYAdrwidJCDeGxI+yyUtuGlRhYQvXTF0LAVx+DD2AI DvO54YFJjBGUYKJ00QKU5vIWkDwOAFWszvR5l2SJyXUvP/VSSqCsIPOkYQSS6w7V+7NB ZNk5gNuafsbjeA0sSMi3sbez8i3t3sUngqevCOOg8vP7Ti6+klhiaFyGMkofNQlPJh6K T37MXBZkWDZvsPBekp6NNnOut9CgxlKHHyCHCIbaopfPlD0V2lj+YayJ7cKXGcu/xtV4 kQYlIg959TLNwClnOyPVLroCDHrGGL08ZMhXcOlshWyNbd8wBcGX0JmfJCRsc+xWNA8n VQkA== X-Gm-Message-State: AOJu0YyI00bNO2InV00Mdv/9vUpSQysNuG+CC3gsVGCnnbKj7oeQD0Hd h41qiGMO0Q5goDsRESwQDOgZbkWS5vpiSiBW+Zta++ra3as2tekh38Et8RPd X-Received: by 2002:a05:6a20:26a4:b0:19e:bc93:c440 with SMTP id h36-20020a056a2026a400b0019ebc93c440mr5550674pze.55.1707743161541; Mon, 12 Feb 2024 05:06:01 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y18-20020a637d12000000b005dc36761ad1sm360238pgc.33.2024.02.12.05.05.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 05:06:00 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 10:05:35 -0300 Message-ID: <20240212130535.4528-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <170772904226.8914.6582842518089456166@lain.khirnov.net> References: <170772904226.8914.6582842518089456166@lain.khirnov.net> 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: UY7ykTu2/fo0 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 | 10 +++++ libavformat/dump.c | 85 +++++++++++++++++++++++------------------- libavformat/options.c | 45 +++++++++++----------- 3 files changed, 81 insertions(+), 59 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5d0fe82250..e3daf4a107 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1093,6 +1093,16 @@ typedef struct AVStreamGroup { * Freed by libavformat in avformat_free_context(). */ AVStream **streams; + + /** + * Stream group disposition - a combination of AV_DISPOSITION_* flags. + * This field currently applies to all defined AVStreamGroupParamsType. + * + * - 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..9bf1695d96 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); @@ -679,7 +684,9 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, switch (stg->type) { case AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT: { const AVIAMFAudioElement *audio_element = stg->params.iamf_audio_element; - av_log(NULL, AV_LOG_INFO, " IAMF Audio Element\n"); + av_log(NULL, AV_LOG_INFO, " IAMF Audio Element:"); + dump_disposition(st->disposition, log_level); + av_log(NULL, AV_LOG_INFO, "\n"); dump_metadata(NULL, stg->metadata, " ", AV_LOG_INFO); for (int j = 0; j < audio_element->nb_layers; j++) { const AVIAMFLayer *layer = audio_element->layers[j]; @@ -700,7 +707,9 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, } case AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION: { const AVIAMFMixPresentation *mix_presentation = stg->params.iamf_mix_presentation; - av_log(NULL, AV_LOG_INFO, " IAMF Mix Presentation\n"); + av_log(NULL, AV_LOG_INFO, " IAMF Mix Presentation:"); + dump_disposition(st->disposition, log_level); + av_log(NULL, AV_LOG_INFO, "\n"); dump_metadata(NULL, stg->metadata, " ", AV_LOG_INFO); dump_dictionary(NULL, mix_presentation->annotations, "Annotations", " ", AV_LOG_INFO); for (int j = 0; j < mix_presentation->nb_submixes; j++) { 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 } };