From patchwork Tue Dec 14 15:29:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7121200iog; Tue, 14 Dec 2021 07:30:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdtOjiRYb1ZiiNlG3B2FlBW63ZEYvFP8mYkLPjGiXhEbKBMopHc4wGZzb3QDjNGtBdYaVV X-Received: by 2002:a17:907:a0d4:: with SMTP id hw20mr6301884ejc.16.1639495839376; Tue, 14 Dec 2021 07:30:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639495839; cv=none; d=google.com; s=arc-20160816; b=OifFZ8cyUcUQTQNrXVphI5jhmVwUEEoP7igxZ3NBzpjMIUG031U0OwXCafp32xw3ii iNz0ATDs5ISUI/c/AV2AmXm/ann5c7B4VQjme04CTVKHEsU04mG4PAGIZ58cDFIKUsZ7 HKi8UapmdxWubLXrDdf/RaRlyAPn+Uhr1V7X9ccJtiAUQwC37IauDW1CSrqfH/GyB6Dx 3KV5ftYO1ZVZ+Kc/4NVirKiKs6idjFc8FTBlKo7yXKLfm/9eGgTHKWj18qv3e3XCjuaH qsVOG5aXYagrzc3nvn5ybxx7XKiaykZUTO1e/szj+/EQO+rgYebILiARoR4UPpbsFsjo k6GQ== 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=CcqsOaE+LtveikOAT+GyDbSCLxyY19qQGJI+g8cmZ8xG0taDxGgD38wJj3e5rQavNM Tr0x4loF7jTuswG2ngCuJQ5zUlvJUFnKsXY6oNz7baKhQJ+fMgxiwwY/FwKiQGD97EId IlQx6u5dJsxLqO+ZhG59uCf59LQIhqxi0mJG6Jfmy+e2TLhQL3gIbcRGhhg6tikvf4Vj 0o1dWBznCLhFsZcWa9hqDjRsuoGXfiqzgGulkZJfOaKfXTb1X3Yy1qXREtZtptN01Zbm l2yyOPKHDCixfpYJyrJSGhx1umPM5WxSQWsSLcQLd8+/RWnaDfZngSCuKI1VZgd4PcUA vffA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pmatcqjp; 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 sg18si304992ejc.241.2021.12.14.07.30.39; Tue, 14 Dec 2021 07:30:39 -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=pmatcqjp; 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 B5F6268AFD0; Tue, 14 Dec 2021 17:30:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D15168AF9F for ; Tue, 14 Dec 2021 17:30:21 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id o20so64727597eds.10 for ; Tue, 14 Dec 2021 07:30:21 -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=pmatcqjpJvQiZblSIAKP8QEoHvKFE+gsp7NHEwuKxpyENW3Ld6PrSZ2zNoWxpSF09Z R6b5qLIYAthxOftUbwH8UWHqgOaKizPP2JcLUcpFEE6BktDOlqFrWqLkcOcjBmnx4OAr 044pAnH4RTFy9KuewcjKrJANzb2FQF7iCAiwjVIP6JHj3xqybadNedvRp9lzPoYhfkLZ kYtibFHdqE3OXx6GnaszwLJ4W0nVxaKmiiOZDC7q6zSvX3D5SrDeWYXM5hsY7M6EX0Mp yqI5kPxru+MWBO9VPVFXzK6Pt8f9SZQCIIy1Jqv+u51Hxbcqc+/NHHQW/zxwYjPQffoP tmLA== 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=PTXYWJSiJzMJJWovounzbOkkDek5Qn8zVzM4Hz2y9UFeTvkwg1a+WvHxUhBuAgFylx fNCKaCs+E99VvcYQGm7tE7UVY4eqT5C1XmI5AXKlO0ovR5ezSgHFPoxKpueQhEOaxKBB Q4vqTfFpy90EMhoKKPS1x+qLShM9PWsOdsTBXtd5be5UZiQx4pdTdtGKnJVTKW9moXbQ BiUvjRu9R25h3V+viPaRcKUiaQ8NiGOkHsyBxFD21lmwM6yltn9fFnBnxbLdciBoGOJu cQ8UhxgblUtNmo1SGzwvA5Q9tBs9FfrUlUjKcGwtZwJqbUyUadkHnrYqdbqCb0UyH6gm V7Vw== X-Gm-Message-State: AOAM532MQ2B6JiWGVnED2mPMGEXqQ58Cyn2SIev23eVtOs73oGrzTocb e8yozS8Sf9PqEy33yw5bsIJmDZkg2fw= X-Received: by 2002:a17:907:d90:: with SMTP id go16mr6545033ejc.137.1639495820138; Tue, 14 Dec 2021 07:30:20 -0800 (PST) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id p19sm22062ejn.97.2021.12.14.07.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 07:30:19 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Dec 2021 16:29:57 +0100 Message-Id: <20211214153001.2610297-2-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211214153001.2610297-1-tcChlisop0@gmail.com> References: <20211214153001.2610297-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 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: 2w+cMWv/eMx7 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 */