From patchwork Sun Dec 5 17:35:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32011 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3509372iog; Sun, 5 Dec 2021 09:36:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxG/LgSdjryTyzUsVD3b7brDEEF31eoipiqtyzgJaQwvWzu2rS045V0vsQc+x6etHAsb8c5 X-Received: by 2002:a17:907:9156:: with SMTP id l22mr38534836ejs.220.1638725777050; Sun, 05 Dec 2021 09:36:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638725777; cv=none; d=google.com; s=arc-20160816; b=W0nWDS3UG68vgNe3wZ5J3zNm3NI3dd5277DctUTr2/RN5fsHBLslng1i7CUoDKSArF CelpTBFLZnYQVsf+or20dJ6mcAWZuxSnlAoDs9gUwrCaZH4Z9/NHZLkWENZWpuilekDe 0vjePbURQ7TEo1Fk5BsoQ99i/QSAnQFo7qqvP9sqySl22fv97aYVzQNbNg85iuxSs/y5 xgZA/MI8FP9h/S068xnMUpCZbv8ZEzqysWflQR/mUbSqeepNLPe87N6wzbJzog88eYX9 OQCE/tHaHZjwH/K+5qi/840R2SKU6ll8Tx4W8Hc3VNYss/fQybyQy9c92Oo7a+mfIx0g /0PA== 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=0dnOduIjWN6Uxm/J2nfWkvi5C2ye6BtvgcqqLbou9B4=; b=JjxJl/LEv0TfhcJKrOBAQtJMkkpbmECNN6DAHzS5ZBBw3x9kZ9LhNjNFcktmb5Wm54 728UwfO7EWh8oKJYpFurxmipbxDgsHMbnbrj0S7ifdvtsN3aO1zHytsoLbJtL2+co5pV 9mspJo9ESv4T5ouaOlyuuCjrG2yOBLcIoM1vzkDYG5CjattaE1rkk1zcX9Mv/Jxhp3Xb OPqZbdCkAICCy0RB9fd50jeZ0vxnYa/ngn4bnsIfi0kTC2AAYsSNIacohn89KeEsxl4V ugouOy8a6vrGfvf4s+xCqmCUKo2Gi4SNXD5nCe81gq56zvx4h4ZGhP1mNkn72Uy/b2VX 1mMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=imIP8c1X; 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 v22si14861608edd.192.2021.12.05.09.36.16; Sun, 05 Dec 2021 09:36:17 -0800 (PST) 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=imIP8c1X; 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 7B51068AF42; Sun, 5 Dec 2021 19:36:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CA1B68AECD for ; Sun, 5 Dec 2021 19:35:55 +0200 (EET) Received: by mail-ed1-f50.google.com with SMTP id o20so33526490eds.10 for ; Sun, 05 Dec 2021 09:35:55 -0800 (PST) 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=+RF1gT2v1RF80n2S5tjnMfoz97mllzHS3iRtK0mz7bs=; b=imIP8c1XgVItj1CyqNiQuDzrEVxgNmJeonfLtHydR0Spu1apBy2o7AcJQhl9ZIbCID p+3gOi6FFDcru106YHaQp/jR8oIAtQmuk5RWBIGaiDew8/I35t3PYtY74YKzKwop8sLH YE9sVdWhL42/SPYd3ukQ/g2BaOs77ArUrB7o9FEZ4V51VyzCf8dSnSWuAIYtDd5Zqh8m 4EtrUqjReOoPoOIPvrDdnXIzFdZkAkZXUvsujAzokYgVgT8VQZgwteTQdBZb9oTcJmxr SHTRULvTR9gv6nNOA46Z6k8JxbjiNiz5YpkpbMnHeGSsBP0DMjuDcllxkIKaL35FZagb r/UA== 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=+RF1gT2v1RF80n2S5tjnMfoz97mllzHS3iRtK0mz7bs=; b=HylIcbr2Z2d9dc/SnYukAOUz62zJ2Njyh/zctXdul7BR/knaZn0WF13ovBmjJrwURc Ya6CihLgHXJfsLFEtHHxE0fPvxtq7pJhbGFSxF0TQndvhmhmAEpx1mDrdFLNVwaZkxQO 8Rjtc5bCXSJqwbd4RVjVfSiDIc52lECPO5uhWHFLJC/DpxYcnx5UUYKJKj2oxXRQyNns hDdD5BRNw4saIfcAIsNLUvtrHu/1T9Sq/D8oalQZeBRpmVuxthts9pd+rLFOXIq+hPkF XHEDljEHHyjbNA+oMzJKYkVlHb4PP9/pYEXvIWbCPogGPmbBrAFzjOZbkqEO63oBVd3e mLNQ== X-Gm-Message-State: AOAM530BfA/CIw+dgOTsHvknGb8iXkuY8mP/hMzCHBJmvqbOhHOVRtdB GbZ9w4jOnQ+uk6uErarmNa4YIXdzB/CDsA== X-Received: by 2002:a05:6402:5146:: with SMTP id n6mr46778480edd.126.1638725754665; Sun, 05 Dec 2021 09:35:54 -0800 (PST) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id h7sm6312352edb.89.2021.12.05.09.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Dec 2021 09:35:54 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 18:35:31 +0100 Message-Id: <20211205173535.2306292-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211205173535.2306292-1-tcChlisop0@gmail.com> References: <20211205173535.2306292-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 1/5] avformat/dovi_isom: Implement Dolby Vision configuration parsing/writing 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: HWOTaZDlTP+T Both parse/write implementations are based on mov/movenc. This only adds support for the "Dolby Vision configuration box". Other configuration boxes, such as "Dolby Vision enhancement layer configuration box" are not supported. The new functions will be used to implement parsing/writing the DOVI config for Matroska, as well as to refactor both mov/movenc to use dovi_isom functions. Signed-off-by: quietvoid --- libavformat/dovi_isom.c | 118 ++++++++++++++++++++++++++++++++++++++++ libavformat/dovi_isom.h | 35 ++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 libavformat/dovi_isom.c create mode 100644 libavformat/dovi_isom.h diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c new file mode 100644 index 0000000000..262d7e37ba --- /dev/null +++ b/libavformat/dovi_isom.c @@ -0,0 +1,118 @@ +/* + * DOVI ISO Media common code + * + * Copyright (c) 2020 Vacing Fang + * 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 "libavcodec/put_bits.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 in dvcC/dvvC/dvwC 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); + + return 0; +} + +void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], + AVDOVIDecoderConfigurationRecord *dovi) +{ + PutBitContext pb; + + init_put_bits(&pb, out, ISOM_DVCC_DVVC_SIZE); + + 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 > 10 ? "dvwC" : (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); +} diff --git a/libavformat/dovi_isom.h b/libavformat/dovi_isom.h new file mode 100644 index 0000000000..1526164319 --- /dev/null +++ b/libavformat/dovi_isom.h @@ -0,0 +1,35 @@ +/* + * 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 "libavutil/dovi_meta.h" + +#include "avformat.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); +void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], + AVDOVIDecoderConfigurationRecord *dovi); + +#endif /* AVFORMAT_DOVI_ISOM_H */