From patchwork Wed Feb 17 10:13:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25698 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DF632448D26 for ; Wed, 17 Feb 2021 12:21:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF26B68A5CC; Wed, 17 Feb 2021 12:21:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F585689FE4 for ; Wed, 17 Feb 2021 12:21:09 +0200 (EET) Received: by mail-wm1-f51.google.com with SMTP id a207so3065285wmd.1 for ; Wed, 17 Feb 2021 02:21:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=p3MO1GSZb9Gc6eW9qfZ4fH5Hsj/Govxj5wjvSocVJpc=; b=G58ATJkDo4eNX6bTQ+eo2PWyJP5l13T5CnFcfqj/1bQSJA7ui12IVqDrEvnKXt5BMg lqJwvY8EpowBoAF5kxJKzcbFC8ukbwXfqYzhEl64llqdUE8E7vIneIQ5FN6iG9O2QwWi 4aTVk4ksnn7qrXyZeD9MIsdBopWLdPrXeEZ4//0OsZfsN92EMUg3ujVTzpN0bOlVSAIy Bm4rhRsOnGRs/QJSIs5DtqiVheMUlvi7fPWuIGQKlyOnkOOZK2dS80xjAIMo/emV1vX7 hrgISgQunS+QKorPUAgcACPQWbvlk1EzizHKCXFsC0Ho3huVxKQgcfRBO3JNgDvHC5ZN w1Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=p3MO1GSZb9Gc6eW9qfZ4fH5Hsj/Govxj5wjvSocVJpc=; b=i8HXR/m7JRRf9j6jDf7B8TY3NC2nAVcSnV92fmjnr0QvXo7QHKGRPbZxxMEMRsncEc CK+kYVQyvw5LWmzalA/QSMJDqAHFsOt5QYpu90t/vhF7L8mqZ/ZhQ+gkWvKbcYd9VdGb CI1VaCtYD8s0pxGbxtL3qno9NlCTWnmi+AD90+LviIWDz7Rmzt4hQlx3jHmOw0kZNi3o jHlOQdh+Byhr0e8wxeLFJvJB33UP4XAPdqwiyFnyrwU/6PIOXwvaYvg6/g8a3RoaunMk bu4UYFt2k9TOWmuBnZoMlN1EIvxgB20GBV17TixjFVcS+HckcMAmuBuiVhaB4T5kpJ6s Omxw== X-Gm-Message-State: AOAM530AmKfgwDTqTVXwPgWZ6PNHyp/RZ8k7Ha0igIL3kVD1zaH11uBi GFWdDHEZiL3d9J9pt1NQC9JaOkj0xeQ= X-Google-Smtp-Source: ABdhPJx9AQmFDB5HECrf2WwDY5s7pVN8zmoUWz8QMcyfS3BZJNunocjxriHaEcxX8H48XbALe2Ot6A== X-Received: by 2002:a1c:9d81:: with SMTP id g123mr6589491wme.139.1613556870446; Wed, 17 Feb 2021 02:14:30 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id v12sm3502828wrv.69.2021.02.17.02.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:14:30 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 11:13:49 +0100 Message-Id: <20210217101356.1723370-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> References: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/19] avformat/matroskaenc: Add support for FlagOriginal 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 746c0b347a..0dd093ae8b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1193,6 +1193,12 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } else { if (st->disposition & AV_DISPOSITION_COMMENT) put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGCOMMENTARY, 1); + if (st->disposition & (AV_DISPOSITION_ORIGINAL | AV_DISPOSITION_DUB) && + (st->disposition & (AV_DISPOSITION_ORIGINAL | AV_DISPOSITION_DUB)) + != (AV_DISPOSITION_ORIGINAL | AV_DISPOSITION_DUB)) + put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGORIGINAL, + !!(st->disposition & AV_DISPOSITION_ORIGINAL)); + // look for a codec ID string specific to mkv to use, // if none are found, use AVI codes if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) {