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 A18E8472C7 for ; Mon, 4 Sep 2023 15:05:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5461868C7FD; Mon, 4 Sep 2023 18:04:39 +0300 (EEST) 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 A8F0568C7CF for ; Mon, 4 Sep 2023 18:04:29 +0300 (EEST) Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-57358a689d2so1112167eaf.2 for ; Mon, 04 Sep 2023 08:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693839868; x=1694444668; 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=eLlkauYpdTRBnajYdtAbwADU0RFjFWCIvcxv8lov7g0=; b=jZbtHBMZup9n55vISxeV05ZtC9b275rKekhmq4OX/rhVfR1ZOQNgwGLqbasrbyI8Ux lNh9s+K1/v3B27HEvMWUeryJttBzIX+wfAcBYug3XcFweOlHUCAoKUd4GINM/y6kUUaJ 4NizTzN2VCKbJubaouTqFfDZOUxkKYHEuqHrYpdxHoIUic6r60ITofTJ+EI6s7WPSTrv g4PXotJSCdVtoVj7A23bQ/T7sgtbEKfzUCZRzH6pyex7aMXziDU77UUmgZ0689lnAEo9 8npft/tiZP93dwdHhJ14gKQs0Z4q2MmcHbsAoXo9tLSOHM6WzpSylLJN+W/kddgbULvz Ud2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839868; x=1694444668; 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=eLlkauYpdTRBnajYdtAbwADU0RFjFWCIvcxv8lov7g0=; b=Rd9b8hWQKLkqit6if+blrv5k2Ts1shqDnhELfHG1uEVC8Gz6sTWWHh6RJV26Fq0tOS CIfGeYyhsy8GuHxx1RrxKTdRloXKUYamjOXetoqrXiz1dzkzMRN9IqmtgUXtmLje7qLm YO3Q8FFT9vrDlVcIx4i3ksjCnIbd/P4iFveZ8HWR5zIoAj28FYLPet/2KVyV/fhqkqhV +bftVN7nU+c6Kodn3fqx2PaSRcYBD67EHebW2rjv8W5ksUYPmq0XhQnNXE0UlNRrH7Xh 6iKACz900jOGXeEYqqAtIKC0/OZTKa+ZiYHa0kSZqw7hlfXku5HAs51hsLgFYj330EQX UIHg== X-Gm-Message-State: AOJu0Ywmj8N/j83HdJyMRxM8znqRPVNc3jHkXl5vNvWtTETD+cD4fPBO 05ekUGTkWSvj92pIXMUdqMO1JA7/pxY= X-Google-Smtp-Source: AGHT+IFzVAmLZALU+Yv1ZhFcck871jwSu02f3dMaRm4Y7r1yV6XiwgVzY/at+rMtbuwEqT8bhKbNqQ== X-Received: by 2002:a05:6808:158a:b0:3a7:3ab9:e590 with SMTP id t10-20020a056808158a00b003a73ab9e590mr13826168oiw.9.1693839868013; Mon, 04 Sep 2023 08:04:28 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z14-20020a54458e000000b003a9cd23980esm4946286oib.8.2023.09.04.08.04.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:04:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 12:04:00 -0300 Message-ID: <20230904150411.56777-8-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904150411.56777-1-jamrial@gmail.com> References: <20230904150411.56777-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/17] 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index df40c91ba6..dabfe89d4a 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3337,8 +3337,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); @@ -3641,12 +3648,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_side_data_set_get(&avctx->packet_side_data, 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".