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; From patchwork Thu Sep 23 05:01:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp110617iob; Wed, 22 Sep 2021 22:02:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6GMTmb34sHpzeGmoFI7YL7gx22doHlX6rfLYCCbLqR3CgCkEtXvLUqDyOaD3mNvNtOtGr X-Received: by 2002:a50:9dcf:: with SMTP id l15mr3446534edk.128.1632373328508; Wed, 22 Sep 2021 22:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632373328; cv=none; d=google.com; s=arc-20160816; b=stSicjG2ok+sqoCrItoycUxBww39qmHFDQJKhjpmhI/2Qd7taxm5PQJEoNNCFdeyCK nm1LYBCg6f0tU/XSDiOEL1bv6UueUJqV+xn6JEA8jfCdc2Ulw1fek3i8VMa25FZMq207 jDYgb2F6GP4qMAK80/xHs1t5qYAsuBMhqzHL+mWK781HUH86Mt8T+6jkAAX4OH1XxV19 DEsDmLNqxMaAh7NUTfcspG7TRv2WvMbt9ZOm9AvSXLLNooYSHiuJlcCdb7CLEF9tuTmq rph6x84hvoXuYPZDJhMvLpNowdc1/4vUcueDSjKqXwuixA3C/mHXmgw9483SXRkxVsPd bqRQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=2Ip9adznSspu73APJb03SzNt73NeyBJpFHZpBtUGnZo=; b=Z2J980LiusY+p40WjwPkMmJUr49iwe8+jSS4Xcoxtn3zxGvkiv1C1Zd1qzIPSwjwgq R7f5BcedGie6lni/3D3qlCB14drLkImkwaNAqfWTZ1/aHoY29vNGQVhs56si85hb8V5Z 6yqhEGsaD0VhO7Q3lmkqXw5zusVWb1uUeVPG4EgZWEyN7mcT7NjuKalse9U34a1DWBEj w4KTS4vpcS7lPLIXfNjBJo61HL8NGl7zP6tHyewCuVX+V4ckhoHChUyZ3Q+9jQtFBCI3 qxwlAunAQ9fUA+FhuzBMG1kGexufbLDOhhO+z3aZAk0g6MLjw5weomjPTuhfyl/zMIWB 26vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ix7zFv64; 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 c15si4769745edr.246.2021.09.22.22.01.48; Wed, 22 Sep 2021 22:02:08 -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=ix7zFv64; 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 1B3DC68A826; Thu, 23 Sep 2021 08:01:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58DF668A4A4 for ; Thu, 23 Sep 2021 08:01:23 +0300 (EEST) Received: by mail-qv1-f52.google.com with SMTP id e5so3219020qvq.7 for ; Wed, 22 Sep 2021 22:01:23 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=kqhEtHrWbwQpdRg7IeT9kJeoYB14kGnVRuzcuFW9IgU=; b=ix7zFv64wu50LlUcGcL7kDiq3cL/ivF0mj8uOHFux6MoYwyIJXi7gQPi8r8994mw/M 6PFjImoYQQTeB5SyuI1e1cX0D7oRtEydQfdQAgZuMeVHC1wPzPSGDJvP1ZGhPtQRhMe8 1QdA9UUOBqTkia/bvzqMuNO1F8M9JdfYvcV4CAdFJjyYl3CsEPz4B7rfpWw7lzUt/Kz3 t/CZvUbGr+Z1QB1ct9ps3r4pJe8cz7X1Nk7diJJZrzdxJn6GopXyJJH5YH2ODC1i/iMa ArhiTdhF3/CC5a/Lk6M/LbJUJRCQp+85Dks5nWxJL9HMU5UFII4xMSwJp83UrGK1mCwR 1Wjw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=kqhEtHrWbwQpdRg7IeT9kJeoYB14kGnVRuzcuFW9IgU=; b=Kfd2J0xB7oG8fC6AYFeQ6rwnUGEplSj6E2ywgxRFCLtk2RTUbRzebge0a4YWUD+/dl ngxmadvh2RMTHeu8xzaWR0scC7j57W7uod7WrCIDLPFKF71HZaAEUSwluYFTRK9tlV4z gFtLOaayQbcTx/xjhnnJydGwsHlsCbQy1/385eIy4MgxCLeZuKRRIahci+P3JcYY2yQb IHASWgILNVWEAS1QaqlHh75A1s2VbBZgFJ+lp32ssviHmwoMJgswQHivnOwyB9/H7jT7 AsC+i5AvVE4nApKuNNeEjyOPbEeKYQCXq5hTcxgkQ8kSDMhqu7abnPPlcWi3+3+/vpIY c4ig== X-Gm-Message-State: AOAM532QtLgRTKQx4edOw1/VwqZMODwUPJtyFbpjnEDPGkV5g4JWhsv4 gzT3CyY+r84Sn9UVh4F4dMKFmHfQZSCe4A== X-Received: by 2002:ad4:4a8b:: with SMTP id h11mr2683639qvx.3.1632373281782; 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.21 (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:06 -0400 Message-Id: <20210923050109.692356-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923050109.692356-1-tcChlisop0@gmail.com> References: <20210923050109.692356-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] avformat/matroskadec: Parse dvcC/dvvC block additional mapping 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: eZWKN+OrlBFh The parsing was implemented in a new dovi_isom file for the unification of the mov/mpegts DOVI parsing into one function, in a following patch. Most of the Matroska elements implementation was done by Plex developers. Signed-off-by: quietvoid --- libavformat/Makefile | 2 +- libavformat/dovi_isom.c | 80 +++++++++++++++++++++++++++++++++++++++ libavformat/dovi_isom.h | 29 ++++++++++++++ libavformat/matroskadec.c | 13 +++++++ 4 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 libavformat/dovi_isom.c create mode 100644 libavformat/dovi_isom.h diff --git a/libavformat/Makefile b/libavformat/Makefile index c45caa3eed..61a1fecf6c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -313,7 +313,7 @@ OBJS-$(CONFIG_M4V_MUXER) += rawenc.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ flac_picture.o isom_tags.o rmsipr.o \ oggparsevorbis.o vorbiscomment.o \ - qtpalette.o replaygain.o + qtpalette.o replaygain.o dovi_isom.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o isom_tags.o \ flacenc_header.o avlanguage.o \ diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c new file mode 100644 index 0000000000..3eafa0d13b --- /dev/null +++ b/libavformat/dovi_isom.c @@ -0,0 +1,80 @@ +/* + * DOVI ISO Media common code + * Copyright (c) 2021 quietvoid + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/dovi_meta.h" + +#include "avformat.h" +#include "dovi_isom.h" + +int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size) +{ + uint32_t buf; + AVDOVIDecoderConfigurationRecord *dovi; + size_t dovi_size; + int ret; + + if (size > (1<<30) || size < 4) + return AVERROR_INVALIDDATA; + + dovi = av_dovi_alloc(&dovi_size); + if (!dovi) + return AVERROR(ENOMEM); + + dovi->dv_version_major = *buf_ptr++; // 8 bits + dovi->dv_version_minor = *buf_ptr++; // 8 bits + + buf = *buf_ptr++ << 8; + buf |= *buf_ptr++; + + dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits + dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits + dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit + dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit + dovi->bl_present_flag = buf & 0x01; // 1 bit + + // Has enough remaining data + if (size >= 5) { + dovi->dv_bl_signal_compatibility_id = ((*buf_ptr++) >> 4) & 0x0f; // 4 bits + } else { + // 0 stands for None + // Dolby Vision V1.2.93 profiles and levels + dovi->dv_bl_signal_compatibility_id = 0; + } + + ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, + (uint8_t *)dovi, dovi_size); + if (ret < 0) { + av_free(dovi); + return ret; + } + + av_log(s, AV_LOG_TRACE, "DOVI, version: %d.%d, profile: %d, level: %d, " + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", + dovi->dv_version_major, dovi->dv_version_minor, + dovi->dv_profile, dovi->dv_level, + dovi->rpu_present_flag, + dovi->el_present_flag, + dovi->bl_present_flag, + dovi->dv_bl_signal_compatibility_id + ); + + return 0; +} \ No newline at end of file diff --git a/libavformat/dovi_isom.h b/libavformat/dovi_isom.h new file mode 100644 index 0000000000..9d9a05bdb0 --- /dev/null +++ b/libavformat/dovi_isom.h @@ -0,0 +1,29 @@ +/* + * DOVI ISO Media common code + * Copyright (c) 2021 quietvoid + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_DOVI_ISOM_H +#define AVFORMAT_DOVI_ISOM_H + +#include "avformat.h" + +int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size); + +#endif /* AVFORMAT_DOVI_ISOM_H */ \ No newline at end of file diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 25aa140e16..652d854ac4 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -51,6 +51,8 @@ #include "libavcodec/mpeg4audio.h" #include "libavcodec/packet_internal.h" +#include "libavformat/dovi_isom.h" + #include "avformat.h" #include "avio_internal.h" #include "internal.h" @@ -2323,6 +2325,12 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track, return 0; } +static int mkv_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const MatroskaTrack *track, + EbmlBin *bin) +{ + return ff_isom_parse_dvcc_dvvc(s, st, bin->data, bin->size); +} + static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, const MatroskaTrack *track) { int i, ret; @@ -2333,6 +2341,11 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, c MatroskaBlockAdditionMapping *mapping = &mappings[i]; switch (mapping->type) { + case MKBETAG('d','v','c','C'): + case MKBETAG('d','v','v','C'): + if ((ret = mkv_parse_dvcc_dvvc(s, st, track, &mapping->extradata)) < 0) + return ret; + break; default: av_log(s, AV_LOG_DEBUG, "Unknown block additional mapping type %ld, value %ld, name \"%s\"\n", From patchwork Thu Sep 23 05:01:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp110572iob; Wed, 22 Sep 2021 22:02:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqxFkTyfPAnJHIjVpU685lOv9eeXngqefy704pszczgXI7C5JB6mW7St552ixQASey4CGd X-Received: by 2002:a17:906:abd1:: with SMTP id kq17mr2913463ejb.390.1632373324450; Wed, 22 Sep 2021 22:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632373324; cv=none; d=google.com; s=arc-20160816; b=O+eIlPbDFOFNdUC3DmkArZD6TkrTlqShJepsC0p7Dc9mqyhxFQPjBdHTgkjxUsR4Ui 2e/2fESEPX6XM2OnyD1q/rGDa4Ze3Avnr8aDiWfVHlcYAUIfBVp80uxxv3CaZY3zt73n 3506WdoysZEjJkU3/KdB/t6q4O5hFz71q3JElfHQOYMrS4bOhs2qGiUlmb44JzpTrhPp psWwvBDAX2pX21YdxH1ZiKpn/LINzju8fPlevzebarEhV/5kEU2V0Aeqq6LXPDVEEtJD UBBLB0A1fjT2MEsVMSx+7tvbEW55fcC6DsOLIPF/ZwKN1e2T0XcVXecYXSwf3lpHmb/9 IuYw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=rA5VYEXysV0WGfi945nE6JhlIwJafOLqhHMWSnlP4uA=; b=P1r02hRBH/Oz9pxY22Kessr7wPR6TX+LV0J5zWnQPAy76HPuga+febpXC94Adcv6b8 sQUUTxOtPQay2z54fMw8lQmATXBon4hvYVjRH73qJdWnGbFzMWwVxmRPtegZx8A0EjO2 yTi86sZmYFhqdlFmmclYRGEVWUjJpC0++6M7dvpaPxG5dwozoowxcO36vibqyKcXGDw4 8/pMeKr5Kjq4JQ91zGDdyJLnjca3HmWJL4/enV289d5JM9DP7oSXdsy+boWzfyyo9OqN roQxowcR2f3RwhCe8utlUmeyC603yv6s567GsVuNYbkWxOxjv6HHEdjmTTFxEMCkPrAj KK8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mGTRGNlh; 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 u10si5279169edp.443.2021.09.22.22.02.00; Wed, 22 Sep 2021 22:02:04 -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=mGTRGNlh; 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 1CF0768A953; Thu, 23 Sep 2021 08:01:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E53F668A4E5 for ; Thu, 23 Sep 2021 08:01:23 +0300 (EEST) Received: by mail-qt1-f172.google.com with SMTP id u21so5068747qtw.8 for ; Wed, 22 Sep 2021 22:01:23 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=HLPprw3Q2wEPextOpy6SgK1W59AOMmFkGX8QPNsTMJ0=; b=mGTRGNlhHyBhCKK7JMPJ3eb4BSeL7bvpcVZbhIMC8dEUhU5CfLQIJ0htX4fz4KfkrD UKzHd96XiA3urXrkOkXI+42N8PYNUKwjzbijUN4EmGIEGDyO48bHtgLo+OyJfgzxzsIb +EZzAqSKeWsNpbhiEIOVopU91CHjRHANsg+uToJ16bjS7n286hlTWyzEr4zw1So+RLS9 sBok+OsL22TNjxlCAf/FHE1wF4e/61G3VIH2u//AzXBkHGVB4U/cTocORIteTygvGuIC RCW3m84QwG6oUzeHnCdo4TlzLvLc5w5I2vK3D0u1VsTFFe4uHTZWX7shlEEPpfbqOIt9 +/cQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=HLPprw3Q2wEPextOpy6SgK1W59AOMmFkGX8QPNsTMJ0=; b=6T1ctE3qDQ8GZX+9mSgZhYyhZcZGc6GFwr/c2kvBSRX0rce+Q0xcRSwlZcWWbt6934 9Lqc6siEDE2q19Nw5bQtL2QRkmCaJBsyVxZMVfntZbRXrBkqdpdCKbdJ9E9pnGivNwdv COkjsZT8nJ/mNJfQXIm6fSZhw6B2mCdFhllFrrJvKVNcIRIkeyRLUdMMcHud9WZ3OSSN oR8QZWk+d9Np2llhBaZGnGzj7XdxjVgXoatx27MokWszISdQlvQlwbatB0H6p30Fy3pX xkbL+rQ7uOlhs1ZmtLXPVTVIE99HzAprNWdAIkANiiEKGrt8fKh0Fa0uNXGNFImVYtcf aZAA== X-Gm-Message-State: AOAM532nRp+9M/pSD8YQ/RvenQ8nhLU1OWrH3RmWpB0O1ak5fwJ/NMtq YHWOSDsQDbbrpPbjFbPVNbcM2SxE62aUtQ== X-Received: by 2002:ac8:7f84:: with SMTP id z4mr2954429qtj.90.1632373282385; Wed, 22 Sep 2021 22:01:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 22:01:22 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 01:01:07 -0400 Message-Id: <20210923050109.692356-3-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923050109.692356-1-tcChlisop0@gmail.com> References: <20210923050109.692356-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] avformat/matroskaenc: Write dvcC/dvvC block additional mapping 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: DpvTVQBFfhXL When muxing to Matroska, write the Block Additional Mapping if there is AV_PKT_DATA_DOVI_CONF side data present. Most of the code was implemented by Plex developers. Signed-off-by: quietvoid --- libavformat/Makefile | 2 +- libavformat/dovi_isom.c | 45 +++++++++++++++++++++++++++++++++++++++ libavformat/dovi_isom.h | 5 +++++ libavformat/matroskaenc.c | 32 ++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 61a1fecf6c..680030014d 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -317,7 +317,7 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o isom_tags.o \ flacenc_header.o avlanguage.o \ - vorbiscomment.o wv.o + vorbiscomment.o wv.o dovi_isom.o OBJS-$(CONFIG_MCA_DEMUXER) += mca.o OBJS-$(CONFIG_MCC_DEMUXER) += mccdec.o subtitles.o OBJS-$(CONFIG_MD5_MUXER) += hashenc.o diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c index 3eafa0d13b..15acc5cbce 100644 --- a/libavformat/dovi_isom.c +++ b/libavformat/dovi_isom.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/put_bits.h" + #include "libavutil/dovi_meta.h" #include "avformat.h" @@ -77,4 +79,47 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf ); return 0; +} + +int ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t *out, int size, uint32_t *type, + AVDOVIDecoderConfigurationRecord *dovi) +{ + PutBitContext pb; + init_put_bits(&pb, out, size); + + if (size < ISOM_DVCC_DVVC_SIZE) + return AVERROR(EINVAL); + + if (dovi->dv_profile > 7) + *type = MKBETAG('d', 'v', 'v', 'C'); + else + *type = MKBETAG('d', 'v', 'c', 'C'); + + put_bits(&pb, 8, dovi->dv_version_major); + put_bits(&pb, 8, dovi->dv_version_minor); + put_bits(&pb, 7, dovi->dv_profile); + put_bits(&pb, 6, dovi->dv_level); + put_bits(&pb, 1, dovi->rpu_present_flag); + put_bits(&pb, 1, dovi->el_present_flag); + put_bits(&pb, 1, dovi->bl_present_flag); + put_bits(&pb, 4, dovi->dv_bl_signal_compatibility_id); + + put_bits(&pb, 28, 0); /* reserved */ + put_bits32(&pb, 0); /* reserved */ + put_bits32(&pb, 0); /* reserved */ + put_bits32(&pb, 0); /* reserved */ + put_bits32(&pb, 0); /* reserved */ + flush_put_bits(&pb); + + av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", + dovi->dv_profile > 7 ? "dvvC" : "dvcC", + dovi->dv_version_major, dovi->dv_version_minor, + dovi->dv_profile, dovi->dv_level, + dovi->rpu_present_flag, + dovi->el_present_flag, + dovi->bl_present_flag, + dovi->dv_bl_signal_compatibility_id); + + return put_bytes_output(&pb); } \ No newline at end of file diff --git a/libavformat/dovi_isom.h b/libavformat/dovi_isom.h index 9d9a05bdb0..b58ab1bea0 100644 --- a/libavformat/dovi_isom.h +++ b/libavformat/dovi_isom.h @@ -23,7 +23,12 @@ #define AVFORMAT_DOVI_ISOM_H #include "avformat.h" +#include "libavutil/dovi_meta.h" + +#define ISOM_DVCC_DVVC_SIZE 24 int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size); +int ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t *out, int size, uint32_t *type, + AVDOVIDecoderConfigurationRecord *dovi); #endif /* AVFORMAT_DOVI_ISOM_H */ \ No newline at end of file diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 039f20988a..a54f7b5feb 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -54,6 +54,8 @@ #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" +#include "libavformat/dovi_isom.h" + /* Level 1 elements we create a SeekHead entry for: * Info, Tracks, Chapters, Attachments, Tags (potentially twice) and Cues */ #define MAX_SEEKHEAD_ENTRIES 7 @@ -1115,6 +1117,33 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, return 0; } +static int mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) +{ + int ret; + AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) + av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); + + if (dovi) { + ebml_master mapping; + uint8_t buf[ISOM_DVCC_DVVC_SIZE]; + uint32_t type; + int size; + + if ((ret = ff_isom_put_dvcc_dvvc(s, buf, sizeof(buf), &type, dovi)) < 0) + return ret; + + size = ret; + + mapping = start_ebml_master(pb, MATROSKA_ID_TRACKBLKADDMAPPING, ISOM_DVCC_DVVC_SIZE); + put_ebml_string(pb, MATROSKA_ID_BLKADDIDNAME, "Dolby Vision configuration"); + put_ebml_uint(pb, MATROSKA_ID_BLKADDIDTYPE, type); + put_ebml_binary(pb, MATROSKA_ID_BLKADDIDEXTRADATA, buf, size); + end_ebml_master(pb, mapping); + } + + return 0; +} + static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, AVStream *st, mkv_track *track, AVIOContext *pb, int is_default) @@ -1380,6 +1409,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(EINVAL); } + if ((ret = mkv_write_dovi(s, pb, st)) < 0) + return ret; + if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT) { track->codecpriv_offset = avio_tell(pb); ret = mkv_write_codecprivate(s, pb, par, native_id, qt_id); From patchwork Thu Sep 23 05:01:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30467 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp110750iob; Wed, 22 Sep 2021 22:02:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBpqpazwMJR2SGkiv/7Uq+Dma+qpUpfE58H4mddh6MfYNFwDWDLfSlFCDxlC0momX4Hj1X X-Received: by 2002:a17:906:40c3:: with SMTP id a3mr3096485ejk.38.1632373338837; Wed, 22 Sep 2021 22:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632373338; cv=none; d=google.com; s=arc-20160816; b=MXXqT1CCAFtf6bLCDDjQMN7U/JG1SoyAWQ+WnYg4IgvmrdpngHqe9lEjDJfvjc/SkX gQzWyHYq6/0TO/yabZOTy4eHZnkLX9IbhOQgEsSSQKP/M2fYsA+rTUN1IHEl7XHs4MnD 0x5PVA7ceb9bZedNXy94RSQJGCwXH+AutLidPQVLKa9a9GXIQyXPbzh8KqNdCCYKFr+u H2lNpKd7oYOOI1QPERGYRLnO4t1tPHfDbIEtCPQsvtjtaQPkSBLcFVwfxpS3MuRMNlGr +1Ko9KJcbTMOwZLd3v8mL8oAjJ7Ta7wVLiwn4LfVlVqZ1xAdMo1Ji0l0jyfpDBmFmpm8 lX1A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=EEDYTJ/YpoP3gFt5/UWrYty623jvn1aMAQXIbVSiOb0=; b=V28Xywn3VLBM0reks+uWSlPcq3p6/snt9sYvY9xgt5Olyaqyt3wkxO/9CQqRzYIPUV iVgj5ApE7TZW0h6eCudqWds5n23CTe9Wl6TY8E3P9cTaxKiHwmWhOtjq8h+rFyhTydN2 eX2DgJsnANbs5/06HHsVMf4CDodM2ljHLt3QmN8YHM6ublrmv5/ga4NM8Rr6D8OGLJjb E9xJAEMXIIzpVzYD46jzf2zwCW46ER7Cdn2+NhdsbJqJTEkbrfRZxLHAgCrDXQil1r8U 1rFNYkH3KQvfn9rEkK1u/9gjxnppJ5+sCk1IuvXecNs8z0/DwHD5Or9K5u3wkzpdOFiH JMuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iFKMwzP3; 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 f16si6176985edf.169.2021.09.22.22.02.12; Wed, 22 Sep 2021 22:02:18 -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=iFKMwzP3; 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 2D33F68A4E5; Thu, 23 Sep 2021 08:01:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 445F468A4E5 for ; Thu, 23 Sep 2021 08:01:24 +0300 (EEST) Received: by mail-qv1-f45.google.com with SMTP id f2so3485865qvx.2 for ; Wed, 22 Sep 2021 22:01:24 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=rjZG78zWeMWkGZfH8GFXMeNkxyAXP4Tk1eV+KnoBAmI=; b=iFKMwzP3/A4a9yX2UcxEpN3cLqPdO+kiK30G6AEaam9yDDSfcMY5qFSpm4wXK/w5hd NcJFcr9MTGm2jq+zsGEKGuDtwU5ya+zAXb1DP9OlO24azQh6YpOhy2pvMlMclRmT/T++ VVf31Razw42CoVoEEQJCbwweXDFkQtOD9CMSgxRCgLNr+ZFfMvjnBy4y1L28HWO9RBUF YFBKJlcKuJs4qyOplr4qGQ4xU+nc9+olPUjNIv1qD4v144jjG7kAYv1X0EECRQwFElqP JooPdYMSeWyc1BSMpWrM9fTebOu0DC66GKXc9hS0yc76ZA87XkXQdhoIOaVIkmrt0EA4 chhg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rjZG78zWeMWkGZfH8GFXMeNkxyAXP4Tk1eV+KnoBAmI=; b=tOXWTTX1ljOb7d23dqLN3LiYx2VRDYZ11WgreFHjcpJ88kupmTPyG3ZdWGb1TG7eIJ 4osxwRA0QBkwz5DPeIXVpMCi7V2kAYFdvuVF7S9fRFVMuKOfa4Z2laePbV2kkQ5yAFoB BZn40sVYTNS1sulu9542m4v3KMOsRdM7CNOkmv72qqq/Ycq+vYD6ULJeeRrNgq3zLrNq Az1KDdaF9uDovJB1t5fgI+Qf9c8lOeOEg6Hdx3vYqGe8Trr5UowLqUZJirOluR5RY7Nc ZFTDobbNRnIrlEiytNBHVjpyDpIe3mfQuCPlSsewSS2hR804VlBcolpBTt0FzFU79xtW /niA== X-Gm-Message-State: AOAM531ccZe+LcQvU+//LosjuSxPGtJYabblX2cVA2xzPeoZVgHdXpPz flpbRpvitUIS3aIFjKZCOPxMfJnsOCFH9g== X-Received: by 2002:ad4:54ce:: with SMTP id j14mr2688094qvx.32.1632373282961; Wed, 22 Sep 2021 22:01:22 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 22:01:22 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 01:01:08 -0400 Message-Id: <20210923050109.692356-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923050109.692356-1-tcChlisop0@gmail.com> References: <20210923050109.692356-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/5] avformat/mov: Refactor DOVI box parsing to use ff_isom_parse_dvcc_dvvc 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: fjmyjjXA9MR1 Read at most 24 bytes, but in reality only 5 bytes are used for parsing. The rest of the bytes are reserved in the specification. Signed-off-by: quietvoid --- libavformat/mov.c | 51 ++++++++++------------------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ca14646a38..07595ef769 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -61,6 +61,8 @@ #include "mov_chan.h" #include "replaygain.h" +#include "libavformat/dovi_isom.h" + #if CONFIG_ZLIB #include #endif @@ -6797,58 +6799,25 @@ static int mov_read_dmlp(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; - uint32_t buf; - AVDOVIDecoderConfigurationRecord *dovi; - size_t dovi_size; + uint8_t buf[ISOM_DVCC_DVVC_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; int ret; + int64_t read_size = atom.size; if (c->fc->nb_streams < 1) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - if ((uint64_t)atom.size > (1<<30) || atom.size < 4) - return AVERROR_INVALIDDATA; - - dovi = av_dovi_alloc(&dovi_size); - if (!dovi) - return AVERROR(ENOMEM); - - dovi->dv_version_major = avio_r8(pb); - dovi->dv_version_minor = avio_r8(pb); - - buf = avio_rb16(pb); - dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits - dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits - dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit - dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit - dovi->bl_present_flag = buf & 0x01; // 1 bit - if (atom.size >= 24) { // 4 + 4 + 4 * 4 - buf = avio_r8(pb); - dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits - } else { - // 0 stands for None - // Dolby Vision V1.2.93 profiles and levels - dovi->dv_bl_signal_compatibility_id = 0; + // At most 24 bytes + if (read_size > ISOM_DVCC_DVVC_SIZE) { + read_size = ISOM_DVCC_DVVC_SIZE; } - ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, - (uint8_t *)dovi, dovi_size); - if (ret < 0) { - av_free(dovi); + if ((ret = ffio_read_size(pb, buf, read_size)) < 0) return ret; - } - av_log(c, AV_LOG_TRACE, "DOVI in dvcC/dvvC box, version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", - dovi->dv_version_major, dovi->dv_version_minor, - dovi->dv_profile, dovi->dv_level, - dovi->rpu_present_flag, - dovi->el_present_flag, - dovi->bl_present_flag, - dovi->dv_bl_signal_compatibility_id - ); + read_size = ret; - return 0; + return ff_isom_parse_dvcc_dvvc(c->fc, st, buf, read_size); } static const MOVParseTableEntry mov_default_parse_table[] = { From patchwork Thu Sep 23 05:01:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30468 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp110901iob; Wed, 22 Sep 2021 22:02:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTve69Tb48K+7v/+qVE6Xy4Y2L0yMn4lslspd3nDN6cEmLxyiVKVzT2rD2WBeHKmdXM5lI X-Received: by 2002:a05:6402:1352:: with SMTP id y18mr3335708edw.122.1632373351165; Wed, 22 Sep 2021 22:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632373351; cv=none; d=google.com; s=arc-20160816; b=hqAadmCrav3PRg9+ZQ4A7rERpxtIXowgHAd59QeCkZojeTw1YP9kCyEZDU/OZp1nuf rvNsfGfGpZt+LnIwGcnMFVKC6axrtzrayDX0ePYwswJ2qTeuvakMmv5I8BAcOYHRQHIn dhhvXfKRqeO6eY5Y+72ORwg8HzyUq9GNG3yWQ98bng5gd60qaEjdwTIwvnmyyXfEBFM5 sBEBemp/u8BBh6eTGpz03pQgO9NYb1HkUx2b34g4Sb+e1VYtQoBsKdxD9aLFqDqXa7Ll cp04iKyiIsm0ahn+RzJiHkkcZ/J+TefgbwcEWte/o+Se2gkE8GjDvHEufuWlkxcSjtf1 /Ojg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=0mfn8bcvePGsA/a144xqiQRL20zeTaL8vzQJgKSKLbc=; b=Hwlvhr84cdFLiNmlVr2W73pEJp/4GlzbGDiSjWRRi4YTjylH7ws/TK6ucIsFIZse8C Mju1gn3qExUaD+5TBIiHnZsk/hoc2vyx7h/RTUtxHA7uZZ56jjM3WOh1PzqZUbEItmOO 5XbMKOkwa2eWsw6+BTT44vmrrR4k6SF9P8jZlfWbQz2+PahH5hpuotblmS0eVe2FTu0B gzKw2UxkSuv+of6mkRdPwbGMNpg+y/3iRVEE8S4DZ6ZPf0pNRB0ejKXQ1x0xDeLQ/y7S EM8u0ObI1RNxlp+lbum113pQV9XMRD65j/tsp4/4+tw8A4GiOSwHN32TK908WmMkPBtJ dxvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=UJ2bpglr; 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 j22si4676905ejo.706.2021.09.22.22.02.24; Wed, 22 Sep 2021 22:02:31 -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=UJ2bpglr; 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 71DE168A6CD; Thu, 23 Sep 2021 08:01:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB94568A4C5 for ; Thu, 23 Sep 2021 08:01:24 +0300 (EEST) Received: by mail-qt1-f181.google.com with SMTP id e16so4989041qte.13 for ; Wed, 22 Sep 2021 22:01:24 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZKdqrn78xX4MQ1KB5xCUqaPqXmMaMFjvTAsUyoWfmeM=; b=UJ2bpglrDYB3Ii5VZL9xc/8xfvyaofm7Ze3kyvZpE3bGH3zLxGhZN1/krS/x57AwXg tuDC7miFeHBpmEVn19k/KitfzQYFJ2cXCEidL9Oj86PNECdJUnkq6Pbn6OUEpntZEvDm puL0PTDaROPh3DsithwQ07Egb7D7pkjYfA0g4JmJyq1fbfq4LHebE5ivGqZmqaVEz494 5sI+gtM0nQpyKBW2p5wLVGE2ZjE86ISPiV5YR1PyCzusTEjJ5rA8F9PAFanE/tae1nSM Bu+QayVom9eAFuJM4xELmnummtzz68jtBZsFDKEAXcg3ZJKUuf5iTNkq4aWXWTl/86yC pPvQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZKdqrn78xX4MQ1KB5xCUqaPqXmMaMFjvTAsUyoWfmeM=; b=0P8Ra/cvfVUVppsIdHMKEgdHlXZAQ4SgUWvJnfjPpgdNpGYniHhOwx9e/+fu6yfeKu /DhilisfUv8GnbfWlQ4A7nIIYRFTCXgno3+4d4VSWRJELnBJeM7Kgld1LZ6JGB05qyo+ QBNyWbJvBAGczkMWSDddpg+NCnVdnhOOAqbT6x77UNr8KA+ug+OjbtztEwAIByEAB3lU eIXSO8rqXBkFRPrtiO5Qum04pQAyw82T/R1M7S4zGpA6a9HJRwnFaYyoM6NQ9FcaSRyR 4vcB/hNhPInxt+KpwOmsPMKonGbbRnn9u9M/yHoL98sUPSk0H1IG5wm8oYGlayIW96Zm M6aA== X-Gm-Message-State: AOAM531rbA+aG3eQ1VySnXrIW8tmbTf/9+yRN3z9ONUtPAmlDiHK7DTQ P2R4uthcWVxpwSF5CrlZNFATbm1WyjAvEg== X-Received: by 2002:ac8:5492:: with SMTP id h18mr3092874qtq.152.1632373283417; Wed, 22 Sep 2021 22:01:23 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 22:01:23 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 01:01:09 -0400 Message-Id: <20210923050109.692356-5-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923050109.692356-1-tcChlisop0@gmail.com> References: <20210923050109.692356-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/5] avformat/mpegts: Refactor DOVI descriptor parsing to use ff_isom_parse_dvcc_dvvc 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: QPa3lAWmSLTi Signed-off-by: quietvoid --- libavformat/mpegts.c | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index da8eee2414..75ef59d186 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -39,6 +39,9 @@ #include "avio_internal.h" #include "mpeg.h" #include "isom.h" + +#include "libavformat/dovi_isom.h" + #if CONFIG_ICONV #include #endif @@ -2162,49 +2165,10 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type break; case 0xb0: /* DOVI video stream descriptor */ { - uint32_t buf; - AVDOVIDecoderConfigurationRecord *dovi; - size_t dovi_size; int ret; - if (desc_end - *pp < 4) // (8 + 8 + 7 + 6 + 1 + 1 + 1) / 8 - return AVERROR_INVALIDDATA; - - dovi = av_dovi_alloc(&dovi_size); - if (!dovi) - return AVERROR(ENOMEM); - dovi->dv_version_major = get8(pp, desc_end); - dovi->dv_version_minor = get8(pp, desc_end); - buf = get16(pp, desc_end); - dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits - dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits - dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit - dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit - dovi->bl_present_flag = buf & 0x01; // 1 bit - if (desc_end - *pp >= 20) { // 4 + 4 * 4 - buf = get8(pp, desc_end); - dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits - } else { - // 0 stands for None - // Dolby Vision V1.2.93 profiles and levels - dovi->dv_bl_signal_compatibility_id = 0; - } - - ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, - (uint8_t *)dovi, dovi_size); - if (ret < 0) { - av_free(dovi); + if ((ret = ff_isom_parse_dvcc_dvvc(fc, st, *pp, desc_len)) < 0) return ret; - } - - av_log(fc, AV_LOG_TRACE, "DOVI, version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", - dovi->dv_version_major, dovi->dv_version_minor, - dovi->dv_profile, dovi->dv_level, - dovi->rpu_present_flag, - dovi->el_present_flag, - dovi->bl_present_flag, - dovi->dv_bl_signal_compatibility_id); } break; default: