From patchwork Wed Dec 8 10:12:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 32172 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp149694iog; Wed, 8 Dec 2021 02:13:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzG9J2jKzVgCoyMgFlUMEc7SIuTVSHt6sc/pHq75e80/NAte17zbbMgb+TrhIZy5PF1XyJy X-Received: by 2002:a05:6402:2789:: with SMTP id b9mr17562259ede.28.1638958396862; Wed, 08 Dec 2021 02:13:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638958396; cv=none; d=google.com; s=arc-20160816; b=I3Wp+9GpT8BFsc92KIzxn55kbEV6FC3P24/3hD2fCvfnGsBKLDtlTePSvLJ3/8Nh97 Ttls0/NpSfaSBw3E1PsE7xcQzngCBVAMzLJS//midhPxm8+DbiNh/cMg1KYDljoT3sUh uXlpPd8npOUJjgX2p+XeQ0aIb89cU4EB013LzhNv2hggRGF73yOKHEQTkDdBkxgMSRTT yRR+XVI6Nxfj57bI9D3NCzxxiL9CJeEkE6R2AyKq15dDJAbPN24rSLiJOZrEDdSCh46B bv9fz+v85oTVsV40JRX49UbPbTlthnxXhJB+E9B7DW6jOGcvTQt0KfptdOadIZAP83qB A2FQ== 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:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=heFtEgofXmQ+x0PGlHGYo1ysnQYZp+5YJLfq0a5Edqo=; b=b2ajHutdCqcq3cYxBTwFjlQI3P5M6pzw1qTuqnEidPk1bR3A3sSkaU9ISqLfX587ZQ xxYfyGr2NZV2LaFXOUxTd+etIFQcyhycTxXPlqVGPzLZe9BK1B1lEvJ60URk+4QWmxMo N1cJVWNVRLMPGnYJYfFIaKXETsg5dx05rfgue/8aKYYB3isBGEiQBvYhjWabniNkWFgT oQd6lQjiyiVKEeEDy0GrRx8+7PA2b3vX5NuTHHGVyqDyeqOkLGYSBznMvwhj1QLButA2 PTNHz1UTt3m1XFW+a8JtSAIYSTdJbpZ3WXFPHfV48LO1pjyrK5P+w83OTWLNQG1z5Y9N xK+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=h0Hxexzz; 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 m15si4780244edd.538.2021.12.08.02.13.16; Wed, 08 Dec 2021 02:13:16 -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=@haasn.xyz header.s=mail header.b=h0Hxexzz; 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 B0AAE68ADF6; Wed, 8 Dec 2021 12:12:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 995E268A92E for ; Wed, 8 Dec 2021 12:12:42 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 20CC9491C2; Wed, 8 Dec 2021 11:12:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1638958361; bh=AV8DgsWUeCgBf8zXYlL20LnvHGHsz7MXKtpPKmUpSpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h0Hxexzzt9qFyRkbfkjkUSHeYe/wP5n9YU3OhfAbJ/bzfddFm3NOLJFONM8wM53FP U93wnIE+piP0IZ3g2/4m1tvr3Sow0onJrfduI+FzsLaS6zGuhYUu5Zww6P4+PB+8TG M5eYCDeYc+WBGu+XMn43a7K8NkYAyu39Cj8WSqz8= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 11:12:37 +0100 Message-Id: <20211208101237.18407-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208101237.18407-1-ffmpeg@haasn.xyz> References: <20211208101237.18407-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] lavc/hevcdec: Parse DOVI RPU NALs 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: upFadd6gB5QX From: Niklas Haas And expose the parsed values as frame side data. Signed-off-by: Niklas Haas --- libavcodec/hevcdec.c | 34 +++++++++++++++++++++++++++++++--- libavcodec/hevcdec.h | 2 ++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 46d9edf8eb..926764bdf4 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -38,6 +38,7 @@ #include "bswapdsp.h" #include "bytestream.h" #include "cabac_functions.h" +#include "dovi.h" #include "golomb.h" #include "hevc.h" #include "hevc_data.h" @@ -2967,6 +2968,19 @@ static int set_side_data(HEVCContext *s) s->rpu_buf = NULL; } + if (s->dovi_ctx.mapping && s->dovi_ctx.color) { + AVDOVIMetadata *dovi; + AVFrameSideData *sd = av_frame_new_side_data(out, AV_FRAME_DATA_DOVI_METADATA, + sizeof(AVDOVIMetadata)); + if (!sd) + return AVERROR(ENOMEM); + + dovi = (AVDOVIMetadata *) sd->data; + memcpy(&dovi->header, &s->dovi_ctx.header, sizeof(dovi->header)); + memcpy(&dovi->mapping, s->dovi_ctx.mapping, sizeof(dovi->mapping)); + memcpy(&dovi->color, s->dovi_ctx.color, sizeof(dovi->color)); + } + return 0; } @@ -3298,16 +3312,23 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) if (s->pkt.nb_nals > 1 && s->pkt.nals[s->pkt.nb_nals - 1].type == HEVC_NAL_UNSPEC62 && s->pkt.nals[s->pkt.nb_nals - 1].size > 2 && !s->pkt.nals[s->pkt.nb_nals - 1].nuh_layer_id && !s->pkt.nals[s->pkt.nb_nals - 1].temporal_id) { + H2645NAL *nal = &s->pkt.nals[s->pkt.nb_nals - 1]; if (s->rpu_buf) { av_buffer_unref(&s->rpu_buf); av_log(s->avctx, AV_LOG_WARNING, "Multiple Dolby Vision RPUs found in one AU. Skipping previous.\n"); } - s->rpu_buf = av_buffer_alloc(s->pkt.nals[s->pkt.nb_nals - 1].raw_size - 2); + s->rpu_buf = av_buffer_alloc(nal->raw_size - 2); if (!s->rpu_buf) return AVERROR(ENOMEM); - memcpy(s->rpu_buf->data, s->pkt.nals[s->pkt.nb_nals - 1].raw_data + 2, s->pkt.nals[s->pkt.nb_nals - 1].raw_size - 2); + memcpy(s->rpu_buf->data, nal->raw_data + 2, nal->raw_size - 2); + ret = ff_dovi_rpu_parse(&s->dovi_ctx, nal->data + 2, nal->size - 2); + if (ret < 0) { + av_buffer_unref(&s->rpu_buf); + av_log(s->avctx, AV_LOG_WARNING, "Error parsing DOVI NAL unit.\n"); + goto fail; + } } /* decode the NAL units */ @@ -3325,7 +3346,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) if (ret < 0) { av_log(s->avctx, AV_LOG_WARNING, "Error parsing NAL unit #%d.\n", i); - goto fail; + /* ignore */ } } @@ -3553,6 +3574,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) pic_arrays_free(s); + ff_dovi_ctx_unref(&s->dovi_ctx); av_buffer_unref(&s->rpu_buf); av_freep(&s->md5_ctx); @@ -3637,6 +3659,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) ff_bswapdsp_init(&s->bdsp); + s->dovi_ctx.avctx = avctx; s->context_initialized = 1; s->eos = 0; @@ -3745,6 +3768,10 @@ static int hevc_update_thread_context(AVCodecContext *dst, if (ret < 0) return ret; + ret = ff_dovi_ctx_replace(&s->dovi_ctx, &s0->dovi_ctx); + if (ret < 0) + return ret; + s->sei.frame_packing = s0->sei.frame_packing; s->sei.display_orientation = s0->sei.display_orientation; s->sei.mastering_display = s0->sei.mastering_display; @@ -3801,6 +3828,7 @@ static void hevc_decode_flush(AVCodecContext *avctx) HEVCContext *s = avctx->priv_data; ff_hevc_flush_dpb(s); ff_hevc_reset_sei(&s->sei); + ff_dovi_ctx_unref(&s->dovi_ctx); av_buffer_unref(&s->rpu_buf); s->max_ra = INT_MAX; s->eos = 1; diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 870ff178d4..5b04a8ad83 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -32,6 +32,7 @@ #include "avcodec.h" #include "bswapdsp.h" #include "cabac.h" +#include "dovi.h" #include "get_bits.h" #include "hevcpred.h" #include "h2645_parse.h" @@ -574,6 +575,7 @@ typedef struct HEVCContext { int nuh_layer_id; AVBufferRef *rpu_buf; ///< 0 or 1 Dolby Vision RPUs. + DOVIContext dovi_ctx; ///< Dolby Vision decoding context } HEVCContext; /**