From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A5B564DC92 for ; Wed, 4 Jun 2025 12:15:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 20342687D1A; Wed, 4 Jun 2025 15:15:46 +0300 (EEST) Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 15A21687D1A for ; Wed, 4 Jun 2025 15:15:39 +0300 (EEST) Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-450d6768d4dso36893655e9.2 for ; Wed, 04 Jun 2025 05:15:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749039338; x=1749644138; h=to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7RG9EOxs4/XETKKVl64wdVeg+N7Qmui77yDmcFNvxVI=; b=ofvvKfQl8R499xU0qxyHoELDcZJ3nikH4BdUAZCMkcQHtTZfYG85bIkRwbWkhEzvvS sGCx0l+Nh37VSKBQcQjayz0KHDH7Y7vV/H+cWxNlflNM/4CjnHLQcrRxY4hbhrl3Zrqa Z8GAnpijnffOvZZ+eHWVTWFk3t8XsU3l7/dtrMYcbHLvN1SzHjVDqnnejkiLDFL/tVPp +aZBxFCcGXVuqBxS5YQswl/UWmx6wGNLcn+aZ7i6C7e00kq/O1X9ELIV8LZGbV5ld4Wt eqoFKk9qVJ6wE1fm55gqjB9ATpJjhXaWyraKRi1V+IVBQreMRbE2sVBi06tc9Y6HFb7/ rfxQ== X-Gm-Message-State: AOJu0Yyn9QzL7e5qptAlJYy2hB+gJMjN1DlVm8I2a3vSea1wzM5xmN/v zNCW1EMD7VgoNlqlEJtnvySFC1cmO5JyaaKr8ne6yecodQhXSsx5W2Bp7ijD3jcFTY4BWYos4k0 n7bpH4Tx27TYJpWlvZKLqN/GFouuEQHCuK4EWk4AHKakioV2deKUiRnoUsUQNs0xW8A4XtgzJAH OG3eBFQGSKQfwnfnzFInlWzWPgmU6wxyGYxlbjLg== X-Google-Smtp-Source: AGHT+IHj523n7nfPM/bgTroWEUzo9xYJmZ1WZ0Yk19BIYYBTD0YVIkmh/QC+Id/6BfKlaYfB/tGmOH3RGHY= X-Received: from wmth23.prod.google.com ([2002:a05:600c:8b77:b0:450:cf3f:2a89]) (user=maryla job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4ed0:b0:43c:f629:66f4 with SMTP id 5b1f17b1804b1-451f09be35emr25213995e9.0.1749039338238; Wed, 04 Jun 2025 05:15:38 -0700 (PDT) Date: Wed, 4 Jun 2025 14:15:35 +0200 Mime-Version: 1.0 X-Mailer: git-send-email 2.49.0.1204.g71687c7c1d-goog Message-ID: <20250604121536.2941354-1-maryla@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/libaom: Add HDR10+ metadata support 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: , From: Maryla Ustarroz-Calonge via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Maryla Ustarroz-Calonge Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Maryla Ustarroz-Calonge --- Changelog | 1 + libavcodec/libaomdec.c | 62 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/libaomenc.c | 55 +++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 4 files changed, 119 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 4217449438..e1a9538e83 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ version : - APV encoding support through a libopenapv wrapper - VVC decoder supports all content of SCC (Screen Content Coding): IBC (Inter Block Copy), Palette Mode and ACT (Adaptive Color Transform +- HDR10+ metadata passthrough when decoding/encoding with libaom-av1 version 7.1: diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 69eec8b089..2c674feabb 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -28,11 +28,14 @@ #include "libavutil/common.h" #include "libavutil/cpu.h" +#include "libavutil/hdr_dynamic_metadata.h" #include "libavutil/imgutils.h" #include "avcodec.h" +#include "bytestream.h" #include "codec_internal.h" #include "decode.h" +#include "itut35.h" #include "libaom.h" #include "profiles.h" @@ -137,6 +140,60 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) } } +static int decode_metadata_itu_t_t35(AVFrame *frame, + const uint8_t *buffer, size_t buffer_size) +{ + if (buffer_size < 6) + return AVERROR(EINVAL); + + GetByteContext bc; + bytestream2_init(&bc, buffer, buffer_size); + + const int country_code = bytestream2_get_byteu(&bc); + const int provider_code = bytestream2_get_be16u(&bc); + const int provider_oriented_code = bytestream2_get_be16u(&bc); + const int application_identifier = bytestream2_get_byteu(&bc); + + // See "HDR10+ AV1 Metadata Handling Specification" v1.0.1, Section 2.1. + if (country_code == ITU_T_T35_COUNTRY_CODE_US + && provider_code == ITU_T_T35_PROVIDER_CODE_SMTPE + && provider_oriented_code == 0x0001 + && application_identifier == 0x04) { + // HDR10+ + AVDynamicHDRPlus *hdr_plus = av_dynamic_hdr_plus_create_side_data(frame); + if (!hdr_plus) + return AVERROR(ENOMEM); + + int res = av_dynamic_hdr_plus_from_t35(hdr_plus, bc.buffer, + bytestream2_get_bytes_left(&bc)); + if (res < 0) + return res; + } + + return 0; +} + +static int decode_metadata(AVFrame *frame, const struct aom_image *img) { + const size_t num_metadata = aom_img_num_metadata(img); + for (size_t i = 0; i < num_metadata; ++i) { + const aom_metadata_t *metadata = aom_img_get_metadata(img, i); + if (!metadata) + continue; + + switch (metadata->type) { + case OBU_METADATA_TYPE_ITUT_T35: { + int res = decode_metadata_itu_t_t35(frame, metadata->payload, metadata->sz); + if (res < 0) + return res; + break; + } + default: + break; + } + } + return 0; +} + static int aom_decode(AVCodecContext *avctx, AVFrame *picture, int *got_frame, AVPacket *avpkt) { @@ -215,6 +272,11 @@ static int aom_decode(AVCodecContext *avctx, AVFrame *picture, av_image_copy(picture->data, picture->linesize, planes, stride, avctx->pix_fmt, img->d_w, img->d_h); } + ret = decode_metadata(picture, img); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode metadata\n"); + return ret; + } *got_frame = 1; } return avpkt->size; diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 9a384fcc39..4a419e95f9 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -33,6 +33,7 @@ #include "libavutil/base64.h" #include "libavutil/common.h" #include "libavutil/cpu.h" +#include "libavutil/hdr_dynamic_metadata.h" #include "libavutil/imgutils.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" @@ -42,10 +43,12 @@ #include "av1.h" #include "avcodec.h" #include "bsf.h" +#include "bytestream.h" #include "codec_internal.h" #include "dovi_rpu.h" #include "encode.h" #include "internal.h" +#include "itut35.h" #include "libaom.h" #include "packet_internal.h" #include "profiles.h" @@ -326,6 +329,53 @@ static av_cold int codecctl_int(AVCodecContext *avctx, return 0; } +static int add_hdr_plus(AVCodecContext *avctx, struct aom_image *img, const AVFrame *frame) +{ + // Check for HDR10+ + AVFrameSideData *side_data = + av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); + if (!side_data) + return 0; + + size_t payload_size; + AVDynamicHDRPlus *hdr_plus = (AVDynamicHDRPlus *)side_data->buf->data; + int res = av_dynamic_hdr_plus_to_t35(hdr_plus, NULL, &payload_size); + if (res < 0) { + log_encoder_error(avctx, "Error finding the size of HDR10+"); + return res; + } + + uint8_t *hdr_plus_buf; + // Extra bytes for the country code, provider code, provider oriented code and app id. + const size_t hdr_plus_buf_size = payload_size + 6; + hdr_plus_buf = av_malloc(hdr_plus_buf_size); + if (!hdr_plus_buf) + return AVERROR(ENOMEM); + + uint8_t *payload = hdr_plus_buf; + // See "HDR10+ AV1 Metadata Handling Specification" v1.0.1, Section 2.1. + bytestream_put_byte(&payload, ITU_T_T35_COUNTRY_CODE_US); + bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SMTPE); + bytestream_put_be16(&payload, 0x0001); // provider_oriented_code + bytestream_put_byte(&payload, 0x04); // application_identifier + + res = av_dynamic_hdr_plus_to_t35(hdr_plus, &payload, &payload_size); + if (res < 0) { + av_free(hdr_plus_buf); + log_encoder_error(avctx, "Error encoding HDR10+ from side data"); + return res; + } + + res = aom_img_add_metadata(img, OBU_METADATA_TYPE_ITUT_T35, + hdr_plus_buf, hdr_plus_buf_size, AOM_MIF_ANY_FRAME); + av_free(hdr_plus_buf); + if (res < 0) { + log_encoder_error(avctx, "Error adding HDR10+ to aom_img"); + return res; + } + return 0; +} + #if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \ defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX) @@ -1254,6 +1304,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, if (frame) { rawimg = &ctx->rawimg; + aom_img_remove_metadata(rawimg); rawimg->planes[AOM_PLANE_Y] = frame->data[0]; rawimg->planes[AOM_PLANE_U] = frame->data[1]; rawimg->planes[AOM_PLANE_V] = frame->data[2]; @@ -1304,6 +1355,10 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, if (frame->pict_type == AV_PICTURE_TYPE_I) flags |= AOM_EFLAG_FORCE_KF; + + res = add_hdr_plus(avctx, rawimg, frame); + if (res < 0) + return res; } res = aom_codec_encode(&ctx->encoder, rawimg, timestamp, duration, flags); diff --git a/libavcodec/version.h b/libavcodec/version.h index eedf4c5a92..cde7d40bc0 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 3 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ -- 2.49.0.1204.g71687c7c1d-goog _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".