From patchwork Thu Sep 23 05:01:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30469 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp110481iob; Wed, 22 Sep 2021 22:01:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6ZdDpnD4rnjt2YgihKSO1YaYNZSqKKawoFLs3z4BwpFTQ9IxtMAP6FGDdEG40/Amq4S8b X-Received: by 2002:a17:907:784b:: with SMTP id lb11mr3027516ejc.307.1632373317956; Wed, 22 Sep 2021 22:01:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632373317; cv=none; d=google.com; s=arc-20160816; b=o7iceU6J5xyBsa43VCGr3Jv6PsLbDsgdrWd+RZanXqk4Qw0Z00zQGEGz30ArRjAeGU z1qOQkCm3YhoWefoccq+C5FdHaXkI0MZKrwp2cRdwJ7Of+DYdNY4XsqPuYx+D8QoiJSv SJkR6Mvqq8bGU1IWfzakF9cmAhKPVQRxNzzld126ZAcEUzn1bC8CKRmB1nkDEZcO6BbA BjYyahMsSo2egf7T6nIWe7b3J79mWlnR6S2evgofh7Gc2bHzoIfGwoPQrN9+KC3T8UrN 3qBWQelurM0vfaCsZ8+TSC9WyGlYPzPmhbnZwiqBsd4eM57ozOtEzhqcbjU/3MsIlV7E vaGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=w6xkiptf0wIQ0AaKM/9jRcx7PCqAoIeUUFJtuUAIJDk=; b=lydHGf2T7ZjHTexU3nHVBR7/TZQtRU2ApblFVFSer0njPjf9i7qOJ9fsZ7fmpEoNaS FtrLxF0b6sVczhtpibYeoOJUvEy/N5dkvKT11/+9cQ3qGDebNdcNwjKRlUeGVsNX10J/ XLsupuvJ0Nqfl9Tt1fpKGPGPLGqAfoXdG5bYvNfrHBO9Lz2G6qzFaXvQTqWNH2P5DNjB oGaqhFMXGTAoFc74haO2kEE0lp37cdLcuUVUlxZ9SdgfKXdqXWNoa9iiik5DYwBFPk5S +la9p88qmrWF3sunKz+zV9YjN6EjmQ72mi/AFJGh8qcvSahZZhVUVbPcfk/3/Pi2rwDR zGig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WdX3aCjR; 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 bd18si4844635edb.117.2021.09.22.22.01.34; Wed, 22 Sep 2021 22:01:57 -0700 (PDT) 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=WdX3aCjR; 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 134C468A78A; Thu, 23 Sep 2021 08:01:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFF4368A4A4 for ; Thu, 23 Sep 2021 08:01:22 +0300 (EEST) Received: by mail-qk1-f182.google.com with SMTP id q81so14281782qke.5 for ; Wed, 22 Sep 2021 22:01:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1Bk+dPqxcjFat4ADHSNAlrFXfF1srR1DUQPmTeCKFWk=; b=WdX3aCjRHuyqIHnMkqhk0H3zmxsolva3DMFcgqjdtUdxYkuzucthUPAU97AMQgstEG FSeHp0MAiulP5XTYndbKiJQ0pc0lxToZQ09PFrxOgpkpZMPLdRAqkgklX7dckV8zAciD SBKtkun8gAUU/rA0/J8X5eHCcR0RjJqfOA00Njw7Mo9WySWQrak6ytJOOcECMYHnt8U1 3EH/Y9at86HhgFhLFWf6JILzCMtwAv17rrEY2qUEJ7UjM/EnAcHWAimSw3phXZ+NBiNN d9O0tnmrIIZQX9nEpKVLYmbh++17A1TGtSm6LKANU9jZXYWVTdxe9B2M6aKN5RVUiT9I jfgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1Bk+dPqxcjFat4ADHSNAlrFXfF1srR1DUQPmTeCKFWk=; b=Eqy72yyF1Ygt0uwjMvYCFW0FicrT9gmKOpdsH9EI613dFszM/eob7OVqHifwhD3OFl AZ/l0g2d8UMgepaii/WW94GFmLhVQsLOhE0OtXVsB4mNgfu2INehotRCHvZf2I2O/Dwe T7ESc11d3Jh7gRkh3E1LTxivUy/pr7hv7S84QukfJcX7xK0r6K/U4P/OV2r/9FWnSACe T7fI0ggTtJgcrvI6odWMy0LHm9l/Dsl2wZC13mX+6mJAMwN1Myx2QOKAJgVWYAlkGL3b 6sDwu60VB5YKz4KKsztKq1Z8e3ypaMI23g5cMWCKJrnTdFYKlMK5RBr77BwFrKJWJma2 614A== X-Gm-Message-State: AOAM530DEfK9R7tXgbKtBhaZ03d69Oi3hkpJ9sFMmhmZPj8u6+yB4Z07 a3+1sLuc/u+l+DqnUZMVIg8zg4wxkXtd4g== X-Received: by 2002:a05:620a:bce:: with SMTP id s14mr3082519qki.48.1632373281229; Wed, 22 Sep 2021 22:01:21 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id q84sm3427097qke.3.2021.09.22.22.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 22:01:21 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 01:01:05 -0400 Message-Id: <20210923050109.692356-1-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/5] avformat/matroskadec: Parse Block Additional Mapping elements 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 Cc: quietvoid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SuYnet/4tKr0 Most of the implementation was done by the Plex developers. Signed-off-by: quietvoid --- libavformat/matroska.h | 7 ++++++ libavformat/matroskadec.c | 45 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 2d04a6838b..4b2a3310a4 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -111,6 +111,7 @@ #define MATROSKA_ID_TRACKCONTENTENCODING 0x6240 #define MATROSKA_ID_TRACKTIMECODESCALE 0x23314F #define MATROSKA_ID_TRACKMAXBLKADDID 0x55EE +#define MATROSKA_ID_TRACKBLKADDMAPPING 0x41E4 /* IDs in the trackvideo master */ #define MATROSKA_ID_VIDEOFRAMERATE 0x2383E3 @@ -189,6 +190,12 @@ #define MATROSKA_ID_ENCODINGSIGKEYID 0x47E4 #define MATROSKA_ID_ENCODINGSIGNATURE 0x47E3 +/* IDs in the block addition mapping master */ +#define MATROSKA_ID_BLKADDIDVALUE 0x41F0 +#define MATROSKA_ID_BLKADDIDNAME 0x41A4 +#define MATROSKA_ID_BLKADDIDTYPE 0x41E7 +#define MATROSKA_ID_BLKADDIDEXTRADATA 0x41ED + /* ID in the cues master */ #define MATROSKA_ID_POINTENTRY 0xBB diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 500c83ac3a..25aa140e16 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -239,6 +239,13 @@ typedef struct MatroskaTrackOperation { EbmlList combine_planes; } MatroskaTrackOperation; +typedef struct MatroskaBlockAdditionMapping { + uint64_t value; + char *name; + uint64_t type; + EbmlBin extradata; +} MatroskaBlockAdditionMapping; + typedef struct MatroskaTrack { uint64_t num; uint64_t uid; @@ -269,6 +276,7 @@ typedef struct MatroskaTrack { int ms_compat; int needs_decoding; uint64_t max_block_additional_id; + EbmlList block_addition_mappings; uint32_t palette[AVPALETTE_COUNT]; int has_palette; @@ -419,8 +427,8 @@ 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[32], matroska_track_encoding[6], matroska_track_encodings[2], - matroska_track_combine_planes[2], matroska_track_operation[2], matroska_tracks[2], + matroska_track[33], matroska_track_encoding[6], matroska_track_encodings[2], + matroska_track_combine_planes[2], matroska_track_operation[2], matroska_block_addition_mapping[5], 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], matroska_blockadditions[2], matroska_blockgroup[8], matroska_cluster_parsing[8]; @@ -570,6 +578,14 @@ static EbmlSyntax matroska_track_operation[] = { CHILD_OF(matroska_track) }; +static EbmlSyntax matroska_block_addition_mapping[] = { + { MATROSKA_ID_BLKADDIDVALUE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, value) }, + { MATROSKA_ID_BLKADDIDNAME, EBML_STR, 0, 0, offsetof(MatroskaBlockAdditionMapping, name) }, + { MATROSKA_ID_BLKADDIDTYPE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, type) }, + { MATROSKA_ID_BLKADDIDEXTRADATA, EBML_BIN, 0, 0, offsetof(MatroskaBlockAdditionMapping, extradata) }, + CHILD_OF(matroska_track) +}; + static EbmlSyntax matroska_track[] = { { MATROSKA_ID_TRACKNUMBER, EBML_UINT, 0, 0, offsetof(MatroskaTrack, num) }, { MATROSKA_ID_TRACKNAME, EBML_UTF8, 0, 0, offsetof(MatroskaTrack, name) }, @@ -593,6 +609,7 @@ static EbmlSyntax matroska_track[] = { { MATROSKA_ID_TRACKOPERATION, EBML_NEST, 0, 0, offsetof(MatroskaTrack, operation), { .n = matroska_track_operation } }, { MATROSKA_ID_TRACKCONTENTENCODINGS, EBML_NEST, 0, 0, 0, { .n = matroska_track_encodings } }, { MATROSKA_ID_TRACKMAXBLKADDID, EBML_UINT, 0, 0, offsetof(MatroskaTrack, max_block_additional_id), { .u = 0 } }, + { MATROSKA_ID_TRACKBLKADDMAPPING, EBML_NEST, 0, sizeof(MatroskaBlockAdditionMapping), offsetof(MatroskaTrack, block_addition_mappings), { .n = matroska_block_addition_mapping } }, { MATROSKA_ID_SEEKPREROLL, EBML_UINT, 0, 0, offsetof(MatroskaTrack, seek_preroll), { .u = 0 } }, { MATROSKA_ID_TRACKFLAGENABLED, EBML_NONE }, { MATROSKA_ID_TRACKFLAGLACING, EBML_NONE }, @@ -2306,6 +2323,26 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track, return 0; } +static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, const MatroskaTrack *track) +{ + int i, ret; + const EbmlList *mappings_list = &track->block_addition_mappings; + MatroskaBlockAdditionMapping *mappings = mappings_list->elem; + + for (i = 0; i < mappings_list->nb_elem; i++) { + MatroskaBlockAdditionMapping *mapping = &mappings[i]; + + switch (mapping->type) { + default: + av_log(s, AV_LOG_DEBUG, + "Unknown block additional mapping type %ld, value %ld, name \"%s\"\n", + mapping->type, mapping->value, mapping->name ? mapping->name : ""); + } + } + + return 0; +} + static int get_qt_codec(MatroskaTrack *track, uint32_t *fourcc, enum AVCodecID *codec_id) { const AVCodecTag *codec_tags; @@ -2893,6 +2930,10 @@ static int matroska_parse_tracks(AVFormatContext *s) if (track->flag_textdescriptions) st->disposition |= AV_DISPOSITION_DESCRIPTIONS; } + + ret = mkv_parse_block_addition_mappings(s, st, track); + if (ret < 0) + return ret; } return 0;