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);