From patchwork Wed Feb 17 10:13:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25697 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 B041144868C for ; Wed, 17 Feb 2021 12:21:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9323C68A42C; Wed, 17 Feb 2021 12:21:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CC7C68066B for ; Wed, 17 Feb 2021 12:21:00 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id m1so3059892wml.2 for ; Wed, 17 Feb 2021 02:21:00 -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=CQbLZUZBgGXO97THH25WPZ7d9CD/hdSnc560UK6jyXs=; b=Ue207kESOiEyOR071E9Kzur607tWBg4NTCjvoZO+zuEF3bXYHeTTAMUwybeTw53Wce /daYZXgAx9PA2pEh2Qk/h7WCP+TpNUolk0E4Wzy13tUt5sBz16fZvB2Kd+42+smoXkZ7 n2L1/IuYqUGp0p8PNqFCQRPXrNVRvi3Exh0NpAumyiurO75wj6ftmnHjkoJIf3v8s+vX 2IlGFvVJurS6SUdimSn6wr25bFdGjrF3EupCz1ep0OQFXp0IzkD8g2vjnbp19uqSiV0I iDJDs+ayxbOHitdcBDLrZJSp/ojOxCfDVU031iJLSwDnLAttiyBtPo5jr3Iu5kjKgY00 yJ8A== 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=CQbLZUZBgGXO97THH25WPZ7d9CD/hdSnc560UK6jyXs=; b=AVqTL501MiE0ePcmZCX82+5LgMfxp42FrNMET0fxQml2j4YRaisy9kbnkJey76OX2z Gn765wtQN/pPCBtp8TB+D/CHAYLslP5FhrRGPRyFSSnM4oC0rx8Iq+4jAJGyOGcNI4Mc Vwlb2VrVcdJtLODHHR5QQKSCIpk8/00x1DKmC6NnpMm9RXTxq9S9u4vGETWy2+1jueTE 3CPBojsrSBeszcKh30omAkC0bMdQ0wPrOwH3gBsHhKeK24KBlwdOZqkT7njmmqlM8DaH 2f3CU3n4nkK84YMdpr8rVA9QvOg0WcGhtee7FG0qo/NeNEGboGWKSdV6fHpUSb7OSPuH gxTA== X-Gm-Message-State: AOAM5331zTWLoh9MWYr5MsPltD9RlUER2rbdZjmCv7Bw5VvzH2cWb/ro aEL6pwg/hEsekkP5/JXx0S6rIlRUMHU= X-Google-Smtp-Source: ABdhPJyFjbb3WcT6vgC0ywbeyPu2bMvCIVIoavTj1RBvH4IUyDCHkH0zMsAH0FPdmor6J5x3qrhWXQ== X-Received: by 2002:a1c:ba05:: with SMTP id k5mr1167886wmf.111.1613556868475; Wed, 17 Feb 2021 02:14:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:14:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 11:13:46 +0100 Message-Id: <20210217101356.1723370-9-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 09/19] avformat/matroska, matroskadec: Support FlagCommentary 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" Hint: Matroska actually provides a way to distinguish the cases of "track is no commentary track" and "it is unknown whether the track is a commentary track", but our disposition flags do not. Therefore we need not use a CountedElement. Signed-off-by: Andreas Rheinhardt --- libavformat/matroska.h | 1 + libavformat/matroskadec.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 6f198f06e6..191c4f6149 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -95,6 +95,7 @@ #define MATROSKA_ID_SEEKPREROLL 0x56BB #define MATROSKA_ID_TRACKNAME 0x536E #define MATROSKA_ID_TRACKLANGUAGE 0x22B59C +#define MATROSKA_ID_TRACKFLAGCOMMENTARY 0x55AF #define MATROSKA_ID_TRACKFLAGENABLED 0xB9 #define MATROSKA_ID_TRACKFLAGDEFAULT 0x88 #define MATROSKA_ID_TRACKFLAGFORCED 0x55AA diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b9c6047f56..fa266fcaec 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -250,6 +250,7 @@ typedef struct MatroskaTrack { uint64_t default_duration; uint64_t flag_default; uint64_t flag_forced; + uint64_t flag_comment; uint64_t seek_preroll; MatroskaTrackVideo video; MatroskaTrackAudio audio; @@ -409,7 +410,7 @@ typedef struct MatroskaDemuxContext { // incomplete type (6.7.2 in C90, 6.9.2 in C99). // Removing the sizes breaks MSVC. static EbmlSyntax ebml_syntax[3], matroska_segment[9], matroska_track_video_color[15], matroska_track_video[19], - matroska_track[27], matroska_track_encoding[6], matroska_track_encodings[2], + matroska_track[28], matroska_track_encoding[6], matroska_track_encodings[2], matroska_track_combine_planes[2], matroska_track_operation[2], matroska_tracks[2], matroska_attachments[2], matroska_chapter_entry[9], matroska_chapter[6], matroska_chapters[2], matroska_index_entry[3], matroska_index[2], matroska_tag[3], matroska_tags[2], matroska_seekhead[2], @@ -571,6 +572,7 @@ static EbmlSyntax matroska_track[] = { { MATROSKA_ID_TRACKLANGUAGE, EBML_STR, 0, 0, offsetof(MatroskaTrack, language), { .s = "eng" } }, { MATROSKA_ID_TRACKDEFAULTDURATION, EBML_UINT, 0, 0, offsetof(MatroskaTrack, default_duration) }, { MATROSKA_ID_TRACKTIMECODESCALE, EBML_FLOAT, 0, 0, offsetof(MatroskaTrack, time_scale), { .f = 1.0 } }, + { MATROSKA_ID_TRACKFLAGCOMMENTARY, EBML_UINT, 0, 0, offsetof(MatroskaTrack, flag_comment), { .u = 0 } }, { MATROSKA_ID_TRACKFLAGDEFAULT, EBML_UINT, 0, 0, offsetof(MatroskaTrack, flag_default), { .u = 1 } }, { MATROSKA_ID_TRACKFLAGFORCED, EBML_UINT, 0, 0, offsetof(MatroskaTrack, flag_forced), { .u = 0 } }, { MATROSKA_ID_TRACKVIDEO, EBML_NEST, 0, 0, offsetof(MatroskaTrack, video), { .n = matroska_track_video } }, @@ -2742,6 +2744,8 @@ static int matroska_parse_tracks(AVFormatContext *s) st->disposition |= AV_DISPOSITION_DEFAULT; if (track->flag_forced) st->disposition |= AV_DISPOSITION_FORCED; + if (track->flag_comment) + st->disposition |= AV_DISPOSITION_COMMENT; if (!st->codecpar->extradata) { if (extradata) {