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 F1AD84CB04 for ; Sun, 11 May 2025 15:07:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87E7A68BED9; Sun, 11 May 2025 18:07:35 +0300 (EEST) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F70068B9BE for ; Sun, 11 May 2025 18:07:29 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-30a93d80a80so2894138a91.3 for ; Sun, 11 May 2025 08:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746976048; x=1747580848; 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=GNBd/zrQAM7eHbKseFeyDA+GFoiF4GAqBJ89lAWmhd0=; b=ETpLZARZvk/skzX2fxk4ZGlJQiD4Vw26lwsTID+rEmx3dAxOGLXpmTT9hKABE6PL7M weWvMsqsMwIj4+sHtVf+fBPfdZciE0gUvJ/sHf4AdO8H8vrbHngdLQrW094YjAqEO27s Qcl2vVl/cIsmcqWLlSuR5C7Rt2l3QL3YWPtysUKbnPPyzbPpVmtqTuk+rwyI0rgDMflq qJ6w1m4LcmxeNKmXZ1gAMSL54VAFAn/jCkHFzRVkEa79zdPEdf/k3+jC/V0ARBnF7l20 HfEmtNeCINFCkmjkT8Qw7nkd7iFxbn8KiziwzyU7w1EikFO31aMJmgDASgAT9BexRG9x MC5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746976048; x=1747580848; 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=GNBd/zrQAM7eHbKseFeyDA+GFoiF4GAqBJ89lAWmhd0=; b=HtVQo8OLcsbLWgwhU3bQdYFiaJlMdh1wIPEBdeO0ezvju63FiihZVUE6HxJMdDoHwJ Q+U64e9zSKRNEhd0rpHkukToCigmB0uCKkT1drmMZ+yVLtOLSU70Tq6ZCpBV9SiGp7nu aZzV4m5MRav1lXaCekQ4QddSBjKtYGaLfXojdADfAUk9hIyA6pIvl/eR+oELuR5447tW 42k7BpTLhgt2OZ6SZj58OcSKywEurHYETTz+CLThy6UZPcVaMv8c7tXDP3BilkiugKFJ 3kFmGmcDtoH2unu6Bulcc5ImAF1poqsXcXRW9lcE5SkWxt4ZQn5Zpen0Vgomdy+UYmV9 IXBw== X-Gm-Message-State: AOJu0YwwBav9Y2cm3LhoDfXdiD387nWPq3WnZPpGP3ZblDCBAbm71E0s n2rGXCYDUmYMNoUQy27Mw4K0RGbSXTP2fYTnNUTw9FHKiXgQNUWu7i/ppsuw8ULiUQ== X-Gm-Gg: ASbGnctp53N/QudT3fgcmvepjv/Rxhr10WBon78s+ZyzCczqf/S+ujTDJBnx1WpOZAw bsm+PLdHHnP/Aqp798QJNCbn8HM/dYscPyMWT+U4y2r6i7U8qCMaqmtc12f1iUDwL40h8TySzGV 1DFzIhXGkt7mLxUp1KB2P1rGUw/6Vl3f+VI2fy2SImb6qiCqVZZyiQ+UQa0EIsnbX8B7suyplr+ 5WJHHUR8Z9bMH1qkr9m0uxmS3JT8n7t1w2bH8PkzxGZaslV2ZZeRonTb1BI+195ctshrdfw7H+T 9jtJaE2YWPC2Un/g0iGhXDrnMc2deCMnuEmWrxf/Ba6MUcIjOd+FV0DoIDuxFiTy/Ls= X-Google-Smtp-Source: AGHT+IG7de+64AEcjnNz8JFxmLKaYw44hWzhlxvTbzDVxRhE3hE4599og6JiAiPCnTpRx6n+1OP8ow== X-Received: by 2002:a17:90b:3945:b0:2ee:c6c8:d89f with SMTP id 98e67ed59e1d1-30c3cefe5c1mr18488143a91.14.1746976047685; Sun, 11 May 2025 08:07:27 -0700 (PDT) Received: from xiongweixiao-ubt.. ([59.174.181.76]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30c39e76055sm4940021a91.42.2025.05.11.08.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 08:07:27 -0700 (PDT) From: xiongweixiao To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 May 2025 23:07:21 +0800 Message-Id: <20250511150721.2019776-1-xiongweixiaoxxw@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] [v2] lavf: vvc_probe: fix based on review feedback 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: xiongweixiao 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: Changes since v1: - Added a flag to force sps, pps, iraq to appear in order; - Modified score where pps, iraq appeared in the wrong position; - Set a smaller score for incomplete sps, pps, iraq to deal with situations that may look like vvc format Signed-off-by: xiongweixiao --- libavformat/vvcdec.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libavformat/vvcdec.c b/libavformat/vvcdec.c index 573b352f41..1d7be17258 100644 --- a/libavformat/vvcdec.c +++ b/libavformat/vvcdec.c @@ -44,6 +44,7 @@ static int vvc_probe(const AVProbeData *p) { uint32_t code = -1; int sps = 0, pps = 0, irap = 0; + int valid_pps = 0, valid_irap = 0; int i; for (i = 0; i < p->buf_size - 1; i++) { @@ -60,17 +61,29 @@ static int vvc_probe(const AVProbeData *p) switch (type) { case VVC_SPS_NUT: sps++; break; - case VVC_PPS_NUT: if (sps) pps++; break; + case VVC_PPS_NUT: + pps++; + if (sps) + valid_pps++; + break; case VVC_IDR_N_LP: case VVC_IDR_W_RADL: case VVC_CRA_NUT: - case VVC_GDR_NUT: if (pps) irap++; break; + case VVC_GDR_NUT: + irap++; + if (valid_pps) + valid_irap++; + break; } } } - if (sps && pps && irap) + if (valid_irap) return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + if (sps && pps && irap) + return AVPROBE_SCORE_EXTENSION / 2; + if (sps || pps || irap) + return AVPROBE_SCORE_EXTENSION / 4; return 0; } -- 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".