From patchwork Mon Sep 27 23:16:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30611 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp4626486iob; Mon, 27 Sep 2021 16:16:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuW6xUrK2SuXK9uYRc1zAWMelL38WlAZ4+jRf/SRlpXGO6SG3UCGVARsvna0zKP1flMN2T X-Received: by 2002:a50:9d42:: with SMTP id j2mr3589112edk.7.1632784614660; Mon, 27 Sep 2021 16:16:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632784614; cv=none; d=google.com; s=arc-20160816; b=Am3eSrCG+11c7ciRnPrrvqHskcg/mdSDpSrbqPrx1b7dvdrEXDLbvOQXYb9G1vUeiW mD/z5wvj2xlXwKoBGkzMRfH8z69sqJLvC1y/Q+1aEebR+ZGRDg4Yr3wbAt1uXzWHg3bt KspHqjM6pdUeFW+R21S/SESnuTVs5GJK0VRfgmksbTZdLhMS7P1M/sMzlSC+RLvfXSB5 uWQaU9PkQ3QqS8ODmOGMU2/fmzgCyFIxzr1cRUnMsWuhEFNspcVEK8FcDKThlb/Yv3kU Dou6K0XR2utRlxUXOkWkaD4hVAwcgM2b2tyz2OJj8ttRnEXmesOMg8stTPiASaK6S+YS iKUQ== 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=kE+VgK2P50/G1c93uUluYl/7ZeqAnUhjodAwsaXrJGM=; b=HswfE10O3GdpcYFVAH+WM6blvszUYqCjRCCqz8eGTG0u7BtJEx3i4wlIJceRaOKfBJ nQSLhBPyQLO5aNIjSbupcKEU0lcECEHRaN2/GWsHxMOq8WWh0Ncz03xoPQWf4E4L1xT1 NMgFgW5M7N7THRoY4sD/SJEy8xNCEJfOvPV54UwW4LylZx3hx8H/EwyqiDoLa9SoSux8 nVxQctO1AiwZu8utFcNCOBs7ttfvTfsbQ9G0qCntSPZfK54PZMc83uY+AlHm+Y6/lGOX 1RpcnhM7yXaNN5ifJFsNX9p9QjOwP2fzkTHSYhsKA08e+Fgc1rFXEDpKrlw8FFUAQvWO BKSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=npPKdGHZ; 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 l17si20590482ejh.84.2021.09.27.16.16.53; Mon, 27 Sep 2021 16:16:54 -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=npPKdGHZ; 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 658A16898E4; Tue, 28 Sep 2021 02:16:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD056680867 for ; Tue, 28 Sep 2021 02:16:44 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id w29so54541772wra.8 for ; Mon, 27 Sep 2021 16:16:44 -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=Hbn0SFfWZuYul5OfcUCO9oUBw9gtoMYuUYxhOzK4r4Y=; b=npPKdGHZ/lrJEwzba+ApwB8Vbg0vFDGbFA1jfiSZ4SelVjV9ilXxyCKkjufXZlDME5 PLuMlRfDaB3kaX02YYVJYmotAKOzcI0Lcd07dCFaNU59PEbMlnKaVsumIWS3y85uxtVx YjakuLGkJ+m/q9FuOxZFRnU8DAw2V1hgJkfJwL/oa1g3wTWrPy4yRKiMcTs2/NbtEG7S 8eAE/rIp8+O6YJ+35UjvRXmSDKs3IhClciiHhuq72IIAHv+tY+OxWe9leE4PObSN2OqS t8R16Y+jq+ETyyasbfEygrIDxwbMJD/glag/0ARfEACEuh94J6fvrfXMEw9unTFmcGKT Pplg== 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=Hbn0SFfWZuYul5OfcUCO9oUBw9gtoMYuUYxhOzK4r4Y=; b=Zh7EgoE8ETlV6M9vw8zhAk3GAilY8Nk5hHdNGLaL+w7uMHZKUO73ZiTwN0pW6jh8Yx /mSXaRA2m1L1yJJgjac3+b6P3pEfY3jaBEq1PVwxwHxMvZJJqqWnn7671UAn7a6robuP cxcaS1LrtXr6y8UCyX9XE+iPiJe+kQBXafG9RLkX4/zRfvdYbAQMjoGnvGU510ff6cAp mHYUmN05sEJBa8DDhYmYjphHXWGxs8O6T0Y7jMmqozbHsoM5SNjD3jtQc3btOXl7xccm mi8m8wnbKct6HJLeG47jOxQJLUXMf0RT7uLLXYsq8V61rGusKjRcIUt97limKKL0W6Q+ HEog== X-Gm-Message-State: AOAM532eo1nV9TETcUg1DOtgXphnhEwBtlU/gIKasRCgk7EEKNYShFxh Zl7VQ9Aw+BgHxEq1IbixcWU1iSRH3rZCPQ== X-Received: by 2002:a5d:5746:: with SMTP id q6mr2794952wrw.434.1632784603671; Mon, 27 Sep 2021 16:16:43 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id l6sm948730wrm.64.2021.09.27.16.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 16:16:43 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Sep 2021 01:16:29 +0200 Message-Id: <20210927231632.306250-1-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/4] 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: HCNEBEaPj40X According to specification "Dolby Vision Stream Within the ISO Base Media File Format Version 2.2" 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 MOV/MPEG TS to parse the DOVI box/descriptor using dovi_isom. Signed-off-by: quietvoid --- libavformat/dovi_isom.c | 120 ++++++++++++++++++++++++++++++++++++++++ libavformat/dovi_isom.h | 35 ++++++++++++ 2 files changed, 155 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..747ffc8b2c --- /dev/null +++ b/libavformat/dovi_isom.c @@ -0,0 +1,120 @@ +/* + * 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 "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, 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; +} + +int ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], uint64_t size, + AVDOVIDecoderConfigurationRecord *dovi) +{ + PutBitContext pb; + init_put_bits(&pb, out, size); + + if (size < ISOM_DVCC_DVVC_SIZE) + return AVERROR(EINVAL); + + 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); +} diff --git a/libavformat/dovi_isom.h b/libavformat/dovi_isom.h new file mode 100644 index 0000000000..8ff59ef495 --- /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); +int ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], uint64_t size, + AVDOVIDecoderConfigurationRecord *dovi); + +#endif /* AVFORMAT_DOVI_ISOM_H */