From patchwork Sun Jul 23 12:56:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp1354461pzb; Sun, 23 Jul 2023 05:56:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlGBdo6mSHoF1EBKf251WCS1KdECRi7cFcF7oRkTAskQC+4xRJ13etzFaPjukFVXAPrsLzcV X-Received: by 2002:a17:906:64cf:b0:992:a9c3:244f with SMTP id p15-20020a17090664cf00b00992a9c3244fmr8288613ejn.4.1690117012524; Sun, 23 Jul 2023 05:56:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690117012; cv=none; d=google.com; s=arc-20160816; b=j4y7PyZt9Rxtw708DCdLwc4KZe67rJWy0fIbG8+XtxvpRhA1PHDjlI7IO97cNvymYo S/NadUc7vHBBO+bbRktjIx6enExZolRH6AmCwP685My7tod7vHdhKn60ZS2NbmhV27YF oIcL9uU3U2v79mWnP1N9qiIHwVJmFYbSZbTsjXXIcYC9VFtX1DCXQhmU62FaMxiwly6r jeLv7FzS8jlN4VXmHPX0sFyNePzwuSRE30uJnFbn7fGv32PppDPvTL0mwloQ1tNJZuNu c1INKtXhqvAxEZxBHPkYW6iZBa5+QZsud6pqTB2KEukMD2TtnV1zyCV4B2DnWAVAS14U t9OA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=VebhYkZMKobNbN4ErfCoL/8TyuLZt/n1XIgbHF3TcCk=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=CNoHSJRqmAdfqnoayRY7lFhjug/JKhQ4Wws58UW9+iA5oeJVY84IRLybqfAjfLx77S mWoiIcvgezwrVNvCjhJOXLv+C+TXt+a8eR1QqdTcIeyEUSCAZrETf7JbwdQ811EFxb9A oWyaaCfA0rBYL4Ow0tMHAXRwfojlXcq59C7nvGaUucpKG0i6bujmGl7u/h7+UDU0sv1q 3UZhXBcUteh389BpKBlHIqoFevwtdNU6zwbh/dbaykv7thiVYwS7c9NCElcVXqj4jovE dUJduoH/5FmPDOpvRfWYwUNTxXlMdHGy6vi6+ZaaK/IueDORpMTiXCddm8Nkth8gN3UJ XIiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=FFxQMVK8; 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 g17-20020a17090613d100b0098f99532db0si4714448ejc.660.2023.07.23.05.56.51; Sun, 23 Jul 2023 05:56:52 -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=@gmail.com header.s=20221208 header.b=FFxQMVK8; 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 9535068C6CA; Sun, 23 Jul 2023 15:56:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45FFE68C6BD for ; Sun, 23 Jul 2023 15:56:42 +0300 (EEST) Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-5636426c1b3so2436836eaf.1 for ; Sun, 23 Jul 2023 05:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690117000; x=1690721800; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fJAUy/7AoOeH9D6IjCKYhGS/NmMvl2am9JgsZSTW+es=; b=FFxQMVK8OkjlGgckqgMlaXNRlGISgserFg6BHw9Hpwn6i8bJQceIEDwaTKHFc27bcH yBftaObkG9vakeXpAj9ecRRyMd0Te03Rh2QtTJ6aepImP8WsRfs0dlFwuRWmBixy+ORg 4tgLTZvLwdfPPaHo/vPAgec59/LXc1+UvZQx9N227uc2QuBkfFuf6iTIIqw6bLLDvXM3 fbq9LUkUgDirJcPMgtMvc/s4uVpCyNmYvUpHjJYZwOEbY8ufvv/EasoiivbnwycI36aS eZwthTx/nVA4xs3+gmz+jxh0/ztTNickMfWA2i3r4JGb76YXMcVXPJaqs4ZrieCBvW11 laxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690117000; x=1690721800; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fJAUy/7AoOeH9D6IjCKYhGS/NmMvl2am9JgsZSTW+es=; b=dtGcz6WSUuCquNbI2rjkZj3JxQtIOa8XjiIqqXTB23wld2ZuK97BBJZaEEVpYoLm7r /ZMYAMa+T7x6ieCcyBf7N5wxsP8f2P8YBS/7r8azH0n0SxiHA3XRHFO8uV4o/yvNk5iA 0cu8TgNVJSNgUN/D15B1BrKf3fBIiXgJC1foE/6vyqNVToxxVRJkCrNez//e4ZWiF7sr dg3PaDJ9I8M0fNeXi33dHmc2MTGTXyQokwujoQu18QNIhev9ikUVXok6AjQGEzGSjy1Q lYBOcbkSeyvEn6wK7uGxjNNQGHBnraQ0hE3YF7fCFjZ0YRGN1DIkfXfM56I5xieo9kQG v/OA== X-Gm-Message-State: ABy/qLYVcYcMpgVgkZzMFdeFpohQpCgUEfUTh4oJId9csvjsM4vHOi3F adwRhRPDPZlUfB2xuOQwnvd3X4ZuVog= X-Received: by 2002:a4a:870a:0:b0:567:d:c8 with SMTP id z10-20020a4a870a000000b00567000d00c8mr5425352ooh.9.1690117000268; Sun, 23 Jul 2023 05:56:40 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a9-20020a4a9889000000b0055516447257sm3364107ooj.29.2023.07.23.05.56.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jul 2023 05:56:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Jul 2023 09:56:38 -0300 Message-ID: <20230723125638.3094-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 07/13] avcodec/hevcdec: check for DOVI configuration record in AVCodecContext side data 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: CGoemUC0zAjZ Signed-off-by: James Almer --- libavcodec/hevcdec.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index fcf19b4eb6..4807ffcbb3 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3403,8 +3403,15 @@ static int hevc_decode_frame(AVCodecContext *avctx, AVFrame *rframe, } sd = av_packet_get_side_data(avpkt, AV_PKT_DATA_DOVI_CONF, &sd_size); - if (sd && sd_size > 0) + if (sd && sd_size > 0) { + int old = s->dovi_ctx.dv_profile; + ff_dovi_update_cfg(&s->dovi_ctx, (AVDOVIDecoderConfigurationRecord *) sd); + if (old) + av_log(avctx, AV_LOG_DEBUG, + "New DOVI configuration record from input packet (profile %d -> %u).\n", + old, s->dovi_ctx.dv_profile); + } s->ref = NULL; ret = decode_nal_units(s, avpkt->data, avpkt->size); @@ -3707,12 +3714,18 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) atomic_init(&s->wpp_err, 0); if (!avctx->internal->is_copy) { + AVPacketSideData *sd; + if (avctx->extradata_size > 0 && avctx->extradata) { ret = hevc_decode_extradata(s, avctx->extradata, avctx->extradata_size, 1); if (ret < 0) { return ret; } } + + sd = av_packet_get_side_data_from_set(&avctx->side_data_set, AV_PKT_DATA_DOVI_CONF); + if (sd && sd->size > 0) + ff_dovi_update_cfg(&s->dovi_ctx, (AVDOVIDecoderConfigurationRecord *) sd->data); } return 0;