From patchwork Sat Sep 25 15:56:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2571395iob; Sat, 25 Sep 2021 08:58:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwuBLEM4SKY/IOZl4juhzF3C23v8BFrxR/xWj0g0RBud5/yaTVRPnxB8nJ7fp14XsYBCekm X-Received: by 2002:a50:e145:: with SMTP id i5mr12005238edl.16.1632585509289; Sat, 25 Sep 2021 08:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632585509; cv=none; d=google.com; s=arc-20160816; b=DwjyrNeMi5TWwAf5/lrZ08SEic1CKGJDRSQFoaxvwuKgIK1yvknCcFuQXvI0LU4IpM Ff4cgcBS/rYetO6NISWgz0YkPLdFyKDwneyru/w5kDMugy+JJloAV2nQ8pzPew83hlEo UOQQOuWt7QulChoQPDmYTO9t0MSyOiOFx3dfOxfBf/vdrlo3NV/3VqbvMLX6W/ZZhiSh U3OUuqjZ+lG/z43ZRdhNMeOaCJBli55PJmCHAjQR9VE2yjqWwEdwqeS4GR0n/wdT9PM7 tns2N3lHZo7JjyJGqqksIcXhVcraw1QBT3w6u1e9bgWa5Zfc+1d7ql9EugDyI4UGkkVc /5Vw== 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=OS2wmToi/q4YVU8sipq8+/sir7hthHuN8TsmldWE9eY=; b=njBtcxSUzerXwQ4+cdH11XMs5n0ZK/6wq8ZI2ZH/LGqkiu8NTem82WMXDhip5T7eaU T9G1dDD+jtrRsuA4nLwSyWHm/e17haOI2aNsEGihpAMOceKxRjH/qPUpBpYQNxcuahYb swjmKxn7QwSRrbXRpH87OY+n1OiL+ACllnk9W4Qh5Z9iN8ugL6woVPReM8mR+WzXJUlv Ow8hVPPk9Kh5O8DlPx8t37bwzeFn+nVGk6dZ74wQ9W9qPBpQeEMTNZX5fFy5HcxxbxzZ 7YiMP1H1jlrmx2Jvs8LO8UNjfwtzumxgiDIIQ6sO5m9AjpoDUl/SEhUTYmlKFdem7PUO 4biQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bkMWQGn7; 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 o29si13218925edz.353.2021.09.25.08.58.28; Sat, 25 Sep 2021 08:58:29 -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=bkMWQGn7; 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 A418B68A8F0; Sat, 25 Sep 2021 18:58:25 +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 7485068A77C for ; Sat, 25 Sep 2021 18:58:19 +0300 (EEST) Received: by mail-qk1-f182.google.com with SMTP id 72so31614030qkk.7 for ; Sat, 25 Sep 2021 08:58:19 -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=ZTdDUml3L7OQU3JmOC7PbzH1iMRoZi7dRRrkFmHsoiM=; b=bkMWQGn7gp+KhKhkBfg87wKY9i7tEK9uNVA4grKEqL8Hvl8lcaEXQyfxgOoXwc5uEO ExubcOq8ImOduAPw673N+FNtKsEA88MaHOzek0vPh4NmNGoDJVLuXszG893gw78hrbgc Qu/Bgw7zGkpExiMNUb/EDCFxkw6FH042zc3rJsYBYp8rkJlXI4p3t/EFIhnlEUuR0Jao 6jVNXRMLArHTRlEo8e3J0CJfuHb+esMUndak8OQR4QtDJ6reU7OchgjvSTl9DmPI6fsD youwNhRhssqdsQBeoLWcwXwGQF0zBWNsWMR3HeT7UIDvxAdTck8pSigHHimuFyBv7+sH YfPQ== 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=ZTdDUml3L7OQU3JmOC7PbzH1iMRoZi7dRRrkFmHsoiM=; b=dxno1Je0tqRSvUGjWbkJtlWusQfd8KfVDVtwVf3ND8kiyfxLRAYYmYmPhzkjaH/sOe 2Cwoiz3WvgZrWASHivyMvXpJgZMmPRFpQIEcjSfd2tDlDe40gMUvalW9BRELSwSxPszZ crlI+khT+wddhgMHT7jnI0bWr/KFz6b5LK0w3xsGyRgi/NrUg38AiWJGySSfz9ww/Z4n 9M6Ah28VnXdnbZdsQsJrbIsRHg5DdxkPsxDGfwiTbZuY+XkDwapJ0QIrHHZ0OkQQapHi A1dnDUDSnsBdFR8TJXLaEWQwBDWW6RJXEybcPeil9LX+7wBMfgn/JTbFWsKIfGrtl7DU qPGg== X-Gm-Message-State: AOAM530zrvCz7CejteAO4PyBL+O4q4EnvTdcNmmn1lJEaxPyOHabv8OJ TR9kv7E7C5A/ZqhJQLCoVCgGzjSVpf5K8g== X-Received: by 2002:a37:b386:: with SMTP id c128mr16013875qkf.426.1632585497900; Sat, 25 Sep 2021 08:58:17 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id x3sm8572372qkl.107.2021.09.25.08.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 08:58:17 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Sep 2021 11:56:58 -0400 Message-Id: <20210925155702.319164-1-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: HhqI++V7739X Most of the implementation was done by the Plex developers. Signed-off-by: quietvoid --- libavformat/matroska.h | 7 +++++++ libavformat/matroskadec.c | 44 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 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..74c3fbc2a4 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,25 @@ 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) +{ + const EbmlList *mappings_list = &track->block_addition_mappings; + MatroskaBlockAdditionMapping *mappings = mappings_list->elem; + + for (int 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 +2929,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;