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 4CFBE4CD35 for ; Sun, 26 Jan 2025 03:11:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1222068B9C5; Sun, 26 Jan 2025 05:10:50 +0200 (EET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0AE368B875 for ; Sun, 26 Jan 2025 05:10:43 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21654fdd5daso57020355ad.1 for ; Sat, 25 Jan 2025 19:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737861042; x=1738465842; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DWZZLKf/pRSeIgT/c1bBHDVnyLReyfQ6a/NoX9xGOvE=; b=KeQzHhBuNjmYikxhsV0tRjTD60h4fDLC2g6mWfJwCqr/iYEGeac7XEyGKXgkR4utJy mypYFLIoNjYpM5OxQGPik+EXTaBzgQEpohOAEsKkjaZXTqEWcbNxxiwcO708NYoGA9lu 4b2RDHbDZEDOH4tmLZR5fgdNK5x7wyAeCMvH+kNxGnjayRv8XRbiGMF+iXteBy0eTFQy AkJypYAxY+GFuqoosJ/IlY24v64Bd40owZLwLKpFVOVeW4/RkVQfSMl5c1Mc923mKUIV ICDbtrui+43Hdq4JBraWeC7U9hAaHrK32c611oNV/0vQ4oXT0pohqqPE2zY3YAL4obVN dlgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737861042; x=1738465842; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DWZZLKf/pRSeIgT/c1bBHDVnyLReyfQ6a/NoX9xGOvE=; b=lLX4o3Tbk43eIs9mvH4kv64YQ8Ybxt4WHfkcy2PHfsJCX67Ruan5iRVk7sfhlVYPSY iVvXBQjw2jV36JRUKBvTQcBTQic0XrYrYqq9SAXcuZSR3yqDwazVq8j1HPgRPEa9xYwj SaCpdvi7IyNSMhOo0gaIQPKxbMTx4j24x9WM25gDC5wQkd38piK8qv25eE1YXLdgdz7t 0rcEoL92OT1FtUuNK8kGdwg18545e4kUN/O5ow8y5qy7Rf9D2x6ZgyNa864+mz2I6iow UWk1OsaYaMiwMdHVojP+bXaAJuLomKqbDZALfNiHRvr0XbatFcuUGurGtgNl7692S+9o 5Deg== X-Gm-Message-State: AOJu0Yx7R/WNLPin+ol1333c2jQqrs7qNd6vegOAx3DunmaLBekA0P+n cGT7wGYMgVBseyApx19DFj4SQNxWEOjqX0TOFINUrWR4AYHn9NexNB3fML6S X-Gm-Gg: ASbGncub00PzLYt2gCU8Nceqi0+zlhV0Oh7vZDbV7yx1wSrsgdMKZwQ00FeioNHMtha mRS7anS3kjLQilX0TSHtAIiM2wM4umAwtqCb0hFYCW8wpQgqfRITYE+1nK9M3yU4edXaF6hAhTI H0g2SpDbEhF8Qs40ICeUXwGdAU8w/xJcc5FPjPpLIOy4O7C9mS+pbIQW4t4xTzB6FTBT4ixv4Mh J3HEk8FQ+PnqRC+VzhM7Av9lQdhAml8yVmzTrsUycwQjxz4SCLBJjCmphNGDJBPJb/NQjJ/GA== X-Google-Smtp-Source: AGHT+IFOYsLEYndZ4dqbDlTYbQR9xrHCIeTeiTpUq6/E43HYZS55vICFnlkvlasDx24tpzPpS+d6BQ== X-Received: by 2002:a17:902:db0f:b0:21b:d105:26b9 with SMTP id d9443c01a7336-21c353efef1mr540695395ad.16.1737861041896; Sat, 25 Jan 2025 19:10:41 -0800 (PST) Received: from localhost ([112.64.8.17]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da4141513sm38929545ad.119.2025.01.25.19.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2025 19:10:41 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jan 2025 11:10:20 +0800 Message-Id: <20250126031021.309218-2-nuomi2021@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250126031021.309218-1-nuomi2021@gmail.com> References: <20250126031021.309218-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/vvcdec: remove unneeded VVCContext->pix_fmt 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: Frank Plowman , 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: AVCodecContext->sw_pix_fmt is used to hold the software pixel format. Co-authored-by: Frank Plowman --- libavcodec/vvc/dec.c | 17 ++++++----------- libavcodec/vvc/dec.h | 2 -- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index daf537294f..51dd60ae92 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -799,18 +799,15 @@ static int export_frame_params(VVCContext *s, const VVCFrameContext *fc) AVCodecContext *c = s->avctx; const VVCSPS *sps = fc->ps.sps; const VVCPPS *pps = fc->ps.pps; - int ret; - // Reset HW config if pix_fmt/w/h change. - if (s->pix_fmt != sps->pix_fmt || c->coded_width != pps->width || c->coded_height != pps->height) { + // Reset the format if pix_fmt/w/h change. + if (c->sw_pix_fmt != sps->pix_fmt || c->coded_width != pps->width || c->coded_height != pps->height) { c->coded_width = pps->width; c->coded_height = pps->height; - ret = get_format(c, sps); - if (ret < 0) - return ret; - - c->pix_fmt = ret; - s->pix_fmt = sps->pix_fmt; + c->sw_pix_fmt = sps->pix_fmt; + c->pix_fmt = get_format(c, sps); + if (c->pix_fmt < 0) + return AVERROR_INVALIDDATA; } c->width = pps->width - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]); @@ -1138,8 +1135,6 @@ static av_cold int vvc_decode_init(AVCodecContext *avctx) GDR_SET_RECOVERED(s); ff_thread_once(&init_static_once, init_default_scale_m); - s->pix_fmt = AV_PIX_FMT_NONE; - return 0; } diff --git a/libavcodec/vvc/dec.h b/libavcodec/vvc/dec.h index 382311e3be..6aa3121550 100644 --- a/libavcodec/vvc/dec.h +++ b/libavcodec/vvc/dec.h @@ -241,8 +241,6 @@ typedef struct VVCContext { uint64_t nb_frames; ///< processed frames int nb_delayed; ///< delayed frames - - enum AVPixelFormat pix_fmt; ///< pix format of current frame } VVCContext ; #endif /* AVCODEC_VVC_DEC_H */ -- 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".