From patchwork Wed Dec 8 01:06:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7047660iog; Tue, 7 Dec 2021 17:12:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1UMMOSib4X313lCXgaNpkQ5xQw5NXq6meHkZYWH35B9b28mPoKeJIxOTLWKWzFex5Il3k X-Received: by 2002:a05:6402:42c6:: with SMTP id i6mr14418904edc.223.1638925952800; Tue, 07 Dec 2021 17:12:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925952; cv=none; d=google.com; s=arc-20160816; b=P0XcKvdtjroiUOQBgiQ+zlK2n20e0deG/JD6BSVDVAB48ppj6HAMXqc+SOeuV+u1E0 v/snluuI0uhf08ByB1I1CxMeGI1AwycAp+e0/7BxeNGlhrnx+c1jr2IuEeJMOf0T1WN8 8MnyMHe3QnPqGONrXG7ZHcWwCCfBkQBvq34DTUUsShj/xeQ9a820ml/fK/hDajCIC6m5 F2xZezIxSo2qe8NeaTSHNeznRF3EnzDIsIAMiPC96tMRbqrDoAAN3SuuEARMZuV65PM8 Tcf//wfy9vlNKlnax1fchXQzLANZmaksWbPI8UoWrWrfH8BN4QdnhK7bddp/Jcgm0ibS hj1Q== 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=quKsCCWMGCVlVUiof9PIv3OMohIcermgRG78qyJTwJc=; b=Bx7W06iw30vMjuhXpWAkF8sVzfjV82XS0T/WBIsLIQN+GUcRX6PbtGPkwf0GhrFfxG 8Q5IW26azcwjSkrQxfpuuLXo7AELsXml4XPiGkq0/c0LR2cohBdRuouDkrj70v2XYXxZ 6gIiSfzFeYXsL9vdTBaDMHWp75uUmClnL439jZkSFlyZX7tH9qCapWRQ9E+7B8L/TVoW q5KQAcZTtRibVHUJ9F0Fte1SWNGCf9Sef7HXa7D+FOATPD7lrz9NIzk+l8CQlOl0W5Mq x6O2hiB9q4z9HS+TLRlpsmi36r+EWnNBQFiXr0vo02FzFnlcKyVk+ipRcqD5QH6BW4y4 LBUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DHJoszte; 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 y17si2857017edc.415.2021.12.07.17.12.31; Tue, 07 Dec 2021 17:12:32 -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=20210112 header.b=DHJoszte; 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 4605B68AF88; Wed, 8 Dec 2021 03:08:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f54.google.com (mail-ua1-f54.google.com [209.85.222.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 311CB68AF52 for ; Wed, 8 Dec 2021 03:08:02 +0200 (EET) Received: by mail-ua1-f54.google.com with SMTP id y5so1894461ual.7 for ; Tue, 07 Dec 2021 17:08:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2B7LDTyam225swvVMrR7YkEVsJnyN8mvmEs+xhhQBP4=; b=DHJoszteolR4kQjgqc1Cm8Fipmd3pjAHR7DE68NhgnCEwtOgttsbJmHcXR1qMBPk5G VPec+pTo4voUBJ2/k2DYlNd2qr+KlNuMR3tU6Yscu6dBN8ZhgWHTDv1TM2WReV2s0Iyf QGkIljDccNRzXiDIsD8rh9ELlh33HGFK+7DB6oKCCV70xT1Ye3aFIfqAsj0VmrZjZHSa oMJKCKBHAS1QKbmubvayZbbaHgRfaw0sNSKrsiumNSHAq0K8TwSkX5+KZCNx4SELZYi3 TUpcrGdhUqvdlJPZBf1aA0F+eVzW8GzPlXt6j2yNakltGxl3uQLPM8jSrzIUd1XCt1gp TZWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2B7LDTyam225swvVMrR7YkEVsJnyN8mvmEs+xhhQBP4=; b=4sM+LL9O5B6nYGryq9GG9dZy03J0Pgrbb3saexoAQeMmfZ39wHpdGesdY3JE8axm6k BkCt+7+d7Yr8YD0gJYxKL5JzNpYYoxp6ZlMvCpg+ICSyuPpUgZuFcKxBiH3lBU6ZpCPL KMWJnBDoh0V1sGBRN8zipUdKduuCa70KEp9Dk9tNWmPxJe08oCWeBEYNr7MhmZlFKAfC pXijq4qL1G9CBH4HjZwRXFneDCovrzvaXT94iSKdYIORBWgbrQkvyJWW6WQfPC48k6he rUIT19DoCelOyQxcml+t/CIrE2D3SZ/bKiWSuznek1n1dr9MOB7m1QMSPrw/2LvEtKfI 0DXA== X-Gm-Message-State: AOAM532LMT3WtskLdgO6QiS7LDTbqsrf+rYyj3wS6VQsdp0Fn676jb+W pQUk+DaSXEaelor+YK1MfXvoAaXY+2ohG835 X-Received: by 2002:a67:bc16:: with SMTP id t22mr50254690vsn.10.1638925680682; Tue, 07 Dec 2021 17:08:00 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:08:00 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:42 -0300 Message-Id: <20211208010649.381-27-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 272/279] lavf: Add non diegetic stream disposition flag 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: JAUqJT5TeMgR From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/avformat.h | 7 +++++++ libavformat/dump.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 75699f3a32..907cf9d7c6 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -872,6 +872,13 @@ typedef struct AVIndexEntry { */ #define AV_DISPOSITION_TIMED_THUMBNAILS (1 << 11) +/** + * The stream is intended to be mixed with a spatial audio track. For example, + * it could be used for narration or stereo music, and may remain unchanged by + * listener head rotation. + */ +#define AV_DISPOSITION_NON_DIEGETIC (1 << 12) + /** * The subtitle stream contains captions, providing a transcription and possibly * a translation of audio. Typically intended for hearing-impaired audiences. diff --git a/libavformat/dump.c b/libavformat/dump.c index 69b838fbc7..e3f0056c20 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -618,6 +618,8 @@ static void dump_stream_format(const AVFormatContext *ic, int i, av_log(NULL, AV_LOG_INFO, " (dependent)"); if (st->disposition & AV_DISPOSITION_STILL_IMAGE) av_log(NULL, AV_LOG_INFO, " (still image)"); + if (st->disposition & AV_DISPOSITION_NON_DIEGETIC) + av_log(NULL, AV_LOG_INFO, " (non-diegetic)"); av_log(NULL, AV_LOG_INFO, "\n"); dump_metadata(NULL, st->metadata, " ");