RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-19 13:27:00 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/libsvtav1: add support for writing out CLL and MDCV

Browse Source 
These two were added in 28e23d7f348c78d49a726c7469f9d4e38edec341
and 3558c1f2e97455e0b89edef31b9a72ab7fa30550 for version 0.9.0 of
SVT-AV1, which is also our minimum requirement right now.

In other words, no additional version limiting conditions seem
to be required.

Additionally, add a FATE test which verifies that pass-through of
the MDCV/CLL side data is working during encoding.
This commit is contained in:
Jan Ekström 2023-03-10 00:56:00 +02:00
parent 8f4b173029
commit f4b89b6e54
3 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libavcodec/libsvtav1.c
View File

@ -27,6 +27,8 @@
#include "libavutil/common.h"
#include "libavutil/frame.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mastering_display_metadata.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/avassert.h"
@ -136,6 +138,71 @@ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
}
static void handle_mdcv(struct EbSvtAv1MasteringDisplayInfo *dst,
const AVMasteringDisplayMetadata *mdcv)
{
if (mdcv->has_primaries) {
const struct EbSvtAv1ChromaPoints *const points[] = {
&dst->r,
&dst->g,
&dst->b,
};
for (int i = 0; i < 3; i++) {
const struct EbSvtAv1ChromaPoints *dst = points[i];
const AVRational *src = mdcv->display_primaries[i];
AV_WB16(&dst->x,
av_rescale_q(1, src[0], (AVRational){ 1, (1 << 16) }));
AV_WB16(&dst->y,
av_rescale_q(1, src[1], (AVRational){ 1, (1 << 16) }));
}
AV_WB16(&dst->white_point.x,
av_rescale_q(1, mdcv->white_point[0],
(AVRational){ 1, (1 << 16) }));
AV_WB16(&dst->white_point.y,
av_rescale_q(1, mdcv->white_point[1],
(AVRational){ 1, (1 << 16) }));
}
if (mdcv->has_luminance) {
AV_WB32(&dst->max_luma,
av_rescale_q(1, mdcv->max_luminance,
(AVRational){ 1, (1 << 8) }));
AV_WB32(&dst->min_luma,
av_rescale_q(1, mdcv->min_luminance,
(AVRational){ 1, (1 << 14) }));
}
}
static void handle_side_data(AVCodecContext *avctx,
EbSvtAv1EncConfiguration *param)
{
const AVFrameSideData *cll_sd =
av_frame_side_data_get(
(const AVFrameSideData **)avctx->decoded_side_data,
avctx->nb_decoded_side_data, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
const AVFrameSideData *mdcv_sd =
av_frame_side_data_get(
(const AVFrameSideData **)avctx->decoded_side_data,
avctx->nb_decoded_side_data,
AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
if (cll_sd) {
const AVContentLightMetadata *cll =
(AVContentLightMetadata *)cll_sd->data;
AV_WB16(&param->content_light_level.max_cll, cll->MaxCLL);
AV_WB16(&param->content_light_level.max_fall, cll->MaxFALL);
}
if (mdcv_sd) {
handle_mdcv(&param->mastering_display,
(AVMasteringDisplayMetadata *)mdcv_sd->data);
}
}
static int config_enc_params(EbSvtAv1EncConfiguration *param,
AVCodecContext *avctx)
{
@ -254,6 +321,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
/* 2 = IDR, closed GOP, 1 = CRA, open GOP */
param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1;
handle_side_data(avctx, param);
#if SVT_AV1_CHECK_VERSION(0, 9, 1)
while ((en = av_dict_get(svt_enc->svtav1_opts, "", en, AV_DICT_IGNORE_SUFFIX))) {
EbErrorType ret = svt_av1_enc_parse_parameter(param, en->key, en->value);

5
tests/fate/enc_external.mak
View File

@ -2,5 +2,10 @@ FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 H264, MOV, H264_DEMUXER) += fate-libx26
fate-libx264-simple: CMD = enc_external $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv \
mp4 "-c:v libx264" "-show_entries frame=width,height,pix_fmt,pts,pkt_dts -of flat"
# test for SVT-AV1 MDCV and CLL passthrough during encoding
FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MOV, HEVC_DEMUXER LIBDAV1D_DECODER) += fate-libsvtav1-hdr10
fate-libsvtav1-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \
mp4 "-c:v libsvtav1" "-show_frames -show_entries frame=side_data_list -of flat"
FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ENC_EXTERNAL-yes)
fate-enc-external: $(FATE_ENC_EXTERNAL-yes)

14
tests/ref/fate/libsvtav1-hdr10 Normal file
View File

@ -0,0 +1,14 @@
frames.frame.0.side_data_list.side_data.0.side_data_type="Mastering display metadata"
frames.frame.0.side_data_list.side_data.0.red_x="17367/65536"
frames.frame.0.side_data_list.side_data.0.red_y="45220/65536"
frames.frame.0.side_data_list.side_data.0.green_x="9830/65536"
frames.frame.0.side_data_list.side_data.0.green_y="3932/65536"
frames.frame.0.side_data_list.side_data.0.blue_x="44564/65536"
frames.frame.0.side_data_list.side_data.0.blue_y="20972/65536"
frames.frame.0.side_data_list.side_data.0.white_point_x="20493/65536"
frames.frame.0.side_data_list.side_data.0.white_point_y="21561/65536"
frames.frame.0.side_data_list.side_data.0.min_luminance="82/16384"
frames.frame.0.side_data_list.side_data.0.max_luminance="256000/256"
frames.frame.0.side_data_list.side_data.1.side_data_type="Content light level metadata"
frames.frame.0.side_data_list.side_data.1.max_content=1000
frames.frame.0.side_data_list.side_data.1.max_average=200