From patchwork Sat Oct 5 23:05:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp1190207vqg; Sat, 5 Oct 2024 16:14:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUL0bnf1IjsyQqK3hZWONexfLUGQrOfFLPauhDiAv/Gg6lFi23tzMxx4TUwJvUL7ruHBa8XuoH/zK81E1jSG8rM@gmail.com X-Google-Smtp-Source: AGHT+IEUNb+YD8VfsvbvdZV249WLoxV75B6AokJUlpExUZh1ETFShCoKBDnZBXjUiGZu44xIOQ7n X-Received: by 2002:a05:6512:2398:b0:52e:8161:4ce6 with SMTP id 2adb3069b0e04-539ac17e3afmr2000015e87.25.1728170046708; Sat, 05 Oct 2024 16:14:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728170046; cv=none; d=google.com; s=arc-20240605; b=am4H1bhF5ajWLp/RwGNkzQuKHKri5Pdfa5fUBTNmaDRUQ1xZY/FB3fLY6FwmbL/8u6 aTr2HA/rr01Qo+l8cQr2i9OP5aFsZJ5pPKzysH+iVIX30eOLP2IT4aJ27Zp4xCh6syDF vo/NEb45uuX/+l0iKnGNH2iBxJERU9Q7/c6g4AcnjTDYxkxuDbUMQ+svkXRYItcLWW6H kr6N2VX23AXBVyG8keHAm/WI8V9dO+WPTKtLWmZVCDP91vKy8+w51/mBkf7FGIPAYTAu 270PAssZC7ZPi0Qlk0//BAy2pmIrFkrHZXxDbKBhmZfm7hK/9IQlu8Yk0fkwSbsjPw2x rBkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=2vN6Dq5Up+XtRRhF3XgyoZU4Uwo4Vn2QzseVIdFr0Uw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=BQnnZHdMKh4EQm8cSkKZEoQ2T6vWvoD6vWjmEQ7xmWp0Ws85Lsc2QVfENr9CrdGHFP kIljxrCUMgwhLtH+ztochMxOKedEAiw6Wp+SKxUgKKm/yCgdhvAQtpXWeh5G2sEWvB7U NqLe/RO9TN64rqlyvMq6p7JKnyot/IrQOM+RGH4pfd3xLRqcWR1oyxtcSWbct7A3bk6b +LZ/8iF1I64LBcAL+CR08DE+TrwPupYAx73OovQ5TPsLrrvz4ydWEeuH4/2q09a+z2lE fJVmHmyE2yHAcQFied9i64fNeHcS8L374uFOyTXhLHAmg2B4CVc3qtjE4xGHXG7bOUzr aq4A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fQEFYtK2; 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; dara=fail header.i=@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 2adb3069b0e04-539b0693069si835253e87.2.2024.10.05.16.14.06; Sat, 05 Oct 2024 16:14:06 -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=20230601 header.b=fQEFYtK2; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10DE168D9E9; Sun, 6 Oct 2024 02:06:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F64468C2C4 for ; Sun, 6 Oct 2024 02:06:04 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-20aff65aa37so28133105ad.1 for ; Sat, 05 Oct 2024 16:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728169561; x=1728774361; 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=rMUie+cKmbLBpaEfb5DW9GV1emQ0OLA3nGPanYoyrFA=; b=fQEFYtK2DyxRgzJLbdqsTNrjNkHNUc9VHTeSTIGJu3pu6t3l8k2oYLVNBtHGiJgNUh 9SpfLttSq8XN+le8zsgVWtObqFtE++e4sxVhPPsYaOLY+fzCJTz2HNB2TyJ6lV7SIYil kKRctfVfANYcEILkpXb3OHyfOkDPO6gUs4Tjnhl9oXLslQFq3sT0PmhsRCxIYnyJ9Dwc 7FD1gmbrfLrVqx+1mH/t0k6fZ/ib77njH5hh1IX2UDdTcd4O6N92QXN2U19JEQzrNC+0 a5iZt+uP8yW3O6xIuM1KLS9v9J355Vy2TSfVI3k1YZ8bRej9xdtIvmHp3PTBFVynana3 IyQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728169561; x=1728774361; 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=rMUie+cKmbLBpaEfb5DW9GV1emQ0OLA3nGPanYoyrFA=; b=bgRf34RG0hybXx+OiTEw0UKidUJf1pXrNncI44Nb2+UMsYjDknF3Y0Xi9Xrx9kGK7C TC4m0/nqAwuha9gjAydbiIqb7uyr9pT1Kv+6/Lv1OC7oitJeddBw4kpWJ6svXaNoZe5b os+r9NjgQGV/KWbljHBXi6aZ05fEzTkCEU35543RsuO3r3g04aBWGZYt27v3fcTS4g6M XyG6IldlVZGdj/UvU1KmEF8r79s0W9kn7hcBIwkMmS5F0Q+GMCbjkwGYL7L931McyryU 5i8B5Yq6yMLve2nyjHp+TzDocljdrizt238a7IvJmN1oV4cd8RJF6ry4DoZ6XmBWkPXj B1dQ== X-Gm-Message-State: AOJu0YxzWMeqHh7ZO6RXonhtufFFv69eAM6xl+RRWLZY6QpJQtMSepuu BH0ijRwxQY8TATNWgaGQsLO6UxOMfDNilO7B//pb+sgwTo6/TUp8oy0Slg== X-Received: by 2002:a17:903:32d2:b0:20b:6773:a00 with SMTP id d9443c01a7336-20bfe059edfmr93818515ad.32.1728169561408; Sat, 05 Oct 2024 16:06:01 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c139355b5sm17678635ad.152.2024.10.05.16.06.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 16:06:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Oct 2024 20:05:15 -0300 Message-ID: <20241005230515.8994-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241005210530.7189-1-jamrial@gmail.com> References: <20241005210530.7189-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/hevc/ps: add a range check for sps_max_sub_layers 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: ndI3CbNCwCQD It can't be higher than vps_max_sub_layers. Do this while keeping the workaround for qsvenc_hevc calling ff_hevc_parse_sps() without a vps_list, as in some cases it needs to parse an sps to generate a fake vps derived from it. Signed-off-by: James Almer --- libavcodec/hevc/ps.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c index 993c60144f..c773d7d221 100644 --- a/libavcodec/hevc/ps.c +++ b/libavcodec/hevc/ps.c @@ -1158,6 +1158,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, HEVCWindow *ow; int ret = 0; int bit_depth_chroma, num_comps, multi_layer_ext; + int vps_max_sub_layers; int i; // Coded parameters @@ -1181,8 +1182,12 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, return AVERROR(EINVAL); sps->max_sub_layers = sps->vps->vps_max_sub_layers; - } - if (sps->max_sub_layers > HEVC_MAX_SUB_LAYERS) { + vps_max_sub_layers = sps->vps->vps_max_sub_layers; + } else + vps_max_sub_layers = sps->vps ? sps->vps->vps_max_sub_layers + : FFMIN(sps->max_sub_layers, HEVC_MAX_SUB_LAYERS); + + if (sps->max_sub_layers > vps_max_sub_layers) { av_log(avctx, AV_LOG_ERROR, "sps_max_sub_layers out of range: %d\n", sps->max_sub_layers); return AVERROR_INVALIDDATA;