From patchwork Wed Oct 4 12:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44148 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f21:b0:15d:8365:d4b8 with SMTP id gi33csp477915pzb; Wed, 4 Oct 2023 05:30:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGt8fqR4lfgytQAsOHUPVQ+axF1vlTG27524nF4O9suEMxpwHpjTr9FjIVNVL+26iyJ88iy X-Received: by 2002:a17:906:7389:b0:9a5:b878:7336 with SMTP id f9-20020a170906738900b009a5b8787336mr2155825ejl.7.1696422654106; Wed, 04 Oct 2023 05:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696422654; cv=none; d=google.com; s=arc-20160816; b=RSeCOUcKsX9Sz2frE4Rvq/LJw/Cf+cuZP0BBU2rUNsSUuhKEumDLp38g9/LvoacIqB HPxt8LLbUaCcWUpBZW2h9d42/UxJfWjB41uorO+fgkdhxW3eQK3CznYHtgt3tWbzHvbV CO/1eFrWUAMSAfM1xxgWjGD5u+nbWWJYY0aWPijIljm1zikvMLdXegOZWLf9/0AGF4E4 Qv0oGhpFvLfePwx5cdnzkD58CNV8uRNF23ab5d941LWNSYt/WaukNf8xbar+azr0EaoH mx9WM2rxn3CxuoD1mgAQrIvBbEQimTjrczm8VSDm0ukj4Daus/RK0aqD6Ajdriq03iyU MNNQ== 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=A9Ss0cU51DuDoZWfY4OvD5vCpE3OznoE8sdmU7J4nEY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Z5YIF9e6JZKJPEVlQMPUOCkLM1RzzcAEU9aZXwsNECLEEAowvyfNNOaP5OO3kGsUE8 ZQm4jCS48pRxbRTxG3MuKD7UPrDgTMtekhJtEEPyeFxmGHqfky2cvxu5sN1S2Z0Mhr2s Tdow2MqshLjs41jeNneY9kr0pbvj2LuyUyl3+Pely4h+x81WsLPs3jNQdQ5w0RI3uHUH xHpxyVjkmDRkHSJS2MscZAiyf58z7YJP+B5QnoakT4bq99TRGkhx+dSdsybX0qeFnvkN aWn7Rr/uTmnfCINIh2cRa2sEMjnuqv4PJVEIDMMJ7pUz3RQKBHOZMqWAXAbxIXNMPT3w pY2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=hcJ8JJB1; 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 um10-20020a170906cf8a00b009b64f6772dbsi1712358ejb.181.2023.10.04.05.30.53; Wed, 04 Oct 2023 05:30:54 -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=20230601 header.b=hcJ8JJB1; 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 408D568CD7B; Wed, 4 Oct 2023 15:29:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A58E68CCF7 for ; Wed, 4 Oct 2023 15:29:04 +0300 (EEST) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5859b2eaa67so1348894a12.0 for ; Wed, 04 Oct 2023 05:29:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696422541; x=1697027341; darn=ffmpeg.org; 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=+RMs90a8Wd2hzR5o08Iof+OONaMQWo7cCpcSfrVqIPA=; b=hcJ8JJB1FDmUtAhh/WJBCf6RUJfNFA3eQux48E8dgqQtywwL6Xc5NvP+vhZR6dQr17 i4iCKYakpj0OxNTSZdkermt7gvqvB+Mb/f1dppotGcZ/lcpv2wpnwkEIzqqL5ilU8FNg 4Ww9eZpFVyPSlQ/KB+j13YUBlSYztMbra3S+J/YPqbCZcZ5o9IzgLy3K7U0IV40AFeNB jexcedsJkJFprCQCUMhO7F3B+cHRigc50Xg+veaVLnSGiaFKqQME2s0XcPpDNM24tY7B LKaJfUYKGIIbHCq09NkdrQXhwvqR1P1Muq++uoF/NmiQqztCk2M7YfOjtAWeJFtd3KaK B3Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696422541; x=1697027341; 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=+RMs90a8Wd2hzR5o08Iof+OONaMQWo7cCpcSfrVqIPA=; b=tbNtcudEU4HXUxDXfCWUVtvTMSapYPr+4CHgzZt2uQV+E7JTk5sUu4cN2SEZMBIFYZ 403eMrGK4QLY2niqtStDj01eAayWUfsFCkI4EVdr5xLT85ymB46Px5JPpsjsatfACg0w 9FFtO2GpLwiJHNmmDUe/gEtEE0y581V99v/LMxdZNxtsCslDIKm3rl4wFLF98xVcQN70 xwhKW71bXPqZy4H80RnDDNOxRqd8BY7B5okYnuRR1cCw3WzfSX0q5+nOIsCHKoskhLII l4EVP/VuYdhZ1DgPJbLFtaxMsY4xyehYvxK1MLTozQMOFmkNXuLsSDZrawE5f8IecnKK ViUA== X-Gm-Message-State: AOJu0YzwV609W0xSR/vZF1ajVH/UMqbAyJsnK4Prg3EExOT2MD9jZ4V6 Ctjnl89iapq/FN0jh0H6WzL9YpWZzek= X-Received: by 2002:a05:6a20:9146:b0:15e:dc75:66af with SMTP id x6-20020a056a20914600b0015edc7566afmr2444684pzc.59.1696422541531; Wed, 04 Oct 2023 05:29:01 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h11-20020a170902748b00b001c57aac6e5esm3551831pll.23.2023.10.04.05.29.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 05:29:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Oct 2023 09:28:46 -0300 Message-ID: <20231004122849.56604-9-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004122849.56604-1-jamrial@gmail.com> References: <20231004122849.56604-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] 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: FgkEgusFrpj1 Signed-off-by: James Almer --- libavcodec/avcodec.h | 2 +- libavcodec/decode.c | 10 ++++++++++ libavcodec/decode.h | 6 ++++++ libavcodec/hevcdec.c | 15 ++++++++++++++- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 09400b97b0..42b34ee89a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1907,7 +1907,7 @@ typedef struct AVCodecContext { /** * Additional data associated with the entire coded stream. * - * - decoding: unused + * - decoding: may be set by user before calling avcodec_open2(). * - encoding: may be set by libavcodec after avcodec_open2(). */ AVPacketSideData *coded_side_data; diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 8f94678e9b..d81c418e10 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1403,6 +1403,16 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) return ret; } +const AVPacketSideData *ff_get_coded_side_data(const AVCodecContext *avctx, + enum AVPacketSideDataType type) +{ + for (int i = 0; i < avctx->nb_coded_side_data; i++) + if (avctx->coded_side_data[i].type == type) + return &avctx->coded_side_data[i]; + + return NULL; +} + static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame) { size_t size; diff --git a/libavcodec/decode.h b/libavcodec/decode.h index a52152e4a7..be03c136e7 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -153,4 +153,10 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame, int ff_hwaccel_frame_priv_alloc(AVCodecContext *avctx, void **hwaccel_picture_private, AVBufferRef **hwaccel_priv_buf); +/** + * Get side data of the given type from a decoding context. + */ +const AVPacketSideData *ff_get_coded_side_data(const AVCodecContext *avctx, + enum AVPacketSideDataType type); + #endif /* AVCODEC_DECODE_H */ diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 2be62ddfb2..5acaa407dd 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3343,8 +3343,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); @@ -3649,12 +3656,18 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) atomic_init(&s->wpp_err, 0); if (!avctx->internal->is_copy) { + const 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 = ff_get_coded_side_data(avctx, AV_PKT_DATA_DOVI_CONF); + if (sd && sd->size > 0) + ff_dovi_update_cfg(&s->dovi_ctx, (AVDOVIDecoderConfigurationRecord *) sd->data); } return 0;