From patchwork Fri Mar 3 16:37:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp894678pzb; Fri, 3 Mar 2023 08:37:40 -0800 (PST) X-Google-Smtp-Source: AK7set+Oo9zzY41Mg28y3eMaSV9wQAqLLnt/4dcxpC7H8gW3NNuIryxKOx3Hz/1ZM+gxXgw1D8vW X-Received: by 2002:a05:6402:31f8:b0:4ac:b602:3fa4 with SMTP id dy24-20020a05640231f800b004acb6023fa4mr2313115edb.17.1677861460742; Fri, 03 Mar 2023 08:37:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677861460; cv=none; d=google.com; s=arc-20160816; b=C8w5MDfGN8VgK5g8wjYna3e0wUfkJC4gOMQEpZxWNIIshr83yQjozbvYCqxWp459x3 LetbqhUzrgbhZhRBXBxw5rEAv/XMglA8WWrg5RTStp45LW2FYxHSsFKea+MoN9tmnetH 4ho5ljDFGn1maocRLvYojphPNNaavSa8bhnzEoFXAEoOjWphlDMPY4tY4Ol1KRrAVr4l rvPWD5prA81/VYNpz8/X2K4VJe/wCTkBk3EjPHY1D9A8PjvdNzk0c3772grfdNOetewJ 1YFylQZc8ylSpVX9rT6q9SHALbSy2omwoTMXlEhCWBH0m9lkloBqMJPkxxIMRl1kizFV wD7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=wLqLgMNatubfRG0O4Hxxj/0hiXJylTX/THjV4SD3AF4=; b=Mot2z156g5ELrMMX5joL9YxYThuD/AABvAzSnDuF+5nS2rojuTMnjOmtcmWzJKpcmT /xIeYZY4VZV80SBIOg6z3WRSwh7XmgMRP5Vdo09/GVNCOuwNcHsWI1CM8l8GV99ff2am HXYbBfbSLpFJ85MWfmjnescBWY+hQ6mpD4/HFLKWmOwbBdVmGpvjMlVhsgnJi5rxIe39 nLD+C0/LFKeBIRxrt+8MD9RcnX234jKlZRJii51lrpl5X0ELkhw+p3WDjKJsnHtrNOFU 3sUxkXVwipnx8dTSdHJNwKr2upK0iMPi5fk0WJxHk1zjZtAA+lo54ARBO3r2lRJRCwhG 3chA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PoFl6hdi; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x9-20020aa7d6c9000000b004c358f4e73fsi2782407edr.426.2023.03.03.08.37.40; Fri, 03 Mar 2023 08:37:40 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=PoFl6hdi; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2941E68BA18; Fri, 3 Mar 2023 18:37:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA50068B48D for ; Fri, 3 Mar 2023 18:37:30 +0200 (EET) Received: by mail-ot1-f45.google.com with SMTP id p13-20020a9d744d000000b0069438f0db7eso1748817otk.3 for ; Fri, 03 Mar 2023 08:37:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=46/Fc20R0Jr9MUktwmczzLfYYbeQLU4egmPXBb2ZYks=; b=PoFl6hdiUXKhGs/vI0M7KSj1tGV6gIbBsp33atp+xSXi2Nfa9IfpBcUl826KpMo4s0 6lX4qqgjLBEYkzcfpT3HlyW47VhfBk7Bq/RVelVKnQ7bUQtAPOzOeNVAFWD4amEyj4jm sSOyyr5AmI2yMZm9RFE/V1Wa0lkwciCa+f4Idr0OL6/7CZEA1VFe4KRrVcKObUQXV7eh 1onUZ9EJqnqhWV/AAUMBRw33XGmdest2CSd2WTHpAXgwAXuIeTQZXs0XXvK95p7TrS+0 g6WL4NCERL5zB6VWikXAFoNRZLaBCOo8h+v5sg/97H4+3FbNwBIyV8vPUvpGHWNWJRXd tM0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=46/Fc20R0Jr9MUktwmczzLfYYbeQLU4egmPXBb2ZYks=; b=Hwzy7Ot1nVz1APClGfYq4IDJy5zagzXLbG6PP2XEy6YyRKv2l0Ak/1PZg2j2dXgQdI FsTZwPd+/i09rMDcpTZMEKdzMqC+u2o1DceHNKR0b624COwdpjq5tZiXsuqgmmoythaQ rdUq6RsQQdeAGnmRTBSeWnGd65o8jyKVt/fNNNjpI/41kpw6uMLTDL9LM4pydutLlfH9 9evD8MtCIop4QvkLr2Bc0n8QgULq02DsFqwMbGvVCNUUzt4daHsBIEAKWQvSIBkalhNb 4sDs5wgzcSOt0+X280SpSv4B9cfMRKBNLL5ieACQf5k6T1OyXIntO+H4JSFXByrobUBJ 0nCA== X-Gm-Message-State: AO0yUKUBN2mEwDLAxCGt+kO649FSgRa3TmmXtKx5g5yvx2pcktIjqb6o c32sLWc6KSP81+asFzLle2zDv5d6CaI= X-Received: by 2002:a9d:6119:0:b0:68d:5928:ec84 with SMTP id i25-20020a9d6119000000b0068d5928ec84mr877419otj.14.1677861448704; Fri, 03 Mar 2023 08:37:28 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id w6-20020a056830144600b00693c9f984b4sm1170148otp.70.2023.03.03.08.37.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 08:37:28 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2023 13:37:13 -0300 Message-Id: <20230303163714.2979-1-jamrial@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libdav1d: export Dynamic HDR10+ frame metadata 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1frw+jeqsTq7 As defined in https://aomediacodec.github.io/av1-hdr10plus/ Signed-off-by: James Almer --- A sample is available in https://github.com/AOMediaCodec/av1-hdr10plus/wiki libavcodec/libdav1d.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 2488a709c7..dcd7cd3f05 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -33,6 +33,7 @@ #include "bytestream.h" #include "codec_internal.h" #include "decode.h" +#include "dynamic_hdr10_plus.h" #include "internal.h" #define FF_DAV1D_VERSION_AT_LEAST(x,y) \ @@ -511,12 +512,14 @@ FF_ENABLE_DEPRECATION_WARNINGS } if (p->itut_t35) { GetByteContext gb; - unsigned int user_identifier; + int provider_code; bytestream2_init(&gb, p->itut_t35->payload, p->itut_t35->payload_size); - bytestream2_skip(&gb, 1); // terminal provider code - bytestream2_skip(&gb, 1); // terminal provider oriented code - user_identifier = bytestream2_get_be32(&gb); + + provider_code = bytestream2_get_be16(&gb); + switch (provider_code) { + case 0x31: { // atsc_provider_code + uint32_t user_identifier = bytestream2_get_be32(&gb); switch (user_identifier) { case MKBETAG('G', 'A', '9', '4'): { // closed captions AVBufferRef *buf = NULL; @@ -536,6 +539,30 @@ FF_ENABLE_DEPRECATION_WARNINGS default: // ignore unsupported identifiers break; } + } + case 0x3C: { // smpte_provider_code + AVDynamicHDRPlus *hdrplus; + int provider_oriented_code = bytestream2_get_be16(&gb); + int application_identifier = bytestream2_get_byte(&gb); + + if (provider_oriented_code != 1 || application_identifier != 4) + break; + + hdrplus = av_dynamic_hdr_plus_create_side_data(frame); + if (!hdrplus) { + res = AVERROR(ENOMEM); + goto fail; + } + + res = ff_parse_itu_t_t35_to_dynamic_hdr10_plus(hdrplus, gb.buffer, + bytestream2_get_bytes_left(&gb)); + if (res < 0) + goto fail; + break; + } + default: // ignore unsupported provider codes + break; + } } if (p->frame_hdr->film_grain.present && (!dav1d->apply_grain || (c->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN))) {