From patchwork Sat Jan 1 16:51:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32992 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14862786iog; Sat, 1 Jan 2022 08:52:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVIh0LjDTQCyUyRP51fa870UkGDqnCOOgG9sWBXMgSLKBYZqxXQR4ZwRGm62XVlNO8mu/R X-Received: by 2002:a17:907:96a0:: with SMTP id hd32mr30490820ejc.677.1641055936378; Sat, 01 Jan 2022 08:52:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055936; cv=none; d=google.com; s=arc-20160816; b=TV7iZARuRAE8fcHOY5o1CBdTRTeYg9goDdBhnPkqPCpcMUCBBVcNOkxtKlQkCxZP5D OLabXh93D9l74pZrUTN3vatVEyHeyTrzYL5ZvDaGfzgn8gQUXFNBgTlGerfLbZdrmg0W jp20B2HE7kab6RBon//3UVtE3wepaGTXPJQbPTmT/Sm8pNj/3qrfM6/y51zwq1YtmpXr Lr5FBxyi5eA2WvhV3n0CBA6dtF1rXGGKivseMxNRuYsnNlPhVgCOtKK6ylVqYFtdVgzc svL/EttOchMixa6Zu1swnataQg9PPhwZS7Gw5zmno3g34Cy3mQ5tQT8LtLrcskNYcHaD Ki0Q== 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=0dYtlbNYjWlepiBHZ2a81qgDHUdHQhsuC5SfxI/JOzc=; b=LnZf4OtmxSHToIy6p7l96nIynsAwPUGLtDPXnEWYLe5TV60V7FEYdJmnpzQAjJuwtg TZ4x4arB++ysO0UqJoLf2158Of855EXmkbdsZv47Lt8DnPIz0CFbA+GrPcSmaBZUx0Oq 7NAei/uHmx0vAIz+Y7bFdeCAvOZvQ9sCedWh/kfXq/ajMZHDXxE9E3GK1D8+HAUJA3Iw reUz0k9p7PzZKK9qRhyinh4zXBVAHkCMIzn9cMGOsr770r6SZHJR3IviFJoZm7024vSN HBJZHBTgRX7+TmitFHexK35OIlDBa3Dn+q0wnsXJof4qIykh3SaD8UNMinqLh2GFbYm6 shEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HFjK7Rbz; 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 ga19si14935382ejc.751.2022.01.01.08.52.16; Sat, 01 Jan 2022 08:52:16 -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=HFjK7Rbz; 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 82E8E68B123; Sat, 1 Jan 2022 18:52:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8D5668B0DC for ; Sat, 1 Jan 2022 18:51:58 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id bm14so119197923edb.5 for ; Sat, 01 Jan 2022 08:51:58 -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=ppbzzMPoQ4+GXkoF0Qk6Dv0DYRMHOhTLXvDtY4A8Eoo=; b=HFjK7RbzIBrRMqyQHMxym87J+DMROfk9Ql/Sj9Ltgu5c9NA+i1d5cK0e7bzn6+AGNU GWqzvIw6N9lIa10UKT5HKxpSAFFw/jUQoc/DOFE++Px37WmOvnzYUjpekA0K0YVtMUkb xep995fKoReDQLKKOuKfDaJpRdW2iiKzL+ChLtE4M/zB+JFS9XabMSohKh0LVLwlhNYu 3BgVnCcIEFgPL77KbrkB+YF9VvqIjR1bpYHqFa/lEJjoa42kb4+HFwA1l3SRukgOZIX6 ydiDYKXYauC/N2oxiFEciStyX2KtJxRs3qU1HrDxd3JBOxXWhJ4A56oXrVcq9wRskzwX MBJg== 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=ppbzzMPoQ4+GXkoF0Qk6Dv0DYRMHOhTLXvDtY4A8Eoo=; b=xpV1aAGW9qYb0gtTl3sNAqTysOXQ/lOjK8IWQDafo5O4s8uxlPFXkcSfnOFvryM1nF 7i7GgRiOTpFd8Tlm0GzUHFrQvtNdBhNe/PSb+zDDs9Jmn5JewnxPw6+H8FhbjYkn6Eqi flw3Zvu9Cdam3lEARwHRSm8dvKHODzcpKy5jdYXbx9DJbMy9jKoRJHa88VjP8Dzfmbb+ 0KSWmSLg+EZYB+X5jqpbGklapA+iXmXtHzG5/qHpmdrjUrPbDwpWCSrbxX4+3Se8b/oi MQXgr4rf3vbOwhhmJsAouNBj70iNDFcvSyWNSQ/MoxohYtUW9teXrfuQUIuMIh439OZk AiYQ== X-Gm-Message-State: AOAM53090+ZeuOw8OXfKICVCaQPWyxXbw0bdvGzW7If+rKAP0KoZrun2 lnzA/jLpFTF4YPFqdm/QhJbliHayjIxE5A== X-Received: by 2002:aa7:c941:: with SMTP id h1mr38985087edt.319.1641055918182; Sat, 01 Jan 2022 08:51:58 -0800 (PST) Received: from nark.. ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id gn8sm9280298ejc.23.2022.01.01.08.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:51:57 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:51:49 +0100 Message-Id: <20220101165153.440729-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220101165153.440729-1-tcChlisop0@gmail.com> References: <20220101165153.440729-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 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: Bz2XeaAgP9cj 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..76681b9451 --- /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 & 0x7f); + put_bits(&pb, 6, dovi->dv_level & 0x3f); + 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 & 0x0f); + + 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 */