From patchwork Wed Sep 6 17:44:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43604 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp87529pzh; Wed, 6 Sep 2023 10:46:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGt+sfRxHvCKapq8ejTcxjStkzWaylnH1W6v8qpz9I9mNitWzTK+VKnQ/uRK3CS9gIb4Zbr X-Received: by 2002:a05:6402:5172:b0:523:2e30:aaee with SMTP id d18-20020a056402517200b005232e30aaeemr2837231ede.32.1694022392906; Wed, 06 Sep 2023 10:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694022392; cv=none; d=google.com; s=arc-20160816; b=aErPMTgHopaQf8AcgJc66v4Wq3hInll7p3gS7un1lv+vh6AAE8AqhqWn3is0qCAMOh SV4n5dXqASY2ZJby70vzgM2BFvsenJ09umthsG0SlJ1mwcTY+HkWth0PdTF1mSLzTyYg T05gUsE1IGcDVeWDFebtKoHiWmnKcJdi00LUX6CrbY6hP1rbvNwGu8+TMfTbLd3UDRdT 5XArYsA7OJUJCAcRkyh9q/+tcs1GEVkNGSiPSbX6YMEdZg1x6+VTt993BSiXflugCIHZ tl8CRop11LQ2UOuP3vGfeI8YJwrIJ2eBY2ZgOH0CoqKFIb0id1F3OMnWWG1SGthTWAWy eewQ== 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=0k5fYLy+qhGuplQmOqmiJBjfdAbbAmaxvRhUtWYIzHk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=0R6AD1EtEu1KxvHwYze76HobMhUBVcT94k3XCqGatALC3nYp9X7lQmkrzVdTqyKOSV LtuI3/4D99/Ee8b2ch+INtIJle9RTJMuSxS/8AehJad9zBhhuu6K772dOjsWXr0/lSAR 62Oq2OPtUKiTKgaYJJ4jx+H7IFUfa92ri85UjRQVJgXomNqRzg6gkls0Ho7RtCFYSkvx r6QOfoZfDp/DCC4YCO2wC14a4wb5HZyy2IbNwi2BDynoeAarxmLaCnhj20v4BU2SzHOt 82wyoGl/x65DzWhLDe8TprPculZZxDN1s3ewj3SyArMQtAokELF2jLBUEmakF+Z4EMPe SR/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=hwqQUJaB; 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 s26-20020aa7c55a000000b0052336331f58si9610718edr.518.2023.09.06.10.46.25; Wed, 06 Sep 2023 10:46:32 -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=hwqQUJaB; 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 8230D68C895; Wed, 6 Sep 2023 20:45:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8DC968C80C for ; Wed, 6 Sep 2023 20:44:54 +0300 (EEST) Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6bd0425ad4fso103795a34.2 for ; Wed, 06 Sep 2023 10:44:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694022293; x=1694627093; 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=VBS98L0pF3UQS+Tj97YCVwdR1ZFwYJZKZMr8TZCW5j0=; b=hwqQUJaB1LSB+oMzxz3h24kBnuDRfFi1E5HmNQ/OC/jZHE8w7MjP0k9sbHmMDVG7cn LFfxxuCrie1PWIOVY7NMaxdZY6RsRm45R81X9yIcZ1ip7v2RafWCWxXyTCDxcolQTl+K fwgZhot3XtIGrxriX0rNcL06NahyqrgYbWFbSYoFBJjOyb5ccDlknPB8G2rLtKEDWwIi Uc4UrzeiSbqyVXHPzcStQQlgzeJDWWyYMRK+3mFmbKqv14eE+t+dvCXDrq6kTL3XcPBC pa/sAZtQshHam+Q+EDrf2EAKb6G91uY9DHwZLo9rWeq0S6oIhVKu6pmNAJVdoOMirWOB ZeTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694022293; x=1694627093; 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=VBS98L0pF3UQS+Tj97YCVwdR1ZFwYJZKZMr8TZCW5j0=; b=BwZj6iRg5OqxrDo4Sf4FxO7pJ80E2qs0bm8+Jl2d4lI+WnN34Tc1uoUKD+8gq/lwG9 FrPQ0gjghiXGx6GOp6evr/xUY5sKHv+nfISg/BmTFOlo98HA7c5p77rlgn962ImrBxZh w7i9yYSMYCBJgoxykoi4QSUAf5pjfllrcFwT8r0k5oJCYEpX8q3ZUn6XL0nuT7Sw3Db7 dLvYCjjnDcLSMSdGUxIq29wR0edmn+P/qLrVBwA7d7KvOmnemH1sMvN6KaT3SLBg5Eh4 HE3mc1cdswZ40Tq/o91zsvy6XbDMcJjnge/hbB6WoyFIlS/Zksq1rAvVzDy6xlXPy4/2 7f7w== X-Gm-Message-State: AOJu0Yw8ijgPvQmDVFgOjN13KZuZFFnOHF2pyk5xeMXdF4r/50noUYVf Xc3Z9raM2s/2jh94V5X9zgydyXyTjA4= X-Received: by 2002:a9d:74c6:0:b0:6be:e1cd:7326 with SMTP id a6-20020a9d74c6000000b006bee1cd7326mr18014101otl.4.1694022293095; Wed, 06 Sep 2023 10:44:53 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v5-20020a0568301bc500b006b99f66444bsm6561309ota.71.2023.09.06.10.44.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 10:44:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2023 14:44:27 -0300 Message-ID: <20230906174431.45558-8-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230906174431.45558-1-jamrial@gmail.com> References: <20230906174431.45558-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] 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: rxgUxtlnyKld Signed-off-by: James Almer --- libavcodec/avcodec.h | 2 +- libavcodec/hevcdec.c | 15 ++++++++++++++- libavcodec/internal.h | 3 +++ libavcodec/utils.c | 10 ++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1f477209b0..b875076ba5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1893,7 +1893,7 @@ typedef struct AVCodecContext { /** * Additional data associated with the entire coded stream. * - * - decoding: unused + * - decoding: set by user * - encoding: may be set by libavcodec after avcodec_open2(). */ AVPacketSideData *coded_side_data; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index df40c91ba6..162b832800 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) { + 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; diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 83e0bc3fb2..517d96fb97 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -202,4 +202,7 @@ int ff_alloc_timecode_sei(const AVFrame *frame, AVRational rate, size_t prefix_l */ int64_t ff_guess_coded_bitrate(AVCodecContext *avctx); +AVPacketSideData *ff_get_coded_side_data(const AVCodecContext *avctx, + enum AVPacketSideDataType type); + #endif /* AVCODEC_INTERNAL_H */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d54e050848..4fbd591bf1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1111,3 +1111,13 @@ int64_t ff_guess_coded_bitrate(AVCodecContext *avctx) return bitrate; } + +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; +}