From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5C6AF40ED2 for ; Sat, 1 Jan 2022 04:18:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDCB468B0C7; Sat, 1 Jan 2022 06:17:58 +0200 (EET) Received: from mail-ua1-f47.google.com (mail-ua1-f47.google.com [209.85.222.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1185668B0A8 for ; Sat, 1 Jan 2022 06:17:52 +0200 (EET) Received: by mail-ua1-f47.google.com with SMTP id u6so42047736uaq.0 for ; Fri, 31 Dec 2021 20:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=sQajd01qhBHyjRWRpXd7nNnYa0JCThy1sygyBYmCDvg=; b=SNr9knBZvoJU1l2MfeN5OFu0VASyd4RmGuchCTukzRhoHgOKtAEep1IIa1BK8IIv28 CdKnXGfETBpyrHm0wqM9w7Rn31mVPtc/KesXDa2f90+8ulfz7u/PYmJISoYznDZXQ3wq dADmvp207Vv2vPD8fNvgx9Ul0kb6I6CsIi8JD59ZpVwp7YcjzMRySV2/PxDL0ohUTO7N NEp2QjNQonx818S1hDGHV9djO9yoD946Dkz9tgVvu2p7F7PoJSQvEiKmfHMu3md7P7Vy bZh/sK9Wn6KB3dm+AUfOx2IpmJYRQiJpKNGYW3GKFNy09kdK5wI4RCM7OefWeeWtbshC MPYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=sQajd01qhBHyjRWRpXd7nNnYa0JCThy1sygyBYmCDvg=; b=tOTq+u/haoYnbnmwZdrI312Ov0OXVg/PhGT7+FevuyNCFm5O7WBWbuvE6r+Uecu7n1 L8wdkDFpg13QSBKgeTHcwDZK14fe9XMvt4OW9QY+HbG/wuxTx1+JVTF6U1p67rRtbTxQ jHqrkheYoOmMxmnhNf4VMLaPFr2a6q8Lbbct3Gh+ZL4Qy0HS+KIyYawdoihxBeJyxbqq utab07fwbS4suJqzpaAugpNSp3owwyZEPQOjOWSuKgOmyNLaOZR+5k8bdqNvQQJnj8gy QPPG1mAAuPU37h5vPvYEfTiaBXWDUyKYOh7VdWnuAsz9XnEVdxBZweM8dx9wpB9m3+0X BdVw== X-Gm-Message-State: AOAM531pcrjPZUMxPg2CZE3RrryvL6qGI0+64yl7pekhw/BY1Ck6lER4 gVDEhrNesFw+c/cO4HOybOtNII7U6ONt7J+qWkfEB2o+Mv47tQ== X-Google-Smtp-Source: ABdhPJxMdSs+2ORYKB7iNOo6R61yZ4GzOMbwvd0ZfmzCoNO8nUfizWbiBcDCR4/a1ZniNP/QFtV9+X4dv7e4kSUnUQ8= X-Received: by 2002:a67:c81c:: with SMTP id u28mr12219029vsk.71.1641010669548; Fri, 31 Dec 2021 20:17:49 -0800 (PST) MIME-Version: 1.0 References: <20211214153001.2610297-1-tcChlisop0@gmail.com> <20211214153001.2610297-2-tcChlisop0@gmail.com> In-Reply-To: From: quietvoid Date: Fri, 31 Dec 2021 23:17:39 -0500 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, Dec 31, 2021 at 9:16 PM Andreas Rheinhardt wrote: > > quietvoid: > > 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); > > There is a slight problem with the last six values: They come from the > user and therefore must not be trusted to be within the range they are > supposed to be. (The put_bits API uses an av_assert2 to check that > the values to be written actually fit into the amount of bits that is > used to write them.) So I suggest you use !! for the flags and > appropriate masks for dv_profile, dv_level and > dv_bl_signal_compatibility_id. Thanks. I used the same masks as in the read function. Updated along with the fixes for the other patches in v11: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-January/290611.html > > + > > + 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 */ > > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".