From patchwork Sat Sep 14 10:45:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51596 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp311043vqy; Sat, 14 Sep 2024 04:39:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQRBrC7zKq0eFWaKLXTgwPvpdHEABFoZXIEPmV+McEdDfCVRadzjBY6Ru75YjK01giRczHUVL1NTO+Vq/C9s4Z@gmail.com X-Google-Smtp-Source: AGHT+IG5xfZJL7XB82C6LgJ4r0eOGh0mqx5Dcmsa0L7xQVHwmIyu/4bNEZtgxb7jKbVwz7TncbL2 X-Received: by 2002:a17:907:94d4:b0:a90:34e8:780f with SMTP id a640c23a62f3a-a9034e87ae4mr768853166b.63.1726313960168; Sat, 14 Sep 2024 04:39:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726313960; cv=none; d=google.com; s=arc-20240605; b=IGVZ1x1t8bjA/PTLQ7d6xcvR0pOHIwD+Vncb0YHkpWTQOy4fmrSOVpzE1bqNT75Cco I/oqhLQFyfMTpCgUMG0o5AxjNbOap/wz3WYX3uUaA1aDmPcut72SyZovNGu5G5bh53ec awtRHxCjvwGmnS2uCrlG918BJXfi6rR/DmYPoT9+7Nc65Nf7R/u1otkiP7q+tZ3uOlxS xdZ82JA5H6b89K0rvV7pgPmRPRTynONDrDQu1Ut1+pjWYqDwRrsRHdTyJR1QJOAEldki b/DiwkxEGBd15v9RrNAPcCKKDkAc7yDUkG4pJivDiCtRl+GJIByj5wCPd5f6VTVh8Gjs nGnw== 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=8yUV2O6P4RrvUbiq4QixVg2B4GMv0QDz3Hrk8c8hvpE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Af/cb0O0mrnGsVmJU/m/qd0yMw6OpUhwhOW3jqwTMe4EAV+zgKh+vI++CKqQyqSij8 ClZT002JM0h3uGdMZAJlNBd6q2sqNwiJiPFylo5izJldKsy7FsC32HF3HVDmSKQfEj7w iHNpM6K3rqtDi15bIUWgt7wIxi7lIE/+xXnj914K4jwFl460d1uU7EnT6ebRAOx3VwhN eH01qu19sirXiQqoYUhCHvQP0c9TGXsBYp89HvWAIbzUFnzgGClwB/MPV23UMwu6lCG4 M5XJSD3jpy5RigKKmVTMhdv2pYJENP4NqFHw/rs5ouBUaVNj02/AElCi3RCoXKHoBZS8 Lntg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=rskY7mN1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a90612e92desi91102866b.530.2024.09.14.04.39.19; Sat, 14 Sep 2024 04:39:20 -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=@khirnov.net header.s=mail header.b=rskY7mN1; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46B5368DE8B; Sat, 14 Sep 2024 14:11:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C98F68DDE8 for ; Sat, 14 Sep 2024 14:10:54 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=rskY7mN1; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7434A4E1B for ; Sat, 14 Sep 2024 13:10:52 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id F89yYOBz-BFL for ; Sat, 14 Sep 2024 13:10:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1726312246; bh=9iKg3cUcvDD+c47ybj4dmO+wUqJrKaOUcSLrV9C8nUg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=rskY7mN14VzmNQSmS8fwlX7irWOs+rXkXCpy4589kZTOXJE37lvR36UByYr4N7mgB U7hb2PV58HoD4UZ6+YKRUDipHyo/pwSOCOrCzDGxEvtk3RHerl1SPkJx43ucbDXi/P ZzSAoakde71SWiliOc5VJhe1mLHgkQ3GEvDxneDdGS4yhuBiHlE9pclhitbd4ASSvS IgrZx9Qm8OYxyce1bUAAxA/88kGXeCyVhN/CI/SktdFr94w3rw3LRsx+JRdUrHaawi ZB1RKEt6ZUzG7mc23nqiyUtBDGlSSKlUgo7UoD0PrY4SQ5FH5H+HkM9iMR04jLg13M bLG+aUQrRy6lg== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 9FA384E25 for ; Sat, 14 Sep 2024 13:10:46 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D29A53A25C4 for ; Sat, 14 Sep 2024 13:10:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Sep 2024 12:45:46 +0200 Message-ID: <20240914111036.17164-22-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240914111036.17164-1-anton@khirnov.net> References: <20240914111036.17164-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/23] tests/fate/hevc: add a test for nontrivial values of nuh_layer_id 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: fGuTgLzCxVhd Typical files use 0 for the base layer and 1 for the secondary one, but any value for the secondary layer should be supported. --- tests/fate/hevc.mak | 4 ++++ tests/ref/fate/hevc-mv-nuh-layer-id | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 tests/ref/fate/hevc-mv-nuh-layer-id diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index eb9d3a875c..df827d821f 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -272,6 +272,10 @@ FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER) += fate-hevc-sm fate-hevc-pir: CMD = framecrc -i $(TARGET_SAMPLES)/hevc/pir.hevc FATE_HEVC-$(call FRAMECRC, HEVC, HEVC) += fate-hevc-pir +# multiview stream, where the secondary layer has a nontrivial nuh_layer_id=6 +fate-hevc-mv-nuh-layer-id: CMD = framecrc -i $(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit -map 0:view:all +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC) += fate-hevc-mv-nuh-layer-id + FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes) FATE_SAMPLES_FFPROBE += $(FATE_HEVC_FFPROBE-yes) diff --git a/tests/ref/fate/hevc-mv-nuh-layer-id b/tests/ref/fate/hevc-mv-nuh-layer-id new file mode 100644 index 0000000000..3cbefe17f6 --- /dev/null +++ b/tests/ref/fate/hevc-mv-nuh-layer-id @@ -0,0 +1,15 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 128x128 +#sar 0: 0/1 +0, 0, 0, 1, 24576, 0xdfd350a6 +0, 1, 1, 1, 24576, 0xf8f638da +0, 2, 2, 1, 24576, 0x8ac574d5 +0, 3, 3, 1, 24576, 0xd22675a4 +0, 4, 4, 1, 24576, 0xdd0f4704 +0, 5, 5, 1, 24576, 0x60da42e6 +0, 6, 6, 1, 24576, 0x8bf28fdd +0, 7, 7, 1, 24576, 0xe0577f6e +0, 8, 8, 1, 24576, 0x8b3e3c29 +0, 9, 9, 1, 24576, 0x8d9944bd