From patchwork Tue Apr 27 01:54:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammad Izadi X-Patchwork-Id: 27436 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp590444iob; Mon, 26 Apr 2021 18:54:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwR6fZmgs4ihbq+tZtFJnQSjv/1tqwDTgfcsJzptdmVeKuP0S9aQhbnfC6s+pstKJ/dpKze X-Received: by 2002:aa7:da45:: with SMTP id w5mr1663193eds.64.1619488483601; Mon, 26 Apr 2021 18:54:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619488483; cv=none; d=google.com; s=arc-20160816; b=NBpBPfPmApPezSK8uAz1F0gLIAL+kduzCpgBRh1EyuyClCWlhFNu7/55CkT1xVSeEn UOc8MOpP+OvjOQ9IjQkgPhmxHdTqLMdqkG2fOAjKZhGIYnqkLCxyAbMu2Kif0ZHno425 ngiLAam57AbUrcS/LymrPmpNo+7D/G172Ia69/Hl9SCG5GN1Azbc1Wr3NIJKhrMPteGz cYd6uiw2573XGJ85BayUKvvAE3Gdl8PNh1rLSEJDqg8ztk+PkoLkWJU4BEG2vJCaxqbI YXfEi3/ilQ/GYJk7hFLQp4amNI4guFrN4NbRsd7Y53kfn5v1ZGHcNk88lsSPKcFaKeSj Ac/Q== 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:to:from:references:mime-version :message-id:in-reply-to:date:dkim-signature:delivered-to; bh=3IjzkGrpFH/rlHkFG4ANl2+jk/76N1ZDzT1cQ8GQ6WM=; b=CbfWfAmLYQ71X3PA2gywYxj73arcHIQqGwv0JKEwD4hkKhqDfFM8WU7vlJYR3wQpcn JlDxVpJ7RUOxMb+Ooyoi4oKV/1C2TSgaeAqFXBSbsBPZbzgZnhddhQupdrdh63PdXOgc QsXCYJ86YRvmKkfOsZQZPQ602IrBEXV8HfOB8kev5DTXDE11ANuFDWAC8ZrBlvMpJ9yk yfvglayym7cwtgo6iVCE+RrPEmn0LMyMklaJQi5/z5nu9e/5FRfW9dNs5ZuSjSddMFFa /Fuxpfuh0qQz18CQP8dsLxmCmxn+VVDenmWwpAfSDyiielUXVlEkx4mIx26A34KIUxxG h5aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b="Ko3/oM4z"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sb9si16882791ejb.545.2021.04.26.18.54.43; Mon, 26 Apr 2021 18:54:43 -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=@google.com header.s=20161025 header.b="Ko3/oM4z"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9608E689E5B; Tue, 27 Apr 2021 04:54:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE099688342 for ; Tue, 27 Apr 2021 04:54:34 +0300 (EEST) Received: by mail-yb1-f201.google.com with SMTP id v63-20020a252f420000b02904ecfc17c803so24439622ybv.18 for ; Mon, 26 Apr 2021 18:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=FsYG/gIQCW1m9k+hb2O0hJJ/pxj3ZyYY08lLPhLCivg=; b=Ko3/oM4z8cyS/BFmq7mPBvvtBeAE+oqDOBkiqh/BZhTEJj1FZFuf5NGp95zI9z9Q9E ysINkpS2K+0Kgp7eNJLAuR0re+M5v1YRBBLfFcHSES6lji3kwv//g33+jYpYT0imrYgM qTaQYzEoDAMgMP9xLd5Cki2q4SPqR7Ipf03iX+M1LF/AXwaxdV3tYYtzn2BH7a8GQgc5 Dx5+RZs4WWnrOmkVsnlifH9iZJLIUEk1c6cQz6SIZGzje5ApKYsG7O9V4bPsuH5LIm+6 j1h4/HgAxEADDzhCn0adjCcLW58w/7XluWHTQ9LDQTbsu+eru1MUlUbHvewqhYtAI8P/ JvyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=FsYG/gIQCW1m9k+hb2O0hJJ/pxj3ZyYY08lLPhLCivg=; b=Ek4nGnAv+gyKRlvr18jpvlH4noRwCEsSq9AfAsv5bA1nAeISR2fxS2qYFHMdQ/H7VH T2Z4pTYyBjRtXBLWOQJMoLsG+VGyCqCrgo0uM4AtOyR4nqL3+hQQ9gT+y51q1iNK5GF7 mJ8IgsrPUaJ7oKWIKi6ARB1k0FiDsNFf4iKo5SM5EtiTdmMP2qyEMjrCAmbLTmgI8NKo ZONahC/ecjbOSTdmgxWJv5sXdWuBNsg6rjvwjbBT8epuu19m+vIgEQOqxehQ1OfR/Z0i GKPG2U46YBNeGiQhMIT2SYAhdW7nMVwhXGsrcrL2SalnTWndP8PM5qykwBaJYhGWXAB3 Khlw== X-Gm-Message-State: AOAM531Mdb+lkEV1cxDT90gVw0jKiUe1RWsbcWTg2T8fTkzBMze+yiVo 3/CGXfPFivsyjbCMXxY52FHwYksrIOA6AFx/9rO5fQOpCtIVqE98S1F0m+iTyesIGZ68XXBN+Sm 0pBKWWMCvpJO95X6Gb4mnYW+VFEzSPq6mRjRqV29nU6+B+zVh8MMZqAyXPon7 X-Received: from izadi.mtv.corp.google.com ([2620:0:1000:4001:e531:d506:8b7c:3bcd]) (user=izadi job=sendgmr) by 2002:a25:d891:: with SMTP id p139mr8245911ybg.117.1619488473287; Mon, 26 Apr 2021 18:54:33 -0700 (PDT) Date: Mon, 26 Apr 2021 18:54:25 -0700 In-Reply-To: Message-Id: <20210427015425.3998133-1-izadi@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog From: Mohammad Izadi To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Pass the HDR10+ metadata to the packet side data in VP9 encoder 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: Mohammad Izadi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: waLO2D7YZiRz HDR10+ metadata is stored in the bit stream for HEVC. The story is different for VP9 and cannot store the metadata in the bit stream. HDR10+ should be passed to packet side data an stored in the container (mkv) for VP9. This CL is taking HDR10+ from AVFrame side data in libvpxenc and is passing it to the AVPacket side data. --- libavcodec/avpacket.c | 1 + libavcodec/decode.c | 1 + libavcodec/libvpxenc.c | 88 +++++++++++++++++++++++++++++++++++++++++- libavcodec/packet.h | 8 ++++ 4 files changed, 96 insertions(+), 2 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index b5bac5c5f2..7a3b0a73e3 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -416,6 +416,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_ICC_PROFILE: return "ICC Profile"; case AV_PKT_DATA_DOVI_CONF: return "DOVI configuration record"; case AV_PKT_DATA_S12M_TIMECODE: return "SMPTE ST 12-1:2014 timecode"; + case AV_PKT_DATA_DYNAMIC_HDR10_PLUS: return "HDR10+ Dynamic Metadata (SMPTE 2094-40)"; } return NULL; } diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 0956a6ac6f..bf5fbcca97 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1736,6 +1736,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, + { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, }; if (IS_EMPTY(pkt) && av_fifo_size(avctx->internal->pkt_props) >= sizeof(*pkt)) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 3f36943c12..2096c08437 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -63,6 +63,12 @@ struct FrameListData { struct FrameListData *next; }; +typedef struct FrameHDR10PlusList { + int64_t pts; + AVBufferRef *hdr10_plus; + struct FrameHDR10PlusList *next; +} FrameHDR10PlusList; + typedef struct VPxEncoderContext { AVClass *class; struct vpx_codec_ctx encoder; @@ -120,6 +126,8 @@ typedef struct VPxEncoderContext { int tune_content; int corpus_complexity; int tpl_model; + int discard_hdr10_plus; + struct FrameHDR10PlusList *hdr10_plus_list; /** * If the driver does not support ROI then warn the first time we * encounter a frame with ROI side data. @@ -315,6 +323,53 @@ static av_cold void free_frame_list(struct FrameListData *list) } } + +static void add_hdr10_plus(void *list, struct FrameHDR10PlusList *data) +{ + struct FrameHDR10PlusList **p = list; + while (*p) + p = &(*p)->next; + *p = data; + data->next = NULL; +} + +static av_cold void free_hdr10_plus(struct FrameHDR10PlusList *p) +{ + av_buffer_unref(&p->hdr10_plus); + av_free(p); +} + +static av_cold void free_hdr10_plus_list(struct FrameHDR10PlusList *list) +{ + struct FrameHDR10PlusList *p = list; + while (p) { + list = list->next; + free_hdr10_plus(p); + p = list; + } +} + +static int copy_hdr10_plus_to_pkt(void *list, AVPacket *pkt) +{ + struct FrameHDR10PlusList **p = list; + struct FrameHDR10PlusList *head = *p; + + if (head && pkt && head->hdr10_plus && head->pts == pkt->pts) { + uint8_t *data; + *p = (*p)->next; + data = av_packet_new_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, head->hdr10_plus->size); + + if (!data) { + free_hdr10_plus(head); + return AVERROR(ENOMEM); + } + memcpy(data, head->hdr10_plus->data, head->hdr10_plus->size); + free_hdr10_plus(head); + + } + return 0; +} + static av_cold int codecctl_int(AVCodecContext *avctx, enum vp8e_enc_control_id id, int val) { @@ -383,6 +438,7 @@ static av_cold int vpx_free(AVCodecContext *avctx) av_freep(&ctx->twopass_stats.buf); av_freep(&avctx->stats_out); free_frame_list(ctx->coded_frame_list); + free_hdr10_plus_list(ctx->hdr10_plus_list); return 0; } @@ -828,6 +884,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, AVCPBProperties *cpb_props; int res; vpx_img_fmt_t img_fmt = VPX_IMG_FMT_I420; + ctx->discard_hdr10_plus = 1; #if CONFIG_LIBVPX_VP9_ENCODER vpx_codec_caps_t codec_caps = vpx_codec_get_caps(iface); vpx_svc_extra_cfg_t svc_params; @@ -850,11 +907,16 @@ static av_cold int vpx_init(AVCodecContext *avctx, if (avctx->codec_id == AV_CODEC_ID_VP9) { if (set_pix_fmt(avctx, codec_caps, &enccfg, &flags, &img_fmt)) return AVERROR(EINVAL); + // Keep HDR10+ if it has bit depth higher than 8 and + // it has PQ trc (SMPTE2084). + if (enccfg.g_bit_depth > 8 && avctx->color_trc == AVCOL_TRC_SMPTE2084) { + ctx->discard_hdr10_plus = 0; + } } #endif - if(!avctx->bit_rate) - if(avctx->rc_max_rate || avctx->rc_buffer_size || avctx->rc_initial_buffer_occupancy) { + if (!avctx->bit_rate) + if (avctx->rc_max_rate || avctx->rc_buffer_size || avctx->rc_initial_buffer_occupancy) { av_log( avctx, AV_LOG_ERROR, "Rate control parameters set without a bitrate\n"); return AVERROR(EINVAL); } @@ -1245,6 +1307,14 @@ FF_ENABLE_DEPRECATION_WARNINGS AV_WB64(side_data, 1); memcpy(side_data + 8, cx_frame->buf_alpha, cx_frame->sz_alpha); } + if (cx_frame->frame_number != -1) { + VPxContext *ctx = avctx->priv_data; + if (!ctx->discard_hdr10_plus) { + int err = copy_hdr10_plus_to_pkt(&ctx->hdr10_plus_list, pkt); + if (err < 0) + return err; + } + } } else { return ret; } @@ -1579,6 +1649,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, const struct vpx_codec_enc_cfg *enccfg = ctx->encoder.config.enc; vpx_svc_layer_id_t layer_id; int layer_id_valid = 0; + AVFrameSideData *hdr10_plus_metadata; if (frame) { const AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); @@ -1655,6 +1726,19 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, vp9_encode_set_roi(avctx, frame->width, frame->height, sd); } } + + if (!ctx->discard_hdr10_plus) { + // Add HDR10+ metadata to queue. + hdr10_plus_metadata = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); + if (hdr10_plus_metadata) { + struct FrameHDR10PlusList *data = av_malloc(sizeof(*data)); + if (!data) + return AVERROR(ENOMEM); + data->pts = frame->pts; + data->hdr10_plus = av_buffer_ref(hdr10_plus_metadata->buf); + add_hdr10_plus(&ctx->hdr10_plus_list, data); + } + } } // this is for encoding with preset temporal layering patterns defined in diff --git a/libavcodec/packet.h b/libavcodec/packet.h index ca18ae631f..23a146ea7b 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -290,6 +290,14 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_S12M_TIMECODE, + /** + * HDR10+ dynamic metadata associated with a video frame. The metadata is in + * the form of the AVDynamicHDRPlus struct and contains + * information for color volume transform - application 4 of + * SPMTE 2094-40:2016 standard. + */ + AV_PKT_DATA_DYNAMIC_HDR10_PLUS, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may