From patchwork Mon Jun 7 17:39:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammad Izadi X-Patchwork-Id: 28129 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3679587iof; Mon, 7 Jun 2021 10:39:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8BkczU0ktC3kvlm25/EGRk1JQuv0TO9i78Gm2K9DA3s+j4TfF/7ZKoukA80YH3P6jBs1F X-Received: by 2002:a05:6402:22f7:: with SMTP id dn23mr21486030edb.136.1623087575061; Mon, 07 Jun 2021 10:39:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623087575; cv=none; d=google.com; s=arc-20160816; b=V7NsK1BMHhZNm0W34TijrGW1hws5PggV8urjIM+6nKovRsvuKSp9qLCOwD1Fjh6Upy 6M/9jWiUt5g8LXJEkOWyJEgSSNSOcl/q91dJuMTObH7p5i2danQibRVq5MQChfx2dapb eQi8stySHCTu2Y9XsQMx9QyY1EMW/AOuD111WNRCAFncb1owrwHa/+SrKfJjIwBvOAgH 6StzSjgGHJUorOBJZKBy1K/T6/URqgW63SGJ3ngDjqqCWEN8bcU9ym1RaT5cWtW04Z+m BVybJv96MYV1td5csPLPL/HRBL/IbUKCTvI0sx46eAnTuHTcNlGvNl9S9TdzY/w+tSYT EoAQ== 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=JqEwxx+NuJj8rDbFVZLW7qsKjuC41/bzXGCkSoTT0o0=; b=oG5s+a7465rZBU2uxFKd3f2aWWPCIAgzqW5B1fIAZ1pnEp2oqxvM7m0UOBnl7NM4mg WLG/6wsXrnmsvlwVSmMaexMdu1F+0i0wTm/eEvVbl2y0TlOXnD+Tu9b4jEB/Xv+7Vp+o P+SU+N8MG8Ltn3jvBrKSqq7XATO0/xftJ1KuoG5K2WHksJBpdIyp+9MVoWsP0XAp1KP3 1KEwobEBxWGjLDG4ftZLIuCPI5e8J7sSJlnq0HYNvGKlH08FZHxDzMrGFbytYiQbV6Y5 BamsENe46JjvJKaLddg29DkHPv9Tq/cGNmhGKSerRyJrradDE36I70RcKCW1sJMyA95Y eKMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=miGZ3DwE; 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 s18si14993953eji.591.2021.06.07.10.39.34; Mon, 07 Jun 2021 10:39:35 -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=miGZ3DwE; 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 2392A6806FE; Mon, 7 Jun 2021 20:39:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7F7D680226 for ; Mon, 7 Jun 2021 20:39:25 +0300 (EEST) Received: by mail-yb1-f202.google.com with SMTP id a7-20020a5b00070000b02904ed415d9d84so23225786ybp.0 for ; Mon, 07 Jun 2021 10:39:25 -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=yAtNaJVaT6fHHr5f0yO8Ziov+1+HX3jpDtzMBCZOc90=; b=miGZ3DwEBW92IDphDgYwVKan4noxInoGCyl52rZEQLsstzgJJDuNr331Wnt1fi1seM AqM5EmYXhF1aS0zFzJetNv0+4EkF+Yim5VjSN+iVljibUbQLHFwSXhxKNJ5FSUV5/M2p miRqDFcn/VnDyZbumWoMLywGL5D3RJAeU8sXpqFCYkjVQwslXUoUGDkPZ0Otwa5dTZpg T3NwcliJMKrPuDYVl0xw3lV8DcFBDKD9q1/6W4cI9cpUV2xUu9GEPOHHdzMQMoqrfr29 lbIe65ReDn9a84/jNKMa3OKCC1p7caJVWhI50NZI914NdrpBmuN4SbzU1auJZkg8ognU 7xzg== 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=yAtNaJVaT6fHHr5f0yO8Ziov+1+HX3jpDtzMBCZOc90=; b=bryamVQCsYUBePXTGJCFsPrnAwQLJSwvc5BmE1EV24oJxNDnoCMwy+m245fov/44HE +usQ+UQkqbw5B8L+OG3md0v6vDDYq1IzslVi9bloUiwoNFZOJxHgg9y4oNOnUBgUVRp1 OvnCSi1+Za0wvhxVeoZlhFuLRiXIz2kSZTFnZPG/89F/58aqp3LFh+GE1I2GgYPkp3dx XBPW4Fa1FkApG1fLYqI98S5Aa3QrzX15Hk7yOCKw7N0fXLTQQAQvyqK3Ln9kW1sH9Rsf hCrxOMHDvUvdVEh70gxmLHW+nxoQ5e+g0WwA1pfrJaV2dcqbBk/G3SarKGMMHEVEfRuu wzVA== X-Gm-Message-State: AOAM530X+x/Jpai+tw1jKN/GbnspY241W/lEfCIxjuvDopuiruXD8NQs 2dchaiek1MZb4yQ8/Ys0eTNXFfPTljK/6+NDe4BZ9eNOCmGOMiP03K0UIUjv8kwBrc7ByT539rg KOqlhg+j70AqPSi0+ejK2Hc/9dC4xVyftSSNCjeMDy8y+TmblpHohhQL+w2si X-Received: from izadi.mtv.corp.google.com ([2620:0:1000:4001:426:3ef8:8f60:501]) (user=izadi job=sendgmr) by 2002:a25:3297:: with SMTP id y145mr26397155yby.435.1623087564082; Mon, 07 Jun 2021 10:39:24 -0700 (PDT) Date: Mon, 7 Jun 2021 10:39:19 -0700 In-Reply-To: Message-Id: <20210607173919.503279-1-izadi@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.32.0.rc1.229.g3e70b5a671-goog From: Mohammad Izadi To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec: 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: 4KKPBBhfyRpg 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. --- doc/APIchanges | 2 + libavcodec/avpacket.c | 1 + libavcodec/decode.c | 1 + libavcodec/libvpxenc.c | 98 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/packet.h | 8 ++++ libavcodec/version.h | 4 +- 6 files changed, 112 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index c46f4d5304..60995579e5 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,8 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-05-25 - 8c88a66d3c - lavc 59.2.100 - packet.h + Add AV_PKT_DATA_DYNAMIC_HDR10_PLUS 2021-04-27 - cb3ac722f4 - lavc 59.0.100 - avcodec.h Constified AVCodecParserContext.parser. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 7383d12d3e..800bee3489 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -289,6 +289,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 75bc7ad98e..40f688e40c 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1488,6 +1488,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 66bad444d0..cf7e25a4bc 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -64,6 +64,11 @@ struct FrameListData { struct FrameListData *next; }; +typedef struct FrameHDR10Plus { + int64_t pts; + AVBufferRef *hdr10_plus; +} FrameHDR10Plus; + typedef struct VPxEncoderContext { AVClass *class; struct vpx_codec_ctx encoder; @@ -121,6 +126,8 @@ typedef struct VPxEncoderContext { int tune_content; int corpus_complexity; int tpl_model; + int discard_hdr10_plus; + AVFifoBuffer *hdr10_plus_fifo; /** * If the driver does not support ROI then warn the first time we * encounter a frame with ROI side data. @@ -316,6 +323,55 @@ static av_cold void free_frame_list(struct FrameListData *list) } } +static av_cold int add_hdr10_plus(AVFifoBuffer *fifo, struct FrameHDR10Plus *data) +{ + int err = av_fifo_grow(fifo, sizeof(*data)); + if (err < 0) + return err; + av_fifo_generic_write(fifo, data, sizeof(*data), NULL); + return 0; +} + +static av_cold void free_hdr10_plus(struct FrameHDR10Plus *p) +{ + if (!p) + return; + av_buffer_unref(&p->hdr10_plus); + av_free(p); +} + +static av_cold void free_hdr10_plus_fifo(AVFifoBuffer **fifo) +{ + FrameHDR10Plus *frame_hdr10_plus = NULL; + while (av_fifo_size(*fifo) >= sizeof(FrameHDR10Plus)) { + av_fifo_generic_read(*fifo, frame_hdr10_plus, sizeof(FrameHDR10Plus), NULL); + free_hdr10_plus(frame_hdr10_plus); + } + av_fifo_freep(fifo); +} + +static int copy_hdr10_plus_to_pkt(AVFifoBuffer *fifo, AVPacket *pkt) +{ + FrameHDR10Plus *frame_hdr10_plus; + uint8_t *data; + if (av_fifo_size(fifo) < 1) + return 0; + + av_fifo_generic_read(fifo, frame_hdr10_plus, sizeof(*frame_hdr10_plus), NULL); + if (!frame_hdr10_plus || !pkt || !frame_hdr10_plus->hdr10_plus || frame_hdr10_plus->pts != pkt->pts) + return 0; + + data = av_packet_new_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, frame_hdr10_plus->hdr10_plus->size); + if (!data) { + free_hdr10_plus(frame_hdr10_plus); + return AVERROR(ENOMEM); + } + memcpy(data, frame_hdr10_plus->hdr10_plus->data, frame_hdr10_plus->hdr10_plus->size); + free_hdr10_plus(frame_hdr10_plus); + + return 0; +} + static av_cold int codecctl_int(AVCodecContext *avctx, enum vp8e_enc_control_id id, int val) { @@ -384,6 +440,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_fifo(&ctx->hdr10_plus_fifo); return 0; } @@ -835,6 +892,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, #endif AVDictionaryEntry* en = NULL; + ctx->discard_hdr10_plus = 1; av_log(avctx, AV_LOG_INFO, "%s\n", vpx_codec_version_str()); av_log(avctx, AV_LOG_VERBOSE, "%s\n", vpx_codec_build_config()); @@ -851,6 +909,14 @@ 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; + ctx->hdr10_plus_fifo = av_fifo_alloc(sizeof(FrameHDR10Plus)); + if (!ctx->hdr10_plus_fifo) + return AVERROR(ENOMEM); + } } #endif @@ -1211,6 +1277,15 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, 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_fifo, pkt); + if (err < 0) + return err; + } + } + return pkt->size; } @@ -1618,6 +1693,29 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, vp9_encode_set_roi(avctx, frame->width, frame->height, sd); } } + + if (!ctx->discard_hdr10_plus) { + AVFrameSideData *hdr10_plus_metadata; + // Add HDR10+ metadata to queue. + hdr10_plus_metadata = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); + if (hdr10_plus_metadata) { + int err; + struct FrameHDR10Plus *data = av_malloc(sizeof(*data)); + if (!data) + return AVERROR(ENOMEM); + data->pts = frame->pts; + data->hdr10_plus = av_buffer_ref(hdr10_plus_metadata->buf); + if (!data->hdr10_plus) { + av_freep(&data); + return AVERROR(ENOMEM); + } + err = add_hdr10_plus(ctx->hdr10_plus_fifo, data); + if (err < 0) { + av_freep(&data); + return err; + } + } + } } // this is for encoding with preset temporal layering patterns defined in diff --git a/libavcodec/packet.h b/libavcodec/packet.h index fad8341c12..a9d3a9b596 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 + * SMPTE 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 diff --git a/libavcodec/version.h b/libavcodec/version.h index 5b1e9e77f3..1288cecebe 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 59 -#define LIBAVCODEC_VERSION_MINOR 1 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 2 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \