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 BE35D4791E for ; Wed, 27 Sep 2023 13:14:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5E0968CB3C; Wed, 27 Sep 2023 16:13:25 +0300 (EEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45C7668CB10 for ; Wed, 27 Sep 2023 16:13:15 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1c451541f23so87161745ad.2 for ; Wed, 27 Sep 2023 06:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695820393; x=1696425193; 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=j/EBfSCJqKmF7At9rAbUsBZuOATZTi1q4llPTL8wsr4=; b=S5wIrKcDOjRC4M0u8/jFQXReK6YLYFMK01gCOgvdtB4O8GzLKvcuByBoufu5Fq3Snt zyea+MX4sm5Ork6d+qSgVRB/ncjJtHEDKEtoB5yRXukPKFs5t0K4heaY4P62z64W3C4s 3WpLIBA7udbMIQHgFfbZpzjs268VvvrzTCwM7Z6ptJPimahOBvvLHUuWznOoPMhjfStK +oJX9urYPuP5bEaQro0ABDL65ba5Hx6U3BbLsCAiRKZTSzvQ+b2aTq6VKuFUEon2WiTj Ulq5ZsqTqXHYOSkMh/5YuBTc6i2Wn812DkdEkD2w3haWx6hLWzB2ey9KIbWgdM27JAXm 0yhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695820393; x=1696425193; 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=j/EBfSCJqKmF7At9rAbUsBZuOATZTi1q4llPTL8wsr4=; b=m8HV90xpaHF1JhtvvD+wMi1jxzhpcO+5wtN7dHM3AF6ZmgjoZxveJsLl4GCyhDhw7H s1o5OnwdY6x8eCxTGuFbH8BCVkLf0gZ6rdQ6AHlWrM2+Yd4zbOkitUF2cv+4pZ5EoozN XbLNPlfSiy2ckpNygp2q0Cif6iPErH57W+XJTeClxRI9ykjnbE/bCZkblJzW2vwxGN2P e+MMXT5C1P9op5Y26yTJS58R2XJPJhzFrRkE+t1TpJEjGu5NUHA3HhOZc9mLEkV5QnHC SmoZXcI5Ax83wbROl7rYMMTgsOEvlgpLdZDeelHzu3ULF4c0ekzg3o9/e5ode45R930O i6xA== X-Gm-Message-State: AOJu0Yy+3QybUFApyS6ShinbSniwoMe0CQk960xCk0MLp21sNrhYqR1a 6pOqJQpHSXQrE5XxTaGz2ubDvNK5HDs= X-Google-Smtp-Source: AGHT+IEAKhMn9BRm+LjXhUi0CcbtWBZ0V5F2i9RIXWhbAa7VT84zZ5UgTTWcjoVuBNGQunqgObyF7Q== X-Received: by 2002:a17:902:7888:b0:1bd:d15f:bdfa with SMTP id q8-20020a170902788800b001bdd15fbdfamr1442505pll.68.1695820393229; Wed, 27 Sep 2023 06:13:13 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v10-20020a1709029a0a00b001b53953f306sm13050600plp.178.2023.09.27.06.13.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 06:13:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 10:12:39 -0300 Message-ID: <20230927131242.1950-9-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230927131242.1950-1-jamrial@gmail.com> References: <20230927131242.1950-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 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/avcodec.h | 2 +- libavcodec/decode.c | 10 ++++++++++ libavcodec/decode.h | 3 +++ libavcodec/hevcdec.c | 15 ++++++++++++++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index da3c5234a0..48a4b73fd3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1903,7 +1903,7 @@ typedef struct AVCodecContext { /** * Additional data associated with the entire coded stream. * - * - decoding: unused + * - decoding: 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 466c393c1e..a7196b5740 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1400,6 +1400,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..8a7dec4e2e 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -153,4 +153,7 @@ 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); +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 81b9c5e089..59d59bbef4 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3340,8 +3340,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); @@ -3644,12 +3651,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; -- 2.42.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".