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 ESMTPS id 5A79E4BD8E for ; Mon, 3 Feb 2025 09:18:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47EB268BFEF; Mon, 3 Feb 2025 11:18:14 +0200 (EET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9A8C68BD1A for ; Mon, 3 Feb 2025 11:18:07 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21670dce0a7so84632965ad.1 for ; Mon, 03 Feb 2025 01:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738574285; x=1739179085; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CT7EwszQVNRZt2cG7yCljJzMuV1Gg7snPqdJd3NZ4TY=; b=YdGYMsX7tnJgBUyoTiJ+0T2Wb3RpZLu6DQUy8DfAg6lxRRqMJDwdPFmv5BhIQrMLzs 2R9eC5dus4AidsibqsZ3aThgxgBJmtB4X0mvNsNKNa76ag0NnlKqVpI//USN2uI4vcXx N+KistLQUuKTiS2MsfBc38sf0utQbE/cZYr/xbNn+poRIBP01UdVXpp0Vui/ybaPjJeV ioWpWK50E/9+GpnYWrkuQUwoFMUlCxBEdskUMifj2YUhJd9LVkXHnReyel713PzHXw0v vxf3ayRH/GDLLW5UBsEr5aNMM0O7K/p+O7pXE8FSac5R0dQ8aQJnVCvzlFSzA/yDQWEx 5stA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738574285; x=1739179085; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CT7EwszQVNRZt2cG7yCljJzMuV1Gg7snPqdJd3NZ4TY=; b=ZzA7nuNIHI6oOurISgK+K724Lp3c/f2RF6VTKmIS2o8ktVy383/grsvgPmfOUIzzOu pRyieZsp+QjaqsbiWTkoFbqd2sfguyuBiwHN+j3zMcq/Vj3okKJ01V1H7T4PB/AtC2Hv qOfr9m7AB2KMlCejIWAcu8fVYTRehMGPvxSGEwQm1cBRuE51le/whn9K7ecdl0Exoo2X /4cp8G0etarK+FP1fU7owH7Y2To8HGoUVQXw8ZERJDJhOR9BdJ/91dKgSi+oez0W7Frg Ea5fOTl8MGgXcr+XOBFLR3mbvHZRnic8vFkA/vRYxRXSJJ89VztQgvrB0r8pbQnE3qR4 00zw== X-Gm-Message-State: AOJu0YwKkpvlxDbHqHZhtHOkdO8hFyH0IBf/xqoP9BAU4uUTAMxf6UQB 1ex/kdMZcetPtKJt3BwhsDZcfGm6T/KI6df2cZjJVzoqBdnLRqk+TfpLWg== X-Gm-Gg: ASbGncs2Oc8kYgVR7v/w8GN6RtxQslHrZdyo9qZyiEizOrCtYsfsQX8NUTZFXPo+EHF Kr9fOcm8GFE8tQpDAi1Ot5nIeIVvHyumtr4r/Pbq8POJ7kRTjcyafFp5GEU264AwuVOoB4i0tud fYMbEt+cMQPpV1pPn+9oXaqBvwe8peZ9pTvnKhOZNSlvvUw16inCeQgohE9j+k6Jf5akF4U0/1W 6swSKltxDBYutMEJLv2CKnhO/VBntaUDfu7SLKHklSAcQX1JTjWILYGCDxRlr0YRxWF0J1GZtgB u9HOFiPf X-Google-Smtp-Source: AGHT+IEe9hys/qJcuDaVDGth3QDi5HH3M4XLJaL0K+hvmxOvUh1iimq+tEdCHlCdkp7enfC4NT7imQ== X-Received: by 2002:a05:6a00:4f83:b0:71e:13ac:d835 with SMTP id d2e1a72fcca58-72fd0c14abbmr31305700b3a.11.1738574285237; Mon, 03 Feb 2025 01:18:05 -0800 (PST) Received: from localhost ([112.64.8.17]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acebddbb1a4sm7484620a12.7.2025.02.03.01.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 01:18:04 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Feb 2025 17:17:50 +0800 Message-Id: <20250203091751.259888-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/vvcdec: refact, set AVCodecContext->has_b_frames in sps_export_stream_params 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 Cc: Nuo Mi 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: --- libavcodec/vvc/dec.c | 1 - libavcodec/vvc/ps.c | 29 +++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index 51dd60ae92..68fb26352e 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -812,7 +812,6 @@ static int export_frame_params(VVCContext *s, const VVCFrameContext *fc) c->width = pps->width - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]); c->height = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]); - c->has_b_frames = sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1]; return 0; } diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index 01b4615eda..664e2c6376 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -23,6 +23,7 @@ #include #include "libavcodec/cbs_h266.h" +#include "libavcodec/decode.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/refstruct.h" @@ -180,12 +181,19 @@ static void sps_ladf(VVCSPS* sps) } } -static int sps_derive(VVCSPS *sps, void *log_ctx) +static void sps_export_stream_params(AVCodecContext *c, const VVCSPS *sps) +{ + const H266RawSPS *r = sps->r; + + c->has_b_frames = !!r->sps_dpb_params.dpb_max_num_reorder_pics[r->sps_max_sublayers_minus1]; +} + +static int sps_derive(VVCSPS *sps, AVCodecContext *c) { int ret; const H266RawSPS *r = sps->r; - ret = sps_bit_depth(sps, log_ctx); + ret = sps_bit_depth(sps, c); if (ret < 0) return ret; sps_poc(sps); @@ -197,6 +205,7 @@ static int sps_derive(VVCSPS *sps, void *log_ctx) if (ret < 0) return ret; } + sps_export_stream_params(c, sps); return 0; } @@ -207,7 +216,7 @@ static void sps_free(AVRefStructOpaque opaque, void *obj) av_refstruct_unref(&sps->r); } -static const VVCSPS *sps_alloc(const H266RawSPS *rsps, void *log_ctx) +static const VVCSPS *sps_alloc(const H266RawSPS *rsps, AVCodecContext *c) { int ret; VVCSPS *sps = av_refstruct_alloc_ext(sizeof(*sps), 0, NULL, sps_free); @@ -217,7 +226,7 @@ static const VVCSPS *sps_alloc(const H266RawSPS *rsps, void *log_ctx) av_refstruct_replace(&sps->r, rsps); - ret = sps_derive(sps, log_ctx); + ret = sps_derive(sps, c); if (ret < 0) goto fail; @@ -228,7 +237,7 @@ fail: return NULL; } -static int decode_sps(VVCParamSets *ps, const H266RawSPS *rsps, void *log_ctx, int is_clvss) +static int decode_sps(VVCParamSets *ps, AVCodecContext *c, const H266RawSPS *rsps, int is_clvss) { const int sps_id = rsps->sps_seq_parameter_set_id; const VVCSPS *old_sps = ps->sps_list[sps_id]; @@ -245,7 +254,7 @@ static int decode_sps(VVCParamSets *ps, const H266RawSPS *rsps, void *log_ctx, i return AVERROR_INVALIDDATA; } - sps = sps_alloc(rsps, log_ctx); + sps = sps_alloc(rsps, c); if (!sps) return AVERROR(ENOMEM); @@ -647,7 +656,7 @@ static int decode_pps(VVCParamSets *ps, const H266RawPPS *rpps) return ret; } -static int decode_ps(VVCParamSets *ps, const CodedBitstreamH266Context *h266, void *log_ctx, int is_clvss) +static int decode_ps(VVCParamSets *ps, AVCodecContext *c, const CodedBitstreamH266Context *h266, int is_clvss) { const H266RawPictureHeader *ph = h266->ph; const H266RawPPS *rpps; @@ -665,13 +674,13 @@ static int decode_ps(VVCParamSets *ps, const CodedBitstreamH266Context *h266, vo if (!rsps) return AVERROR_INVALIDDATA; - ret = decode_sps(ps, rsps, log_ctx, is_clvss); + ret = decode_sps(ps, c, rsps, is_clvss); if (ret < 0) return ret; if (rsps->sps_log2_ctu_size_minus5 > 2) { // CTU > 128 are reserved in vvc spec v3 - av_log(log_ctx, AV_LOG_ERROR, "CTU size > 128. \n"); + av_log(c, AV_LOG_ERROR, "CTU size > 128. \n"); return AVERROR_PATCHWELCOME; } @@ -960,7 +969,7 @@ int ff_vvc_decode_frame_ps(VVCFrameParamSets *fps, struct VVCContext *s) decode_recovery_flag(s); is_clvss = IS_CLVSS(s); - ret = decode_ps(ps, h266, s->avctx, is_clvss); + ret = decode_ps(ps, s->avctx, h266, is_clvss); if (ret < 0) return ret; -- 2.34.1 _______________________________________________ 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".