From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0C78B46563 for ; Thu, 20 Jul 2023 20:35:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4117268C650; Thu, 20 Jul 2023 23:34:42 +0300 (EEST) Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1A9568C5D3 for ; Thu, 20 Jul 2023 23:34:32 +0300 (EEST) Received: by mail-oo1-f44.google.com with SMTP id 006d021491bc7-563439ea4a2so801507eaf.0 for ; Thu, 20 Jul 2023 13:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885271; x=1690490071; 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=0Wo6ys7fJvyK2gZ3yb6jpp9ZFIgySxQUL2mMoe3+x1k=; b=NRJ4lTiC4y8onxzT6N8Ibej9Y4yH+B01zwct0huoHaWbgEtY+wwiTJEpN5aOt6NIFI NgmSKmIKZWNFA/HR4+izLndIyb54pVU8PP6b6ljGu/AQBXKyf4+LLVkqcwT3oDBdKodz OXCRjbnqVvGTphvDpI/17DpwrQZ4GsWT+a/KY+3E/8OX9HBd/Vdr0VgPOqbNGB2YrtBE AtRXSC/lt8ea9/2aVxyPkkV5iUk/cwwT5jAfqjnn+NnWP0DFsR70lBUtwtNk4xOb6Uu1 8erCcfkRtrWfMVcn6LZQeXZekss5ahEybjPALbq0Oc3HPdUiP7ufDykpa6ctGDH/Lkmm zcFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885271; x=1690490071; 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=0Wo6ys7fJvyK2gZ3yb6jpp9ZFIgySxQUL2mMoe3+x1k=; b=ImmKDAge0NJkGCNvvODewDyD4s7EcS3oaogijw2nOHXxG9iUYujnHH1dQqapV+J5MW alX0ZHHmAj2VMJgCzEKfwsRBu5YJDPNHN0PnZlhRSWKre1lOZt9gp1qtG1rzFqN7HpLv yZqrPJwIpRah/2OG63rZ/hY7dfOseqIE+aBQOTDnGxn7Fgs3cvdI5NlUUUQoqQwe+KG5 MwgDWveyK7fXfpbDVAq/gOTp+CFdiwkQZXDJVhcKIutzhA8mObUebOwgEL8MbehWUgq/ VNjzv7WN6NtNkhOzDS5HnMqfofFBf2KfA0rCNIxyWgezQnnBPFM4QztQRONPljoEt7Y5 +URg== X-Gm-Message-State: ABy/qLY6FbhPebB15BwwVdczkG8RaVmWtzcMOwWQVvH4/pm2iVnjioDH c6O7ZzZNc6F5PlodMq8IVpIXQl/4Xqw= X-Google-Smtp-Source: APBJJlFmsZJJHpaCguScaaJah/mkmzHqCt+nKsMMQWo49NwBmiubXpwhm4MEK6fQ500cPDTLWhRiMA== X-Received: by 2002:a4a:6c1c:0:b0:566:ffa7:fd00 with SMTP id q28-20020a4a6c1c000000b00566ffa7fd00mr276472ooc.6.1689885271262; Thu, 20 Jul 2023 13:34:31 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m24-20020a0568301e7800b006b95e17fcc7sm800094otr.49.2023.07.20.13.34.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:09 -0300 Message-ID: <20230720203415.41757-7-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720203415.41757-1-jamrial@gmail.com> References: <20230720203415.41757-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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 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: James Almer --- libavcodec/hevcdec.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index fcf19b4eb6..0d659e4c55 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3403,8 +3403,12 @@ 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) { + av_log(avctx, AV_LOG_WARNING, + "passing a DOVI configuration record through packet side data is " + "deprecated and will stop working soon. Use AVCodecContext side data\n"); ff_dovi_update_cfg(&s->dovi_ctx, (AVDOVIDecoderConfigurationRecord *) sd); + } s->ref = NULL; ret = decode_nal_units(s, avpkt->data, avpkt->size); @@ -3707,12 +3711,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; -- 2.41.0 _______________________________________________ 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".