[FFmpeg-devel] [PATCH v4 1/4] avformat/dovi_isom Implement Dolby Vision configuration parsing/writing
mypopy at gmail.com
mypopy at gmail.com
Mon Sep 27 06:09:58 EEST 2021
On Mon, Sep 27, 2021 at 10:57 AM quietvoid <tcchlisop0 at gmail.com> wrote:
>
> 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 <tcChlisop0 at gmail.com>
> ---
> 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 */
> --
Patchset LGTM, thx
More information about the ffmpeg-devel
mailing list