From patchwork Tue Jan 24 22:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp715743pzj; Tue, 24 Jan 2023 14:47:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXuENfPFnymfKTIRi9IMDmwB9gUFAdo84c6xS1XeI7uEYyuC9BhBb9SBEyaJdsywUO38dJHH X-Received: by 2002:a17:907:d40c:b0:86b:aa56:7451 with SMTP id vi12-20020a170907d40c00b0086baa567451mr33407684ejc.53.1674600433775; Tue, 24 Jan 2023 14:47:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674600433; cv=none; d=google.com; s=arc-20160816; b=eHLQRtsR+8YbBMY9SmjzkSlSHKrqf4WvGcXOsntySkw3S5bFbTIaaKhbJJLJtm180e S+VtUa7RAPmbGJ/HJkoP1UMMpKUY3bJPIGr9G//wnTLPGgOgA6o9/1akQ9qL9Wx0NuIW +yq2ZzHwHtzsdd1B5nk6oHcDWyIe9+u7kBcIaS6G7wOSVfDI7B2ThEupKorgkncnp/r/ nXzGJSxrIWxHq3aBvfvWmQHkxtazH8+N6yEdcYmqkZgTFSBXCy9Z/a6B4nvbtj4CkolR YgSO6slnPhe3XwAJoPn4EGr8ShQN49j/a5jBhMuvCtdtdTSEjM8HTxBAZHDxmrkOqPMG jvCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:message-id:date:to:from :dkim-signature:delivered-to; bh=DHkGu3hPDrcqXPpGplyx3jsL1kFngSUVHqY8qjV/bBI=; b=Qbcp6nHopKa2olNKZZpmEdahLV/4h0p7ivZ8PzzywIkopGlm5Ne3+x8Gdy6sqHCLjt Nd1yV+hazd9zbAkt5VdtIsvm970oGkeca+AeGPICoCUcIJUqsoXWPia+W1uOIDrByvjZ mj/csCxZ1qHI0M39QmrFWYRNVmE6L1Ic1a5kBBIgwho/hxJ0AZ75c4yLQIVogALTgtWa OuFAmyMOiSmtZfZlpaq06vHsqKJjTqfxhRTQ7R0g4N9BC8cdwHNf5EC0fbtXB7w7s5W+ U6gbpMmJZ92eHsrlKx2BjpROEg7WGFsdp3TDmfAKUZRtgbhszCmCceX824rFe0d4zOvA HK8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20210112.gappssmtp.com header.s=20210112 header.b=zWFQy74n; 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 ka16-20020a170907921000b00871fccac238si3096947ejb.785.2023.01.24.14.46.49; Tue, 24 Jan 2023 14:47:13 -0800 (PST) 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=@jkqxz-net.20210112.gappssmtp.com header.s=20210112 header.b=zWFQy74n; 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 495AA68BE54; Wed, 25 Jan 2023 00:46:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1608568BE31 for ; Wed, 25 Jan 2023 00:46:40 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id bk16so15344334wrb.11 for ; Tue, 24 Jan 2023 14:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=kk/8jPiX5sDsXc2fYCdwIuYPFkcUfsrMYNf2N+Y+b+o=; b=zWFQy74nMT+bOlLif/Ecouu1c6i65PCxnmiPeuPeVcF0Pfuu/1lHR3njpcNnLtZDL1 jvk2/f5iuS3A4WdHx29om88FEik+Q0pKq3l3gxZs993uKlisJnzkwZoHCD7DlhYeGSnx hczfDB1VzD7WzxCWRY9FgpAtr326Q4y4p1zm27l2rbzg/f8ZM5BEFH7oyZ6IKhoM26RZ kX9i103CTZXk/rwX6LUqNVP5ROsrsGGXAK/8t70PKRgqPTTRM9CF4uHRYgL3b9Sf9+Oo D2zQezMQ3h7hCgJWE2jJ94E6x5aKNQTjRbVtTSE3+bqtbJXWnm/GLZFN6QaAXpz8IHhR q43Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kk/8jPiX5sDsXc2fYCdwIuYPFkcUfsrMYNf2N+Y+b+o=; b=sdSHygffnL4CsOo9cRQZIKJSlirjf5M/uQAEgRCT/LlQRr0m1VyQDhdfZRv+qPimJZ nXI2r/Bn+gmmZIQA0idNPb5V5fKoYBUSYm5WtLR0dHgseGnJ2usV8gc1dCFsarNSZN3U Rl8UsYOB5LTw0dhWaHOh75Tw9KVTkubMLfFUPH62LSi1X8xZ5ZU2QpHg6gQ3lLHWz3Dv 0BReST8wUdzIYQlNkVFR/Z/WWYI8inQuOSo7yxNY0cFqdejBR72JAoaAVFzyzbHWEPYU Vkcjn9udmeOQSrUsSO8BTONchVFt8tVjBGVakB6tf8R7jQwMegrsRJGQ5EypQ9/ACLvP F7tw== X-Gm-Message-State: AO0yUKXg9v2NFNjmd/gbqpmUbk0DEArBmcYj4uL/cpXxoKIh4tIbGmZO dWe+wSVkP23NlFwfcTwdxBNzI/Vn3gcg5oPT X-Received: by 2002:a5d:444b:0:b0:2bf:b741:3e0f with SMTP id x11-20020a5d444b000000b002bfb7413e0fmr841871wrr.41.1674600399458; Tue, 24 Jan 2023 14:46:39 -0800 (PST) Received: from localhost.localdomain (cpc91224-cmbg18-2-0-cust209.5-4.cable.virginm.net. [81.106.228.210]) by smtp.gmail.com with ESMTPSA id j26-20020a5d453a000000b002bdf3809f59sm2848267wra.38.2023.01.24.14.46.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 14:46:39 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 22:46:20 +0000 Message-Id: <20230124224623.1374077-1-sw@jkqxz.net> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/4] cbs_av1: Add tracing headers for metadata types 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: V/wKVKEtt4JM Make it a little easier to interpret metadata in trace output. --- libavcodec/cbs_av1_syntax_template.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index e95925a493..817a0f8ae6 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1843,6 +1843,8 @@ static int FUNC(metadata_hdr_cll)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("HDR CLL Metadata"); + fb(16, max_cll); fb(16, max_fall); @@ -1854,6 +1856,8 @@ static int FUNC(metadata_hdr_mdcv)(CodedBitstreamContext *ctx, RWContext *rw, { int err, i; + HEADER("HDR MDCV Metadata"); + for (i = 0; i < 3; i++) { fbs(16, primary_chromaticity_x[i], 1, i); fbs(16, primary_chromaticity_y[i], 1, i); @@ -1920,6 +1924,8 @@ static int FUNC(metadata_scalability)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Scalability Metadata"); + fb(8, scalability_mode_idc); if (current->scalability_mode_idc == AV1_SCALABILITY_SS) @@ -1934,6 +1940,8 @@ static int FUNC(metadata_itut_t35)(CodedBitstreamContext *ctx, RWContext *rw, int err; size_t i; + HEADER("ITU-T T.35 Metadata"); + fb(8, itu_t_t35_country_code); if (current->itu_t_t35_country_code == 0xff) fb(8, itu_t_t35_country_code_extension_byte); @@ -1961,6 +1969,8 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Timecode Metadata"); + fb(5, counting_type); flag(full_timestamp_flag); flag(discontinuity_flag);