From patchwork Wed May 26 17:26:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammad Izadi X-Patchwork-Id: 27952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp5003600iof; Wed, 26 May 2021 10:26:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJY4+v/yfhmJN2a8i8s+qMO86WL/Ze9ExastWRGMVdsOnWFb/B2v7vAzdvNigym2J2tQs6 X-Received: by 2002:aa7:d2d4:: with SMTP id k20mr38035907edr.384.1622049986332; Wed, 26 May 2021 10:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622049986; cv=none; d=google.com; s=arc-20160816; b=xz2w8oto8kQ6mRCeQYZKY//6iUJMwZM4CGR0rOCWYDhIAqJ3iGnJm0s9mkwhX8fttf gAPvpi0xPiMLIE3xv0R5cev4csNdT+Hj3SOKFJhBfAO9woLVs/4m+QncduAa9RBPAVpC jcK7kvIrH2fZbzSjsY3emwKJL/cJAtEuHR3wzBpo/w2L9DwMmR+Q9BepZicPkj3kcwU9 xXRe9iVdeISlZWWG3TCz8v1j/wjwZ55HMVXx9GonP3oRx/khj9LZzfnVMY+facxXf80H Mmr9d2/rjElwxN+QV1+IK0QfX7gjh0Dj5nChPsFI/1wTnE814GfG8rJWXK8+t7WZdkTQ 5Djw== 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=4V6cx+4n1ViXBdOJfxa61LuL/dTjRtzthzZQn2XgG2o=; b=n4pTeYjptF/j0mKA7GphOM0VeGvL8H9KOirtCHqL/WNAd0haSNTI7RhpnoTv/Zo506 xjeEW6yNSrD4n6bx6DU5JTqk5DYk0u2+tsUs3fEAhKDRcHKtySfDSY5a7+9XcGus8rGc k6Rd3BdsoLjrnAy9lXuYOhdmra7r7MBfGiIEbPknIOiUhgpW3RM5OX4zoxuC41q7w5H/ qnDGebw7rvpDtxu2nAYpgeVNpkAFPwv6ZCHHJZVD6H/uN89ajzXQd5O0MmbwlN+q1irj i8HU9Yn2qan5BPjH5cnbFubUyI4SV6rj7MwC7AGCGBhzAUh7Wl8vEewdDWYhS00dweVN wqBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=fE90bAEA; 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 m19si6236821edd.490.2021.05.26.10.26.25; Wed, 26 May 2021 10:26:26 -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=fE90bAEA; 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 41AE46882FB; Wed, 26 May 2021 20:26:21 +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 F242D6804F6 for ; Wed, 26 May 2021 20:26:14 +0300 (EEST) Received: by mail-yb1-f202.google.com with SMTP id d89-20020a25a3620000b02904dc8d0450c6so2497763ybi.2 for ; Wed, 26 May 2021 10:26:14 -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=EKXIa9quH3sKHjsnsUHqNRqOb0o08hKKOeXkMirdomA=; b=fE90bAEA6aeJ3ZnUve+siosE1o+uw6LwO/L+8tqxWC7IFywZLEdaQnQVxkaM2FFTyK uSllZf/4lEn7qVlMY0s9DbpCVouOhQMvBBlZ96RLkEweSQ6ObVJWrHtkQT6kecMsfBXR YV4AfonvrfjiDyWS4Qro6UQ7WtCUnL6MKCU4fZ+Rv+enYDx0JYzgbNiYAVTXnXtkvHTy e5pM9ftbpHIkWntyggFlwcEfPOUlFYOTgEDqT6kqxn900JxxsFK9BWloxiMnsq80GMSl zlj9xfMfQf6BVhGy/PScz0xp3avfA42crpcAfD1ve2/YEEGS5+ckHzNfnYYz4qVj79GP SMPA== 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=EKXIa9quH3sKHjsnsUHqNRqOb0o08hKKOeXkMirdomA=; b=e6C5cQxI0GL5WgskNkNDIfLGMoS49Fz0m24K03Dj4Q/NGPoyqiZQrYfSQo2C9crivG idJb7hoU3rg5KwTTp0JO9mcJHsGHkpdCBadVkAfHA0RZOAn2/5LJU3f0AyWGkGHAF3RE +qFUX6yy8q4gY1Lum1n7WUJkTlK3rWOr04a07gMKHovlZR2LoRE7NTGntqbM3AMdFr4E AkqeVPlYnp0Ho0ckGE6lUoFWNL+MCet7y/5QyZZwewfR5Daw85O5jP6k3n2ISqvq05Wi i9vNJ4umBTIExfRfC0N+QSEMj2hKmPI8gsxF1poTGeE9wcsH1rqC6dHmnPLDoWcDjBhH T1Fg== X-Gm-Message-State: AOAM531o079g0SVucCZg1SaFSKuLXJfxUlFndD+wwCXEkY9MEf1hubYc ohMvoJEPn30nH60WwDjkqBeuuUCcAGrj6jJQEG0NzI4+dtE+Tjn2gUHuvC0IEnGCyZBuqMrraRY T4C/wh2TSU+9Ls3WwUqW3Jzf3rrgMYZRulji+K1w3/Gt8NMAAL5VNNZ0V1SuA X-Received: from izadi.mtv.corp.google.com ([2620:0:1000:4001:87cb:2b87:3886:6]) (user=izadi job=sendgmr) by 2002:a25:9bc5:: with SMTP id w5mr51051784ybo.139.1622049973480; Wed, 26 May 2021 10:26:13 -0700 (PDT) Date: Wed, 26 May 2021 10:26:06 -0700 In-Reply-To: Message-Id: <20210526172606.3422441-1-izadi@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-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: CztY1Vkg5r9A 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 | 3 ++ libavcodec/avpacket.c | 1 + libavcodec/decode.c | 1 + libavcodec/libvpxenc.c | 88 +++++++++++++++++++++++++++++++++++++++++- libavcodec/packet.h | 8 ++++ libavcodec/version.h | 4 +- 6 files changed, 101 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index cd3ea3c865..e3d841ac33 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-05-25 - xxxxxxxxxx - lavc 58.137.100 - packet.h + Add AV_PKT_DATA_DYNAMIC_HDR10_PLUS + 2021-04-17 - xxxxxxxxxx - lavu 56.73.100 - frame.h detection_bbox.h Add AV_FRAME_DATA_DETECTION_BBOXES 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..f2885fbda7 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -63,6 +63,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; @@ -120,6 +125,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. @@ -315,6 +322,49 @@ static av_cold void free_frame_list(struct FrameListData *list) } } +static void add_hdr10_plus(AVFifoBuffer *fifo, struct FrameHDR10Plus *data) +{ + av_fifo_grow(fifo, sizeof(FrameHDR10Plus)); + av_fifo_generic_write(fifo, data, sizeof(FrameHDR10Plus), NULL); +} + +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_generic_read(*fifo, frame_hdr10_plus, sizeof(*frame_hdr10_plus), NULL) > 0) { + 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) { @@ -383,6 +433,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; } @@ -834,6 +885,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()); @@ -850,11 +902,19 @@ 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 - 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 +1305,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_fifo, pkt); + if (err < 0) + return err; + } + } } else { return ret; } @@ -1579,6 +1647,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 +1724,21 @@ 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 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) + return AVERROR(ENOMEM); + add_hdr10_plus(ctx->hdr10_plus_fifo, 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 diff --git a/libavcodec/version.h b/libavcodec/version.h index 349b4b1269..78c14f1c0d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 136 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 137 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \